Merge branch 'staging' into workgroups

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) {
-                editor.execCommand('maximize');
+                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',
-    '/poll/wizard.js',
+    'table.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;