Merge branch 'newpoll' into staging

2017-10-05 17:56:17 +02:00
parent 7559bc062e 1c4f1c785d
commit ab3648a30a
20 changed files with 3350 additions and 928 deletions
--- a/www/common/sframe-common-outer.js
+++ b/www/common/sframe-common-outer.js
@@ -65,6 +65,7 @@ define([
                Cryptpad.ready(waitFor());
            }));
        }).nThen(function (waitFor) {
+            $('#sbox-iframe').focus();

            sframeChan.on('EV_CACHE_PUT', function (x) {
                Object.keys(x).forEach(function (k) {