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

customize.dist/src/less/cryptpad.less

@@ -617,7 +617,7 @@ noscript {
     opacity: 0.7;
     font-family: Ubuntu,Georgia,Cambria,serif;
     box-sizing: border-box;
-    z-index:10;
+    z-index:10000;
     display: none;
     #uploadStatus {
         width: 80vw;

package.json

@@ -18,7 +18,6 @@
   "scripts": {
     "lint": "jshint --config .jshintrc --exclude-path .jshintignore .",
     "test": "node TestSelenium.js",
-    "style": "lessc ./customize.dist/src/less/toolbar.less > ./customize.dist/toolbar.css",
     "template": "cd customize.dist/src && for page in ../index.html ../privacy.html ../terms.html ../about.html ../contact.html ../../www/login/index.html ../../www/register/index.html ../../www/settings/index.html ../../www/user/index.html;do echo $page; cp template.html $page; done;"
   }
 }

rpc.js

@@ -578,8 +578,7 @@ var resetUserPins = function (Env, publicKey, channelList, cb) {
         });
     }
 
-    var pins = session.channels = {};
-
+    var pins = {};
     getMultipleFileSize(Env, channelList, function (e, sizes) {
         if (e) { return void cb(e); }
         var pinSize = sumChannelSizes(sizes);
@@ -606,6 +605,8 @@ var resetUserPins = function (Env, publicKey, channelList, cb) {
                     pins[channel] = true;
                 });
 
+                // update in-memory cache IFF the reset was allowed.
+                session.channels = pins;
                 getHash(Env, publicKey, function (e, hash) {
                     cb(e, hash);
                 });

www/common/cryptpad-common.js

@@ -1622,7 +1622,10 @@ define([
                         common.arePinsSynced(function (err, yes) {
                             if (!yes) {
                                 common.resetPins(function (err) {
-                                    if (err) { console.error(err); }
+                                    if (err) {
+                                        console.error("Pin Reset Error");
+                                        return console.error(err);
+                                    }
                                     console.log('RESET DONE');
                                 });
                             }

www/common/toolbar2.js

@@ -48,19 +48,6 @@ define([
         return 'cryptpad-uid-' + String(Math.random()).substring(2);
     };
 
-    var styleToolbar = function ($container, href, version, force) {
-        if (!force) { return; }
-        href = href || '/customize/toolbar.css' + (version?('?' + version): '');
-
-        $.ajax({
-            url: href,
-            dataType: 'text',
-            success: function (data) {
-                $container.append($('<style>').text(data));
-            },
-        });
-    };
-
     var createRealtimeToolbar = function (config) {
         if (!config.$container) { return; }
         var $container = config.$container;
@@ -108,11 +95,6 @@ define([
 
         $container.prepend($toolbar);
 
-        if (ApiConfig && ApiConfig.requireConf && ApiConfig.requireConf.urlArgs) {
-            styleToolbar($container, undefined, ApiConfig.requireConf.urlArgs, config.legacyStyle);
-        } else {
-            styleToolbar($container, void 0, void 0, config.legacyStyle);
-        }
         $container.on('drop dragover', function (e) {
             e.preventDefault();
             e.stopPropagation();

www/pad/index.html

@@ -24,29 +24,6 @@
             padding:0;
             overflow:hidden;
         }
-        #feedback {
-            display: none;
-            position: fixed;
-            top: 0px;
-            right: 0px;
-            border: 0px;
-            height: 100vh;
-            width: 30vw;
-            background-color: #222;
-            color: #ccc;
-        }
-        #debug {
-            height: 20px;
-            position: absolute;
-            right: 0px;
-            top: 70px;
-        }
-        #debug button {
-            visibility: hidden;
-        }
-        #debug:hover button {
-            visibility: visible;
-        }
     </style>
 </head>
 <body>

www/pad/inner.js

@@ -1,3 +1,3 @@
 define([
-    //'less!/customize/src/less/toolbar.less',
+    'less!/customize/src/less/toolbar.less',
 ], function () {});

www/pad/main.js

@@ -472,10 +472,19 @@ define([
                     network: info.network,
                     $container: $bar,
                     $contentContainer: $iframe.find('#cke_1_contents'),
-                    legacyStyle: true,
                 };
                 toolbar = info.realtime.toolbar = Toolbar.create(configTb);
 
+                var src = 'less!/customize/src/less/toolbar.less';
+                require([
+                    src
+                ], function () {
+                    var $html = $bar.closest('html');
+                    $html
+                        .find('head style[data-original-src="' + src.replace(/less!/, '') + '"]')
+                        .appendTo($html.find('head'));
+                });
+
                 Title.setToolbar(toolbar);
 
                 var $rightside = toolbar.$rightside;

www/slide/index.html

@@ -31,10 +31,6 @@
             top: 0px;
             height: 100%;
         }
-        body #iframe-container.fullscreen {
-            top: 0px;
-            height: 100%;
-        }
      </style>
 </head>
 <body>