Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

www/file/file.css

@@ -1,6 +1,7 @@
 html,
 body {
   margin: 0px;
+  height: 100%;
 }
 .cryptpad-toolbar {
   margin-bottom: 1px;

www/file/file.less

@@ -5,6 +5,7 @@
 
 html, body {
     margin: 0px;
+    height: 100%;
 }
 .cryptpad-toolbar {
     margin-bottom: 1px;

www/file/inner.html

@@ -19,7 +19,7 @@
         <input type="button" name="dl" id="dl" class="inputfile" />
         <label for="dl" class="block unselectable" data-localization-title="download_button"
             data-localization="download_button"></label>
-        <span class="block" id="progress">&nbsp;</span>
+        <span class="block" id="progress"></span>
     </div>
     <table id="status" style="display: none;">
         <tr>

www/file/main.js

@@ -26,6 +26,9 @@ define([
     var $table = $iframe.find('#status');
     var $progress = $iframe.find('#progress');
 
+    $iframe.find('body').on('dragover', function (e) { e.preventDefault(); });
+    $iframe.find('body').on('drop', function (e) { e.preventDefault(); });
+
     Cryptpad.addLoadingScreen();
 
     var Title;
@@ -211,13 +214,10 @@ define([
         };
 
         var exportFile = function () {
-            var suggestion = document.title;
+            var filename = Cryptpad.fixFileName(document.title);
-            Cryptpad.prompt(Messages.exportPrompt,
+            if (!(typeof(filename) === 'string' && filename)) { return; }
-                Cryptpad.fixFileName(suggestion), function (filename) {
+            var blob = new Blob([myFile], {type: myDataType});
-                if (!(typeof(filename) === 'string' && filename)) { return; }
+            saveAs(blob, filename);
-                var blob = new Blob([myFile], {type: myDataType});
-                saveAs(blob, filename);
-            });
         };
 
         Title = Cryptpad.createTitle({}, function(){}, Cryptpad);
@@ -250,40 +250,50 @@ define([
 
         if (!uploadMode) {
             $dlform.show();
-            Cryptpad.removeLoadingScreen();
+            var src = Cryptpad.getBlobPathFromHex(hexFileName);
-            $dlform.find('#dl').click(function () {
+            var cryptKey = secret.keys && secret.keys.fileKeyStr;
-                if (myFile) { return void exportFile(); }
+            var key = Nacl.util.decodeBase64(cryptKey);
 
-                var src = Cryptpad.getBlobPathFromHex(hexFileName);
+            FileCrypto.fetchDecryptedMetadata(src, key, function (e, metadata) {
-                var cryptKey = secret.keys && secret.keys.fileKeyStr;
+                if (e) { return void console.error(e); }
-                var key = Nacl.util.decodeBase64(cryptKey);
+                var title = document.title = metadata.name;
+                Title.updateTitle(title || Title.defaultTitle);
 
-/*              return FileCrypto.fetchDecryptedMetadata(src, key, function (e, metadata) {
+                Cryptpad.removeLoadingScreen();
-                    if (e) { return console.error(e); }
+                var decrypting = false;
-                    console.log(metadata);
+                $dlform.find('#dl, #progress').click(function () {
-                });*/
+                    if (decrypting) { return; }
-                return Cryptpad.fetch(src, function (e, u8) {
+                    if (myFile) { return void exportFile(); }
-                    if (e) { return void Cryptpad.alert(e); }
+                    decrypting = true;
-
-                    // now decrypt the u8
-                    if (!u8 || !u8.length) {
-                        return void Cryptpad.errorLoadingScreen(e);
-                    }
 
-                    FileCrypto.decrypt(u8, key, function (e, data) {
+                    return Cryptpad.fetch(src, function (e, u8) {
                         if (e) {
-                            return console.error(e);
+                            decrypting = false;
+                            return void Cryptpad.alert(e);
+                        }
+
+                        // now decrypt the u8
+                        if (!u8 || !u8.length) {
+                            return void Cryptpad.errorLoadingScreen(e);
                         }
-                        console.log(data);
+
-                        var title = document.title = data.metadata.name;
+                        FileCrypto.decrypt(u8, key, function (e, data) {
-                        myFile = data.content;
+                            if (e) {
-                        myDataType = data.metadata.type;
+                                decrypting = false;
-                        Title.updateTitle(title || Title.defaultTitle);
+                                return console.error(e);
-                        exportFile();
+                            }
-                    }, function (progress) {
+                            console.log(data);
-                        var p = progress * 100 +'%';
+                            var title = document.title = data.metadata.name;
-                        $progress.width(p);
+                            myFile = data.content;
-                        console.error(progress);
+                            myDataType = data.metadata.type;
+                            Title.updateTitle(title || Title.defaultTitle);
+                            exportFile();
+                            decrypting = false;
+                        }, function (progress) {
+                            var p = progress * 100 +'%';
+                            $progress.width(p);
+                            console.error(progress);
+                        });
                     });
                 });
             });
@@ -341,6 +351,7 @@ define([
             e.stopPropagation();
         })
         .on('drop', function (e) {
+            e.stopPropagation();
             var dropped = e.originalEvent.dataTransfer.files;
             counter = 0;
             $label.removeClass('hovering');