Merge branch 'staging' into workgroups

customize.dist/main.css

@@ -337,6 +337,12 @@ html.cp,
   font-family: Georgia,Cambria,serif;
   height: 100;
 }
+.cp:not(.poll) #language-selector {
+  position: absolute;
+  top: 0px;
+  right: 0px;
+  display: inline-block;
+}
 .cp {
   /* buttons */
   /*  Tables
@@ -348,11 +354,6 @@ html.cp,
   font-weight: 400;
   line-height: 2rem;
 }
-.cp #language-selector {
-  position: absolute;
-  top: 0px;
-  right: 0px;
-}
 .cp a.github-corner > svg {
   fill: #00ADEE;
   color: #302B28;
@@ -652,7 +653,7 @@ html.cp,
 }
 .cp form.realtime table input[type="text"],
 .cp div.realtime table input[type="text"] {
-  height: 100%;
+  height: auto;
   border: 1px solid #302B28;
   width: 80%;
 }
@@ -902,3 +903,6 @@ html.cp,
 .cp div#modal #addtime {
   border-bottom-left-radius: 5px;
 }
+#cors-store {
+  display: none;
+}

customize.dist/share/frame.js

@@ -18,12 +18,13 @@
             onload('[timeoutError] could not load iframe at ' + src);
         }, timeout);
 
+        iframe.setAttribute('id', 'cors-store');
+
         iframe.onload = function (e) {
             onload(void 0, iframe, e);
             window.clearTimeout(to);
         };
         iframe.setAttribute('src', src);
-        iframe.style.display = 'none';
 
         parent.appendChild(iframe);
     };

customize.dist/src/less/cryptpad.less

@@ -14,6 +14,15 @@ html.cp, .cp body {
     height: 100;
 }
 
+.cp:not(.poll) {
+    #language-selector {
+        position: absolute;
+        top: 0px;
+        right: 0px;
+        display: inline-block;
+    }
+}
+
 .cp {
 
 body {
@@ -22,12 +31,6 @@ body {
     line-height: 2rem;
 }
 
-#language-selector {
-    position: absolute;
-    top: 0px;
-    right: 0px;
-}
-
 a.github-corner > svg {
     fill: @cp-blue;
     color: @base;
@@ -359,7 +362,7 @@ form.realtime, div.realtime {
 
         input {
             &[type="text"] {
-                height: 100%;
+                height: auto;
                 border: 1px solid @base;
                 width: 80%;
             }
@@ -625,3 +628,7 @@ div.modal, div#modal {
 }
 }
 
+// hack for our cross-origin iframe
+#cors-store {
+    display: none;
+}

customize.dist/src/less/toolbar.less

@@ -242,6 +242,7 @@
         right: 0;
         span:not(.cryptpad-lag) {
             vertical-align: top;
+            display: inline-block;
         }
         @media screen and (max-width: @media-narrow-screen) {
             top: 3em;

customize.dist/toolbar.css

@@ -247,6 +247,7 @@
 }
 .cryptpad-toolbar-top .cryptpad-user span:not(.cryptpad-lag) {
   vertical-align: top;
+  display: inline-block;
 }
 @media screen and (max-width: 400px) {
   .cryptpad-toolbar-top .cryptpad-user {

www/common/toolbar.js

@@ -506,12 +506,17 @@ define([
             };
             $(config.ifrw).on('click', removeDropdowns);
             $(config.ifrw).on('click', cancelEditTitle);
+
+        try {
             if (config.ifrw.$('iframe').length) {
                 var innerIfrw = config.ifrw.$('iframe').each(function (i, el) {
                     $(el.contentWindow).on('click', removeDropdowns);
                     $(el.contentWindow).on('click', cancelEditTitle);
                 });
             }
+        } catch (e) {
+            // empty try catch in case this iframe is problematic
+        }
         }
 
         // Update user list

www/pad/main.js

@@ -627,7 +627,10 @@ define([
 
             // this should only ever get called once, when the chain syncs
             var onReady = realtimeOptions.onReady = function (info) {
+                if (!APP.isMaximized) {
                     editor.execCommand('maximize');
+                    APP.isMaximized = true;
+                }
 
                 module.patchText = TextPatcher.create({
                     realtime: info.realtime,

www/poll/index.html

@@ -80,6 +80,7 @@
             width: 50px;
         }
         #tableScroll {
+            overflow-y: hidden;
             overflow-x: auto; margin-left: calc(30% - 50px + 29px); max-width: 70%; width: auto; display: inline-block;
         }
         #description {

www/poll/old/main.js

@@ -1,8 +1,8 @@
 define([
     '/api/config?cb=' + Math.random().toString(16).substring(2),
     '/customize/messages.js?app=poll',
-    '/poll/table.js',
+    'table.js',
-    '/poll/wizard.js',
+    'wizard.js',
     '/bower_components/textpatcher/TextPatcher.js',
     '/bower_components/chainpad-listmap/chainpad-listmap.js',
     '/bower_components/chainpad-crypto/crypto.js',

www/poll/old/wizard.js

@@ -1,5 +1,5 @@
 define([
-    '/poll/table.js',
+    'table.js',
     '/bower_components/jquery/dist/jquery.min.js',
 ], function (Table) {
     var $ = window.jQuery;