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

customize.dist/pages.js

@@ -103,7 +103,7 @@ define([
                     ])*/
                 ])
             ]),
-            h('div.cp-version-footer', "CryptPad v3.0.1 (Aurochs' revenge)")
+            h('div.cp-version-footer', "CryptPad v3.1.0 (Baiji)")
         ]);
     };
 

lib/once.js

@@ -1,8 +1,7 @@
-module.exports = function (f) {
+module.exports = function (f, g) {
-    var called;
     return function () {
-        if (called) { return; }
+        if (!f) { return; }
-        called = true;
         f.apply(this, Array.prototype.slice.call(arguments));
+        f = g;
     };
 };

package.json

@@ -1,7 +1,7 @@
 {
   "name": "cryptpad",
   "description": "realtime collaborative visual editor with zero knowlege server",
-  "version": "3.0.1",
+  "version": "3.1.0",
   "license": "AGPL-3.0+",
   "repository": {
     "type": "git",

rpc.js

@@ -294,37 +294,33 @@ var getUploadSize = function (Env, channel, cb) { // FIXME FILES
     });
 };
 
-const batchFileSize = BatchRead("GET_FILE_SIZE");
 var getFileSize = function (Env, channel, cb) {
     if (!isValidId(channel)) { return void cb('INVALID_CHAN'); }
-    batchFileSize(channel, cb, function (done) {
+    if (channel.length === 32) {
-        if (channel.length === 32) {
+        if (typeof(Env.msgStore.getChannelSize) !== 'function') {
-            if (typeof(Env.msgStore.getChannelSize) !== 'function') {
+            return cb('GET_CHANNEL_SIZE_UNSUPPORTED');
-                return done('GET_CHANNEL_SIZE_UNSUPPORTED');
-            }
-
-            return void Env.msgStore.getChannelSize(channel, function (e, size /*:number*/) {
-                if (e) {
-                    if (e.code === 'ENOENT') { return void done(void 0, 0); }
-                    return void done(e.code);
-                }
-                done(void 0, size);
-            });
         }
 
-        // 'channel' refers to a file, so you need another API
+        return void Env.msgStore.getChannelSize(channel, function (e, size /*:number*/) {
-        getUploadSize(Env, channel, function (e, size) {
+            if (e) {
-            if (typeof(size) === 'undefined') { return void done(e); }
+                if (e.code === 'ENOENT') { return void cb(void 0, 0); }
-            done(void 0, size);
+                return void cb(e.code);
+            }
+            cb(void 0, size);
         });
+    }
+
+    // 'channel' refers to a file, so you need another API
+    getUploadSize(Env, channel, function (e, size) {
+        if (typeof(size) === 'undefined') { return void cb(e); }
+        cb(void 0, size);
     });
 };
 
 const batchMetadata = BatchRead("GET_METADATA");
 var getMetadata = function (Env, channel, cb) {
     if (!isValidId(channel)) { return void cb('INVALID_CHAN'); }
-
+    if (channel.length !== 32) { return cb("INVALID_CHAN_LENGTH"); }
-    if (channel.length !== 32) { return cb("INVALID_CHAN"); }
 
     batchMetadata(channel, cb, function (done) {
         var ref = {};

storage/file.js

@@ -76,7 +76,7 @@ var getMetadataAtPath = function (Env, path, cb) {
         catch (e) {
             console.log("getMetadataAtPath");
             console.error(e);
-            complete('INVALID_METADATA');
+            complete('INVALID_METADATA', metadata);
         }
     });
     stream.on('end', function () {

www/common/LessLoader.js

@@ -158,14 +158,14 @@ define([
         var done = function () {
             clearTimeout(timeout);
             if (btime) {
-                console.log("Compiling [" + url + "] took " + (+new Date() - btime) + "ms");
+                console.info("Compiling [" + url + "] took " + (+new Date() - btime) + "ms");
             }
             cb();
         };
         stack.push(url);
         cacheGet(url, function (css) {
             if (css) { return void loadSubmodulesAndInject(css, url, done, stack); }
-            console.log('CACHE MISS ' + url);
+            console.debug('CACHE MISS ' + url);
             ((/\.less([\?\#].*)?$/.test(url)) ? loadLess : loadCSS)(url, function (err, css) {
                 if (!css) { return void console.error(err); }
                 var output = fixAllURLs(css, url);

www/common/common-messenger.js

@@ -728,6 +728,15 @@ define([
             network.on('reconnect', function () {
                 if (channel && channel.stopped) { return; }
                 if (!channels[data.channel]) { return; }
+
+                if (!joining[data.channel]) {
+                    joining[data.channel] = function () {
+                        console.log("reconnected to %s", data.channel);
+                    };
+                } else {
+                    console.error("Reconnected to a chat channel (%s) which was not fully connected", data.channel);
+                }
+
                 network.join(data.channel).then(onOpen, function (err) {
                     console.error(err);
                 });

www/common/common-util.js

@@ -222,13 +222,14 @@
         return Math.floor(Math.random() * Number.MAX_SAFE_INTEGER);
     };
 
+    Util.noop = function () {};
+
     /* for wrapping async functions such that they can only be called once */
-    Util.once = function (f) {
+    Util.once = function (f, g) {
-        var called;
         return function () {
-            if (called) { return; }
+            if (!f) { return; }
-            called = true;
             f.apply(this, Array.prototype.slice.call(arguments));
+            f = g;
         };
     };
 

www/common/cryptpad-common.js

@@ -1346,7 +1346,7 @@ define([
                     console.log(parsed);
                     return;
                 } else {
-                    console.log(parsed);
+                    //console.log(parsed);
                 }
                 Util.fetch(parsed.href, waitFor(function (err, arraybuffer) {
                     if (err) { return void console.log(err); }

www/common/notify.js

@@ -6,7 +6,7 @@ define(['/api/config'], function (ApiConfig) {
 
 
     var isSupported = Module.isSupported = function () {
-        return typeof(window.Notification) === 'function';
+        return typeof(window.Notification) === 'function' && window.location.protocol === 'https:';
     };
 
     var hasPermission = Module.hasPermission = function () {
@@ -52,7 +52,7 @@ define(['/api/config'], function (ApiConfig) {
     };
 
     var createFavicon = function () {
-        console.log("creating favicon");
+        console.debug("creating favicon");
         var fav = document.createElement('link');
         var attrs = {
             id: 'favicon',

www/common/sframe-common-mailbox.js

@@ -126,7 +126,7 @@ define([
 
         var onMessage = function (data, cb) {
             // data = { type: 'type', content: {msg: 'msg', hash: 'hash'} }
-            console.log(data.type, data.content);
+            console.debug(data.type, data.content);
             pushMessage(data);
             if (data.content && typeof (data.content.getFormatText) == "function") {
                 var text = $('<div>').html(data.content.getFormatText()).text();