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

www/common/cryptpad-common.js

@@ -32,9 +32,7 @@ define([
         Clipboard: Clipboard,
         donateURL: 'https://accounts.cryptpad.fr/#/donate?on=' + origin,
         upgradeURL: 'https://accounts.cryptpad.fr/#/?on=' + origin,
-        account: {
-            usage: 0,
-        },
+        account: {},
     };
 
     // constants
@@ -759,7 +757,9 @@ define([
         if (!pinsReady()) { return void cb('[RPC_NOT_READY]'); }
 
         rpc.getFileListSize(function (err, bytes) {
-            common.account.usage = typeof(bytes) === 'number'? bytes: 0;
+            if (typeof(bytes) === 'number') {
+                common.account.usage = bytes;
+            }
             cb(err, bytes);
         });
     };
@@ -785,13 +785,21 @@ define([
 
     common.getPinLimit = function (cb) {
         if (!pinsReady()) { return void cb('[RPC_NOT_READY]'); }
-        rpc.getLimit(function (e, limit, plan, note) {
-            if (e) { return cb(e); }
-            common.account.limit = limit;
-            common.account.plan = plan;
-            common.account.note = note;
-            cb(void 0, limit, plan, note);
-        });
+
+        var account = common.account;
+        if (typeof(account.limit) !== 'number' ||
+            typeof(account.plan) !== 'string' ||
+            typeof(account.note) !== 'string') {
+            return void rpc.getLimit(function (e, limit, plan, note) {
+                if (e) { return cb(e); }
+                common.account.limit = limit;
+                common.account.plan = plan;
+                common.account.note = note;
+                cb(void 0, limit, plan, note);
+            });
+        }
+
+        cb(void 0, account.limit, account.plan, account.note);
     };
 
     common.isOverPinLimit = function (cb) {

www/common/toolbar2.js

@@ -492,6 +492,8 @@ define([
                 $pencilIcon.show();
                 $saveIcon.hide();
                 //$pencilIcon.css('display', '');
+            } else if (e.which === 32) {
+                e.stopPropagation();
             }
         });
         $saveIcon.click(save);
@@ -664,13 +666,17 @@ define([
                 });
             }
         };
-        var limit = Cryptpad.account.limit;
-        var usage = Cryptpad.account.usage;
-        if (typeof(limit) !== 'number' || typeof(usage) !== 'number') {
-            todo("invalid types");
-        } else if (Cryptpad.isLoggedIn() && usage >= limit) {
-            todo(void 0, true);
-        } else { todo(void 0, false); }
+
+        Cryptpad.isOverPinLimit(function (e, isOver, data) {
+            var limit = data.limit;
+            var usage = data.usage;
+            if (typeof(limit) !== 'number' || typeof(usage) !== 'number') {
+                todo("invalid types");
+            } else if (Cryptpad.isLoggedIn() && usage >= limit) {
+                todo(void 0, true);
+            } else { todo(void 0, false); }
+        });
+
         return $limit;
     };