admin/Facilitor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FSN#39400 Multiupload mobile kan nu, het is nog niet opgelost om het upload scherm weg te laten gaan automatisch

Browse Source 
svn path=/Website/trunk/; revision=35178
This commit is contained in:
Koen Reefman
2017-09-01 15:05:19 +00:00
parent 2053c05443
commit b8ae59a472
4 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
APPL/PDA/BijlagenForm.asp
View File

@@ -45,7 +45,7 @@ var pMulti = getQParamInt("multi", 0) == 1;
FCLTHeader.Requires({css: ["../pda/default.css"]});
var transitParam = buildTransitParam(["key", "module", "niveau", "kenmerk_key", "encrypt", "extFilter", "regexp", "reado", "multi", "tmpfolder"]);
var transitParam = buildTransitParam(["key", "module", "niveau", "kenmerk_key", "encrypt", "extFilter", "regexp", "reado", "tmpfolder"]);
params = flexProps(pModule, pKey, String(pKenmerk_key), pNiveau);
@@ -58,6 +58,7 @@ if (params.extFilter)
regFilter = regFilter.replace(/( |,|;)/g,"|"); // Altijd | karakter
regFilter = ".*\\." + "(" + regFilter + ")$"; // er moet een punt voor en extensie is aan het einde
}
%>
<HTML class='ui-body-c'>
@@ -77,6 +78,7 @@ if (params.extFilter)
{
if (document.forms.u2.imgfile.value == "")
return false;
<% if (params.extFilter) { %>
if (!new RegExp("<%=safe.jsstring(regFilter)%>", "ig").test(document.forms.u2.imgfile.value))
{
@@ -100,7 +102,7 @@ if (params.extFilter)
parent.return_data = { fileName: vFileName,
org_data: FcltMgr.dialogArguments()
};
parent.$("#bijlagepopup").popup( "close" );
parent.$("#bijlagepopup").popup("close");
}
$(document).ready(function()
@@ -118,7 +120,7 @@ if (params.extFilter)
%>
<FORM name="u2" method="post" enctype="multipart/form-data" target="hidFrameUpload">
<label for="imgfile" class="uploadbutton"><p data-role='button' data-icon='cloud'><%=L("lcl_select_file")%></p><% if (params.extFilter) { Response.Write(" (" + safe.html(params.extFilter) + ")"); } %></label>
<input type="file" name="imgfile" id="imgfile" style="width: 95%" onchange='doSubmitUpload()'>
<input type="file" name="imgfile" id="imgfile" style="width: 95%" onchange='doSubmitUpload()' <%=(pMulti ? "multiple" : "")%>>
<div id="uploading" style="display:none">
Please wait...
</div>

36
APPL/PDA/mobile.js
View File

@@ -166,30 +166,30 @@ function onBijlagenMobile(formurl, // protected
$("#bijlagepopup").on("popupafterclose",
function(event, ui)
{
if (window.return_data) // gezet door BijlagenForm.asp
if (window.return_data) // gezet door BijlagenForm.asp
{
// Overkill alert(window.return_data.fileName + " is toegevoegd");
if (window.return_data.fileName)
{
// Overkill alert(window.return_data.fileName + " is toegevoegd");
if (window.return_data.fileName)
if ($(objButton).is("[src]"))
{
if ($(objButton).is("[src]"))
{
afterUploadForm(window.return_data.fileName);
}
else
{
$(objButton).val(window.return_data.fileName)
.show()
.attr("onclick", "")
.attr("readonly", "1")
.parent().next().hide(); // de 'Add' knop
}
afterUploadForm(window.return_data.fileName);
}
else
{
$(objButton).val(window.return_data.fileName)
.show()
.attr("onclick", "")
.attr("readonly", "1")
.parent().next().hide(); // de 'Add' knop
}
}
// Als we dit weglaten krijgen we obscure clientside jQuery errors ('Array not defined etc')
$("iframe.mfcltmodal").attr("src", "../shared/empty.html");
}
// Als we dit weglaten krijgen we obscure clientside jQuery errors ('Array not defined etc')
$("iframe.mfcltmodal").attr("src", "../shared/empty.html");
});
$("#bijlagepopup").popup().popup( "open" );
$("#bijlagepopup").popup().popup("open");
$html.find("iframe").attr("src", formurl);

4
APPL/Shared/UploadForm_save.asp
View File

@@ -224,7 +224,6 @@ var fso = Server.CreateObject("Scripting.FileSystemObject")
}
}
}
if (result.message && result.message != "")
{
result.message = L("lcl_shared_upload_error_start") + result.message + L("lcl_shared_upload_error_end");
@@ -338,7 +337,8 @@ var fso = Server.CreateObject("Scripting.FileSystemObject")
}
}
}
%><script>
%><script type="text/javascript">
<% if (result.message) { %>
FcltMgr.alert("<%=safe.jsstring(result.message)%>");
<% } %>

1
APPL/Shared/kenmerk_common.inc
View File

@@ -928,6 +928,7 @@ function listKenmerk(sql, module, key, props)
+ (niveau != ""? "&niveau=" + niveau : "")
+ "&kenmerk_key=" + kkey
+ "&mobile=" + (formobile ? 1 : 0)
+ (formobile ? "&multi=" + (MasF ? 1 : 0) : "")
+ (props.kenmerk_module? "&kenmerk_module=" + props.kenmerk_module : "");
// nooit if (pReadonly) url += "&reado=1";
// nooit url += "&multi=1";