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

www/whiteboard/main.js

@@ -106,10 +106,9 @@ define([
             var $picker = $('<input>', {
                 type: 'color',
                 value: '#FFFFFF',
-            })
-            .css({
-                visibility: 'hidden'
-            })
+                })
+            // TODO confirm that this is safe to remove
+            //.css({ visibility: 'hidden' })
             .on('change', function () {
                 var color = this.value;
                 cb(color);
@@ -242,6 +241,7 @@ define([
         };
 
         var addColorToPalette = function (color, i) {
+            if (readOnly) { return; }
             var $color = $('<span>', {
                 'class': 'palette-color',
             })
@@ -252,7 +252,6 @@ define([
                 var c = rgb2hex($color.css('background-color'));
                 setColor(c);
             })
-            // FIXME double click doesn't seem to work in chromium currently
             .on('dblclick', function (e) {
                 e.preventDefault();
                 pickColor(rgb2hex($color.css('background-color')), function (c) {
@@ -263,19 +262,17 @@ define([
                     config.onLocal();
                     setColor(c);
                 });
-                // TODO commit chosen color to pad metadata:
-                // json.metadata.palette[i]
             });
 
             $colors.append($color);
         };
-        palette.forEach(addColorToPalette);
 
         var updatePalette = function (newPalette) {
             palette = newPalette;
-            $colors.html('&nbsp;');
+            $colors.html('<div class="hidden">&nbsp;</div>');
             palette.forEach(addColorToPalette);
         };
+        updatePalette(palette);
 
         var suggestName = function (fallback) {
             if (document.title === defaultName) {