Author: michiel
Date: 2010-03-08 18:09:48 +0100 (Mon, 08 Mar 2010)
New Revision: 41294
Modified:
mmbase/branches/MMBase-1_9/base-webapp/src/main/webapp/mmbase/upload/MMUpload.js.jsp
mmbase/branches/MMBase-1_9/base-webapp/src/main/webapp/mmbase/upload/upload.body.jspx
Log:
validation of binaries after upload was not yet quite ok
Modified:
mmbase/branches/MMBase-1_9/base-webapp/src/main/webapp/mmbase/upload/MMUpload.js.jsp
===================================================================
---
mmbase/branches/MMBase-1_9/base-webapp/src/main/webapp/mmbase/upload/MMUpload.js.jsp
2010-03-08 17:07:46 UTC (rev 41293)
+++
mmbase/branches/MMBase-1_9/base-webapp/src/main/webapp/mmbase/upload/MMUpload.js.jsp
2010-03-08 17:09:48 UTC (rev 41294)
@@ -36,12 +36,13 @@
$(el).append(message);
if (fadeout) {
var p = el;
- $(el).fadeTo(4000, 0.1, function() {
+ $(el).fadeTo(4000, 0.1,
+ function() {
$(p).empty(); $(p).append(p.originalTextContent);
}
);
}
}
-}
+};
MMUploader.prototype.uploadProgress = function(fileid) {
@@ -50,7 +51,7 @@
$(this.statusElement).load("${mm:link('/mmbase/upload/progress.jspx')}");
}
}
-}
+};
/**
* Given an input[type=file], returns the node number which is represented in
it.
@@ -67,7 +68,7 @@
}
}
return null;
-}
+};
MMUploader.prototype.upload = function(fileid) {
@@ -109,6 +110,14 @@
} else {
//console.log("Validator not set");
}
+ var classes = $(fileItem).attr("class").split(' ');
+ for (var i in classes) {
+ var clazz = classes[i];
+ if (clazz.indexOf("mm_length_") == 0) {
+ $(fileItem).removeClass(clazz);
+ break;
+ }
+ }
$.ajaxFileUpload ({
url: "${mm:link('/mmbase/upload/upload.jspx')}" + "?uid=" +
self.uid + "&name=" + fileItem.attr("name") + "&n=" + node + "&transaction=" +
self.transaction,
@@ -123,12 +132,16 @@
alert(data.msg);
}
} else {
+ console.log("UPLOADED");
try {
var fileItem = $("#" + fileid);
fileItem.val(null);
fileItem.prevAll(".mm_gui").remove();
fileItem.prevAll("input[type=hidden]").remove();
+ var newLength = $(data).find("div.length").text();
+ $(fileItem).addClass("mm_length_" + newLength);
+
var created = $(data).find("div.fieldgui .mm_gui,
div.fieldgui input[type=hidden]");
fileItem.before(created);
var name = $(fileItem).attr("name");
@@ -137,6 +150,7 @@
$(fileItem).attr("name", name);
}
+
// Rebind event handlers:
for (var event in events) {
for (var key in events[event]) {
@@ -165,7 +179,7 @@
}
);
return;
-}
+};
/*
</mm:content></fmt:bundle>
*/
Modified:
mmbase/branches/MMBase-1_9/base-webapp/src/main/webapp/mmbase/upload/upload.body.jspx
===================================================================
---
mmbase/branches/MMBase-1_9/base-webapp/src/main/webapp/mmbase/upload/upload.body.jspx
2010-03-08 17:07:46 UTC (rev 41293)
+++
mmbase/branches/MMBase-1_9/base-webapp/src/main/webapp/mmbase/upload/upload.body.jspx
2010-03-08 17:09:48 UTC (rev 41294)
@@ -24,6 +24,7 @@
</jsp:scriptlet>
<mm:node number="${n}" commitonclose="false" jspvar="node">
<jsp:scriptlet>node.setValue(field, new
org.mmbase.util.SerializableInputStream(f, is.getName()));</jsp:scriptlet>
+ <div class="length"><jsp:expression>is.getSize()</jsp:expression></div>
<div class="nodegui">
<mm:nodeinfo type="gui" />
</div>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
