[MMBASE SCM] r40998 - mmbase/trunk/base-webapp/src/main/webapp/mmbase/upload

[michiel]

Author: michiel
Date: 2010-02-15 15:24:19 +0100 (Mon, 15 Feb 2010)
New Revision: 40998

Modified:
   mmbase/trunk/base-webapp/src/main/webapp/mmbase/upload/MMUpload.js.jsp
Log:
details

Modified: mmbase/trunk/base-webapp/src/main/webapp/mmbase/upload/MMUpload.js.jsp
===================================================================
--- mmbase/trunk/base-webapp/src/main/webapp/mmbase/upload/MMUpload.js.jsp      
2010-02-15 13:31:44 UTC (rev 40997)
+++ mmbase/trunk/base-webapp/src/main/webapp/mmbase/upload/MMUpload.js.jsp      
2010-02-15 14:24:19 UTC (rev 40998)
@@ -1,10 +1,19 @@
 // -*- mode: javascript; -*-
+/**
+ * Implicitely and temporary checks/uploads binaries.
+ * Based on ajax-fileupload
+ * (jquery-form is too hard to use, because it requires an entire
+ * form to be submitted).
+ */
+
 <%...@page contentType="text/javascript; charset=UTF-8"
 %><%...@taglib uri="http://www.mmbase.org/mmbase-taglib-2.0"; prefix="mm"
 %><%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt";
 %><fmt:bundle basename="org.mmbase.resources.resources">
 <mm:content type="text/javascript" expires="0">
 
+
+
 function MMUploader() {
     // Currently running uploads
     this.uploading = {};
@@ -13,23 +22,23 @@
     this.uid = "";
     this.transaction = null;
     this.validator = null;
+
 }
 
-
 MMUploader.prototype.status = function(message, fadeout) {
-    var el = this.statusElement;
-    if (el != null) {
-        if (el.originalTextContent == null) el.originalTextContent = 
el.textContent;
-        $(el).fadeTo("fast", 1);
-        $(el).empty();
-        $(el).append(message);
-        if (fadeout) {
-            var p = el;
-            $(el).fadeTo(4000, 0.1, function() {
-                    $(p).empty(); $(p).append(p.originalTextContent); }
-                );
-        }
+  var el = this.statusElement;
+  if (el != null) {
+    if (el.originalTextContent == null) el.originalTextContent = 
el.textContent;
+    $(el).fadeTo("fast", 1);
+    $(el).empty();
+    $(el).append(message);
+    if (fadeout) {
+      var p = el;
+      $(el).fadeTo(4000, 0.1, function() {
+          $(p).empty(); $(p).append(p.originalTextContent); }
+        );
     }
+  }
 }
 
 
@@ -68,8 +77,7 @@
 
     var fileItem = $("#" + fileid);
     if (fileItem.length == 0) {
-        console.log("No fileitem " + fileid);
-        return;
+        throw "No fileitem " + fileid;
     }
     if (fileItem[0].type != 'file') {
         // not a fileitem

_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs