[Mapbender-commits] r5842 - trunk/mapbender/http/plugins
svn_mapbender at osgeo.org
svn_mapbender at osgeo.org
Fri Mar 26 10:27:16 EDT 2010
Author: christoph
Date: 2010-03-26 10:27:15 -0400 (Fri, 26 Mar 2010)
New Revision: 5842
Modified:
trunk/mapbender/http/plugins/jq_upload.js
trunk/mapbender/http/plugins/jq_upload.php
Log:
merged with changes by kmq
Modified: trunk/mapbender/http/plugins/jq_upload.js
===================================================================
--- trunk/mapbender/http/plugins/jq_upload.js 2010-03-26 14:14:18 UTC (rev 5841)
+++ trunk/mapbender/http/plugins/jq_upload.js 2010-03-26 14:27:15 UTC (rev 5842)
@@ -25,6 +25,7 @@
var returnValueArray = returnValue.split("_");
var filename = returnValueArray[returnValueArray.length - 2];
+ var origFilename = window.frames[id+"_target"].filename;
var msg = "";
var success = false;
if (returnValue.match(/_finished/)) {
@@ -32,7 +33,7 @@
if (typeof options.callback === "function") {
var msgArray = returnValue.split("_");
msg = msgArray.pop();
- options.callback(filename, true, msg);
+ options.callback({filename:filename,origFilename: origFilename}, true, msg);
}
}
else if (returnValue.match(/_cancelled/)) {
@@ -40,7 +41,7 @@
var msgArray = returnValue.split("_");
msg = msgArray.pop();
if (typeof options.callback === "function") {
- options.callback("", false, msg);
+ options.callback(null, false, msg);
}
}
return;
@@ -54,7 +55,7 @@
new Mb_exception(msg);
if (typeof options.callback === "function") {
- options.callback("", false, msg);
+ options.callback(null, false, msg);
}
return;
}
@@ -66,7 +67,10 @@
"enctype='multipart/form-data' target='" + id + "_target'>" +
"</form>"
).submit(function () {
- startUpload();
+ var filename = $("input[name=myfile]", $this).val();
+ if (filename !== "") {
+ startUpload();
+ }
return true;
});
$form.append($(
Modified: trunk/mapbender/http/plugins/jq_upload.php
===================================================================
--- trunk/mapbender/http/plugins/jq_upload.php 2010-03-26 14:14:18 UTC (rev 5841)
+++ trunk/mapbender/http/plugins/jq_upload.php 2010-03-26 14:27:15 UTC (rev 5842)
@@ -84,6 +84,7 @@
window.id = "<?php
echo $id . "_" . $serverFilename . "_" . $status . "_" . $message;
?>";
+ window.filename = "<?php echo $clientFilename; ?>";
</script>
</head>
<body>
More information about the Mapbender_commits
mailing list