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

www/common/cryptpad-common.js

@@ -574,7 +574,7 @@ define([
                 getStore().pushData(data, function (e, state) {
                     if (e) {
                         if (e === 'E_OVER_LIMIT') {
-                            Cryptpad.alert(Messages.pinLimitNotPinned, null, true);
+                            common.alert(Messages.pinLimitNotPinned, null, true);
                             return;
                         }
                         else { throw new Error("Cannot push this pad to CryptDrive", e); }
@@ -722,6 +722,7 @@ define([
     };
 
     var isOverPinLimit = common.isOverPinLimit = function (cb) {
+        var usage;
         var andThen = function (e, limit) {
             if (e) { return void cb(e); }
             if (usage > limit) {

www/common/userObject.js

@@ -437,7 +437,6 @@ define([
             if (!Cryptpad.isLoggedIn() || !AppConfig.enablePinning) { todo(); }
             Cryptpad.pinPads([Cryptpad.hrefToHexChannelId(data.href)], function (e, hash) {
                 if (e) { return void cb(e); }
-                cb('E_OVER_LIMIT'); return; //TODO
                 todo();
             });
         };

www/drive/main.js

@@ -290,7 +290,7 @@ define([
             sel.down = true;
             if (!e.ctrlKey) { removeSelected(); }
             var rect = e.currentTarget.getBoundingClientRect();
-            sel.startX = e.clientX - rect.left,
+            sel.startX = e.clientX - rect.left;
             sel.startY = e.clientY - rect.top + $content.scrollTop();
             sel.$selectBox.show().css({
                 left: sel.startX + 'px',