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

www/common/common-interface.js

@@ -215,9 +215,10 @@ define([
             force = opt.force || false;
         } else if (typeof(opt) === 'boolean') {
             force = opt;
+        }
+        if (typeof(opt) !== 'object') {
             opt = {};
         }
-
         cb = cb || function () {};
 
         var message;
@@ -278,22 +279,25 @@ define([
         ]);
 
         var listener;
-        var close = Util.once(function () {
+        var close = Util.once(function (result, ev) {
-            $(frame).fadeOut(150, function () { $(this).remove(); });
+            var $frame = $(frame).fadeOut(150, function () {
-            stopListening(listener);
+                stopListening(listener);
+                $frame.remove();
+                cb(result, ev);
+            });
         });
 
-        var $ok = $(ok).click(function (ev) { cb(input.value, ev); });
+        var $ok = $(ok).click(function (ev) { close(input.value, ev); });
-        var $cancel = $(cancel).click(function (ev) { cb(null, ev); });
+        var $cancel = $(cancel).click(function (ev) { close(null, ev); });
         listener = listenForKeys(function () { // yes
-            close(); $ok.click();
+            $ok.click();
         }, function () { // no
-            close(); $cancel.click();
+            $cancel.click();
         });
 
         document.body.appendChild(frame);
         setTimeout(function () {
-            input.select().focus();
+            $(input).select().focus();
             UI.notify();
         });
     };
@@ -321,13 +325,14 @@ define([
         ]);
 
         var listener;
-        var close = Util.once(function () {
+        var close = Util.once(function (bool, ev) {
             $(frame).fadeOut(150, function () { $(this).remove(); });
             stopListening(listener);
+            cb(bool, ev);
         });
 
-        var $ok = $(ok).click(function (ev) { close(); cb(true, ev); });
+        var $ok = $(ok).click(function (ev) { close(true, ev); });
-        var $cancel = $(cancel).click(function (ev) { close(); cb(false, ev); });
+        var $cancel = $(cancel).click(function (ev) { close(false, ev); });
 
         if (opt.cancelClass) { $cancel.addClass(opt.cancelClass); }
         if (opt.okClass) { $ok.addClass(opt.okClass); }

www/register/main.js

@@ -251,8 +251,8 @@ define([
 
         Test(function () {
             $uname.val('test' + Math.random());
-            $passwd.val('test');
+            $passwd.val('testtest');
-            $confirm.val('test');
+            $confirm.val('testtest');
             $checkImport[0].checked = true;
             $checkAcceptTerms[0].checked = true;
             $register.click();