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

bower.json

@@ -38,6 +38,7 @@
     "scrypt-async": "1.2.0",
     "require-css": "0.1.10",
     "less": "^2.7.2",
-    "bootstrap": "#v4.0.0-alpha.6"
+    "bootstrap": "#v4.0.0-alpha.6",
+    "diff-dom": "2.1.1"
   }
 }

rpc.js

@@ -583,9 +583,10 @@ var resetUserPins = function (Env, publicKey, channelList, cb) {
         if (e) { return void cb(e); }
         var pinSize = sumChannelSizes(sizes);
 
-        getFreeSpace(Env, publicKey, function (e, free) {
+
+        getLimit(Env, publicKey, function (e, limit) {
             if (e) {
-                WARN('getFreeSpace', e);
+                WARN('[RESET_ERR]', e);
                 return void cb(e);
             }
 
@@ -597,7 +598,7 @@ var resetUserPins = function (Env, publicKey, channelList, cb) {
 
                 They will not be able to pin additional pads until they upgrade
                 or delete enough files to go back under their limit. */
-            if (pinSize > free && session.hasPinned) { return void(cb('E_OVER_LIMIT')); }
+            if (pinSize > limit && session.hasPinned) { return void(cb('E_OVER_LIMIT')); }
             pinStore.message(publicKey, JSON.stringify(['RESET', channelList]),
                 function (e) {
                 if (e) { return void cb(e); }
@@ -1087,8 +1088,8 @@ RPC.create = function (config /*:typeof(ConfigType)*/, cb /*:(?Error, ?Function)
             return void handleMessage(false);
         }
 
-        // restrict upload capability unless explicitly disabled
-        if (config.restrictUploads === false) {
+        // allow unrestricted uploads unless restrictUploads is true
+        if (config.restrictUploads !== true) {
             return void handleMessage(true);
         }
 

www/code/main.js

@@ -9,7 +9,6 @@ define([
     '/common/cryptpad-common.js',
     '/common/cryptget.js',
     '/common/diffMarked.js',
-    '/bower_components/tweetnacl/nacl-fast.min.js', // needed for media-tag
 
     'css!/bower_components/components-font-awesome/css/font-awesome.min.css',
     'less!/customize/src/less/cryptpad.less'

www/common/cryptpad-common.js

@@ -16,9 +16,10 @@ define([
 
     '/common/clipboard.js',
     '/common/pinpad.js',
-    '/customize/application_config.js'
+    '/customize/application_config.js',
+    '/common/media-tag.js',
 ], function ($, Config, Messages, Store, Util, Hash, UI, History, UserList, Title, Metadata,
-            CodeMirror, Files, FileCrypto, Clipboard, Pinpad, AppConfig) {
+            CodeMirror, Files, FileCrypto, Clipboard, Pinpad, AppConfig, MediaTag) {
 
 /*  This file exposes functionality which is specific to Cryptpad, but not to
     any particular pad type. This includes functions for committing metadata
@@ -830,7 +831,9 @@ define([
         if (!pinsReady()) { return void cb('RPC_NOT_READY'); }
 
         var account = common.account;
-        if (typeof(account.limit) !== 'number' ||
+
+        var ALWAYS_REVALIDATE = true;
+        if (ALWAYS_REVALIDATE || typeof(account.limit) !== 'number' ||
             typeof(account.plan) !== 'string' ||
             typeof(account.note) !== 'string') {
             return void rpc.getLimit(function (e, limit, plan, note) {
@@ -893,7 +896,6 @@ define([
         var $container = $('<span>', {'class':'limit-container'});
         var todo;
         var updateUsage = window.updateUsage = common.notAgainForAnother(function () {
-            console.log("updating usage bar");
             common.getPinnedUsage(todo);
         }, LIMIT_REFRESH_RATE);
 
@@ -963,21 +965,12 @@ define([
         };
 
         setInterval(function () {
-            var t = updateUsage();
-            if (t) {
-                console.log("usage already updated. eligible for refresh in %sms", t);
-            }
+            updateUsage();
         }, LIMIT_REFRESH_RATE * 3);
 
         updateUsage();
         getProxy().on('change', ['drive'], function () {
-            var t = updateUsage();
-            if (t) {
-                console.log("usage bar update throttled due to overuse." +
-                    " Eligible for update in %sms", t);
-            } else {
-                console.log("usage bar updated");
-            }
+            updateUsage();
         });
         cb(null, $container);
     };
@@ -1231,18 +1224,18 @@ define([
                 }
 
                 if (decrypted.blob) {
-                    size = decrypted.blob.size
+                    size = decrypted.blob.size;
                 }
 
-                var sizeMb = Cryptpad.bytesToMegabytes(size);
+                var sizeMb = common.bytesToMegabytes(size);
 
                 var $btn = $(root).find('button');
                 $btn.addClass('btn btn-success')
                     .attr('type', 'download')
-                    .html(function (i, html) {
+                    .html(function () {
                         var text = Messages.download_mt_button + '<br>';
                         if (title) {
-                            text += '<b>' + Cryptpad.fixHTML(title) + '</b><br>';
+                            text += '<b>' + common.fixHTML(title) + '</b><br>';
                         }
                         if (size) {
                             text += '<em>' + Messages._getKey('formattedMB', [sizeMb]) + '</em>';
@@ -1284,12 +1277,10 @@ define([
                 var $img = $('<media-tag>').appendTo($container);
                 $img.attr('src', src);
                 $img.attr('data-crypto-key', 'cryptpad:' + cryptKey);
-                require(['/common/media-tag.js'], function (MediaTag) {
                 MediaTag($img[0]);
                 var observer = new MutationObserver(function(mutations) {
                     mutations.forEach(function(mutation) {
                         if (mutation.type === 'childList' && mutation.addedNodes.length) {
-                                console.log(mutation);
                             if (mutation.addedNodes.length > 1 ||
                                 mutation.addedNodes[0].nodeName !== 'IMG') {
                                 $img.remove();
@@ -1313,7 +1304,6 @@ define([
                             $image.on('load', onLoad);
                         }
                     });
-                    });
                     observer.observe($img[0], {
                         attributes: false,
                         childList: true,

www/file/main.js

@@ -7,12 +7,14 @@ define([
     '/common/visible.js',
     '/common/notify.js',
     '/file/file-crypto.js',
+
+    '/common/media-tag.js',
+
     '/bower_components/file-saver/FileSaver.min.js',
-    '/bower_components/tweetnacl/nacl-fast.min.js',
 
     'css!/bower_components/components-font-awesome/css/font-awesome.min.css',
     'less!/customize/src/less/cryptpad.less',
-], function ($, Crypto, realtimeInput, Toolbar, Cryptpad, Visible, Notify, FileCrypto) {
+], function ($, Crypto, realtimeInput, Toolbar, Cryptpad, Visible, Notify, FileCrypto, MediaTag) {
     var Messages = Cryptpad.Messages;
     var saveAs = window.saveAs;
     var Nacl = window.nacl;
@@ -133,7 +135,6 @@ define([
                         console.log(progress.percent);
                     });
 
-                    require(['/common/media-tag.js'], function (MediaTag) {
                     /**
                      * Allowed mime types that have to be set for a rendering after a decryption.
                      *
@@ -158,7 +159,6 @@ define([
                     MediaTag.CryptoFilter.setAllowedMediaTypes(allowedMediaTypes);
 
                     MediaTag($mt[0]);
-                    });
                 };
 
                 var todoBigFile = function (sizeMb) {

www/profile/main.js

@@ -11,7 +11,6 @@ define([
     '/bower_components/marked/marked.min.js',
     'cm/lib/codemirror',
     'cm/mode/markdown/markdown',
-    '/bower_components/tweetnacl/nacl-fast.min.js',
     'less!/profile/main.less',
 ], function ($, Cryptpad, Listmap, Crypto, Marked, CodeMirror) {
 

www/slide/main.js

@@ -9,7 +9,6 @@ define([
     '/common/cryptpad-common.js',
     '/common/cryptget.js',
     '/slide/slide.js',
-    '/bower_components/tweetnacl/nacl-fast.min.js', // needed for media-tag
 
     'css!/bower_components/components-font-awesome/css/font-awesome.min.css',
     'less!/customize/src/less/cryptpad.less',
@@ -470,6 +469,7 @@ define([
                 }).append($('<span>', {'class': 'drawer'}).text(Messages.printText));
 
                 // TODO reenable this when it is working again
+                $printButton = $printButton;
                 //$drawer.append($printButton);
 
                 var $slideOptions = $('<button>', {