Fixed buggy loading of files in the web application

HISTORY.md

@@ -8,6 +8,7 @@ http://jsoneditoronline.org
 - Implemented an option `modes`, which creates a menu in the editor
   where the user can switch between the selected editor modes.
 - Fixed wrong title on fields with value `null`.
+- Fixed buggy loading of files in the web application.
 
 
 ## 2013-08-01, version 2.2.2

Jakefile.js

@@ -229,7 +229,6 @@ task('webapp', ['build', 'minify'], function () {
     jake.cpR(webAppSrc + 'robots.txt', webApp);
     jake.cpR(webAppSrc + 'datapolicy.txt', webApp);
     jake.cpR(webAppSrc + 'index.html', webApp);
-    jake.cpR(webAppSrc + 'chrome_app_counter.html', webApp);
     jake.cpR(webAppSrc + 'favicon.ico', webApp);
     jake.cpR(webAppSrc + 'fileretriever.php', webApp);
     jake.cpR(webAppSrc + 'googlea47c4a0b36d11021.html', webApp);

app/web/fileretriever.css

@@ -21,6 +21,10 @@ div.fileretriever-border {
     background-color: white;
     border: 1px solid gray;
     border-radius: 2px;
+
+    -moz-box-shadow:    2px 2px 12px rgba(128, 128, 128, 0.3);
+    -webkit-box-shadow: 2px 2px 12px rgba(128, 128, 128, 0.3);
+    box-shadow:         2px 2px 12px rgba(128, 128, 128, 0.3);
 }
 
 form.fileretriever-form {

app/web/fileretriever.js

@@ -214,7 +214,7 @@ FileRetriever.prototype.loadUrl = function (url, callback) {
  * A file explorer will be opened to select a file and press ok.
  * In case of Internet Explorer, an upload form will be shown where the
  * user has to select a file via a file explorer after that click load.
- * @param {function} callback   Callback method, called with parameters:
+ * @param {function} [callback]   Callback method, called with parameters:
  *                                    {Error} error
  *                                    {string} data
  */
@@ -246,6 +246,40 @@ FileRetriever.prototype.loadFile = function (callback) {
         }
     };
 
+    // create a form to select a file and submit
+    var useFileReader = (me.options.html5 && window.File && window.FileReader);
+
+    if (useFileReader) {
+        this.prompt({
+            title: 'Open file',
+            titleSubmit: 'Open',
+            description: 'Select a file on your computer.',
+            inputType: 'file',
+            inputName: 'file',
+            callback: function (value, field) {
+                if (value) {
+                    if (useFileReader) {
+                        // load file via HTML5 FileReader (no size limits)
+                        var file = field.files[0];
+                        var reader = new FileReader();
+                        reader.onload = function(event) {
+                            var data = event.target.result;
+                            callbackOnce(null, data);
+                        };
+
+                        // Read in the image file as a data URL.
+                        reader.readAsText(file);
+                    }
+
+                    startLoading();
+                }
+            }
+        });
+        // TODO: handle a cancel
+    }
+    else {
+        // no html5 filereader available
+
         // create an iframe for uploading files
         // the iframe must have an unique name, allowing multiple
         // FileRetrievers. The name is needed as target for the uploadForm
@@ -267,71 +301,20 @@ FileRetriever.prototype.loadFile = function (callback) {
                         var err = new Error('Error loading file ' + me.getFilename());
                         callbackOnce(err, null);
                     }
+
+                    // cleanup the frame again
+                    if (iframe.parentNode === document.body) {
+                        document.body.removeChild(iframe);
+                    }
                 });
             }
         };
         document.body.appendChild(iframe);
 
-    var isIE = (navigator.appName == 'Microsoft Internet Explorer');
-    if (!isIE) {
-        // create a hidden form to select a file
-        var domForm = document.createElement('form');
-        domForm.action = this.scriptUrl;
-        domForm.method = 'POST';
-        domForm.enctype = 'multipart/form-data';
-        domForm.target = iframeName;
-        this._hide(domForm);
-        var domFile = document.createElement('input');
-        domFile.type = 'file';
-        domFile.name = 'file';
-        domFile.onchange = function () {
-            startLoading();
-
-            // there is a file selected
-            setTimeout(function () { // Timeout needed for IE
-                var filename = domFile.value;
-                if (filename.length) {
-                    if (me.options.html5 && window.File && window.FileReader) {
-                        // load file via HTML5 FileReader (no size limits)
-                        var file = domFile.files[0];
-                        var reader = new FileReader();
-                        reader.onload = function(event) {
-                            var data = event.target.result;
-                            callbackOnce(null, data);
-                        };
-
-                        // Read in the image file as a data URL.
-                        reader.readAsText(file);
-                    }
-                    else {
-                        // load by uploading to server
-                        // TODO: how to check the file size? (on older browsers)
-                        //console.log('submitting...');
-
-                        domForm.submit();
-                    }
-                }
-                else {
-                    // cancel
-                    callbackOnce(null, null);
-                }
-            }, 0);
-        };
-        domForm.appendChild(domFile);
-        document.body.appendChild(domForm);
-
-        // activate file selection (the click is done after a timeout,
-        // as in Opera and Safari, the form is not yet rendered)
-        setTimeout(function () {
-            domFile.click();
-        }, 0);
-    }
-    else {
-        // create a visual form and submit manually (for IE)
         this.prompt({
             title: 'Open file',
             titleSubmit: 'Open',
-            description: 'Select a file from disk and click the button Open to load it.',
+            description: 'Select a file on your computer.',
             inputType: 'file',
             inputName: 'file',
             formAction: this.scriptUrl,
@@ -380,7 +363,7 @@ FileRetriever.prototype.loadUrlDialog = function (callback) {
  * The propmt can either:
  * - Post a form when formAction, and formMethod are provided.
  *   Will call callback on submit.
- * - Call the callback method "callback" with the entered value as parameter.
+ * - Call the callback method "callback" with the entered value as first parameter and the created DOM field as second.
  *   This happens when a callback parameter is provided.
  * @param {Object} params   Available parameters:
  *                          {String} title
@@ -439,11 +422,11 @@ FileRetriever.prototype.prompt = function (params) {
     form.onsubmit = function () {
         if (field.value) {
             setTimeout(function () {
-                // remove after the submit has taken place!
+                // remove *after* the submit has taken place!
                 removeDialog();
             }, 0);
             if (params.callback) {
-                params.callback(field.value);
+                params.callback(field.value, field);
             }
             return (params.formAction != undefined && params.formMethod != undefined);
         }
@@ -500,6 +483,13 @@ FileRetriever.prototype.prompt = function (params) {
     var background = document.createElement('div');
     background.className = 'fileretriever-background';
     background.appendChild(border);
+    background.onclick = function (event) {
+        event = event || window.event;
+        var target = event.target || event.srcElement;
+        if (target == background) {
+            onCancel();
+        }
+    };
     document.body.appendChild(background);
 
     field.focus();

jsoneditor.js

@@ -28,7 +28,7 @@
  *
  * @author  Jos de Jong, <wjosdejong@gmail.com>
  * @version 2.3.0-SNAPSHOT
- * @date    2013-08-28
+ * @date    2013-09-12
  */
 (function () {