From c1275b567109d033f181260e2ef84a302152c132 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 27 Sep 2017 10:28:10 +0200
Subject: [PATCH 01/20] Prepare secure poll

---
 www/{poll => oldpoll}/index.html | 0
 www/{poll => oldpoll}/main.js    | 0
 www/{poll => oldpoll}/poll.less  | 0
 www/{poll => oldpoll}/render.js  | 0
 4 files changed, 0 insertions(+), 0 deletions(-)
 rename www/{poll => oldpoll}/index.html (100%)
 rename www/{poll => oldpoll}/main.js (100%)
 rename www/{poll => oldpoll}/poll.less (100%)
 rename www/{poll => oldpoll}/render.js (100%)

diff --git a/www/poll/index.html b/www/oldpoll/index.html
similarity index 100%
rename from www/poll/index.html
rename to www/oldpoll/index.html
diff --git a/www/poll/main.js b/www/oldpoll/main.js
similarity index 100%
rename from www/poll/main.js
rename to www/oldpoll/main.js
diff --git a/www/poll/poll.less b/www/oldpoll/poll.less
similarity index 100%
rename from www/poll/poll.less
rename to www/oldpoll/poll.less
diff --git a/www/poll/render.js b/www/oldpoll/render.js
similarity index 100%
rename from www/poll/render.js
rename to www/oldpoll/render.js

From 66da349ee404782bdfda236602b02c07b2074ffb Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 27 Sep 2017 18:52:04 +0200
Subject: [PATCH 02/20] Sandboxed Poll app with less2

---
 customize.dist/pages.js            |  31 +-
 customize.dist/src/less2/main.less |   2 +-
 www/drive/inner.js                 |   4 -
 www/poll/app-drive.less            | 820 ++++++++++++++++++++++++
 www/poll/app-poll.less             | 477 ++++++++++++++
 www/poll/index.html                |  38 ++
 www/poll/inner.html                |  20 +
 www/poll/inner.js                  | 972 +++++++++++++++++++++++++++++
 www/poll/main.js                   |  41 ++
 www/poll/render.js                 | 453 ++++++++++++++
 www/whiteboard/inner.js            |   2 +-
 11 files changed, 2837 insertions(+), 23 deletions(-)
 create mode 100644 www/poll/app-drive.less
 create mode 100644 www/poll/app-poll.less
 create mode 100644 www/poll/index.html
 create mode 100644 www/poll/inner.html
 create mode 100644 www/poll/inner.js
 create mode 100644 www/poll/main.js
 create mode 100644 www/poll/render.js

diff --git a/customize.dist/pages.js b/customize.dist/pages.js
index 55945ccd2..2427b2a28 100644
--- a/customize.dist/pages.js
+++ b/customize.dist/pages.js
@@ -638,48 +638,45 @@ define([
 
     Pages['/poll/'] = Pages['/poll/index.html'] = function () {
         return [
-            appToolbar(),
-            h('div#content', [
-                h('div#poll', [
-                    h('div#howItWorks', [
+            appToolbar3(),
+            h('div#cp-app-poll-content', [
+                h('div#cp-app-poll-form', [
+                    h('div#cp-app-poll-help', [
                         h('h1', 'CryptPoll'),
                         setHTML(h('h2'), Msg.poll_subtitle),
                         h('p', Msg.poll_p_save),
                         h('p', Msg.poll_p_encryption)
                     ]),
-                    h('div.upper', [
-                        h('button#publish.btn.btn-success', {
+                    h('div.cp-app-poll-upper', [
+                        h('button#cp-app-poll-action-publish.btn.btn-success', {
                             style: { display: 'none' }
                         }, Msg.poll_publish_button),
-                        h('button#admin.btn.btn-primary', {
+                        h('button#cp-app-poll-action-admin.btn.btn-primary', {
                             style: { display: 'none' },
                             title: Msg.poll_admin_button
                         }, Msg.poll_admin_button),
-                        h('button#help.btn.btn-secondary', {
+                        h('button#cp-app-poll-action-help.btn.btn-secondary', {
                             title: Msg.poll_show_help_button
                         }, Msg.poll_show_help_button)
                     ]),
-                    h('div.realtime', [
+                    h('div.cp-app-poll-realtime', [
                         h('br'),
                         h('center', [
-                            h('textarea#description', {
+                            h('textarea#cp-app-poll-description', {
                                 rows: "5",
                                 cols: "50",
                                 disabled: true
                             }),
                             h('br')
                         ]),
-                        h('div#tableContainer', [
-                            h('div#tableScroll'),
-                            h('button#create-user.btn.btn-secondary', {
+                        h('div#cp-app-poll-table-container', [
+                            h('div#cp-app-poll-table-scroll'),
+                            h('button#cp-app-poll-create-user.btn.btn-secondary', {
                                 title: Msg.poll_create_user
                             }, h('span.fa.fa-plus')),
-                            h('button#create-option.btn.btn-secondary', {
+                            h('button#cp-app-poll-create-option.btn.btn-secondary', {
                                 title: Msg.poll_create_option
                             }, h('span.fa.fa-plus')),
-                            h('button#commit.btn.btn-secondary', {
-                                title: Msg.poll_commit
-                            }, h('span.fa.fa-check'))
                         ])
                     ])
                 ])
diff --git a/customize.dist/src/less2/main.less b/customize.dist/src/less2/main.less
index 51450db27..5f7c7e071 100644
--- a/customize.dist/src/less2/main.less
+++ b/customize.dist/src/less2/main.less
@@ -28,6 +28,6 @@ body.cp-app-code { @import "../../../code/app-code.less"; }
 body.cp-app-slide { @import "../../../slide/app-slide.less"; }
 body.cp-app-file { @import "../../../file/app-file.less"; }
 body.cp-app-filepicker { @import "../../../filepicker/app-filepicker.less"; }
-//body.cp-app-poll { @import "../../../poll/app-poll.less"; }
+body.cp-app-poll { @import "../../../poll/app-poll.less"; }
 body.cp-app-whiteboard { @import "../../../whiteboard/app-whiteboard.less"; }
 
diff --git a/www/drive/inner.js b/www/drive/inner.js
index f8ed897ed..fdde8d906 100644
--- a/www/drive/inner.js
+++ b/www/drive/inner.js
@@ -1,6 +1,5 @@
 define([
     'jquery',
-    '/bower_components/chainpad-crypto/crypto.js',
     '/bower_components/textpatcher/TextPatcher.js',
     '/common/toolbar3.js',
     'json.sortify',
@@ -12,7 +11,6 @@ define([
     '/common/common-realtime.js',
     '/common/userObject.js',
     '/customize/application_config.js',
-    '/common/mergeDrive.js',
     '/common/sframe-chainpad-listmap.js',
 
     'css!/bower_components/bootstrap/dist/css/bootstrap.min.css',
@@ -20,7 +18,6 @@ define([
     'less!/customize/src/less2/main.less',
 ], function (
     $,
-    Crypto,
     TextPatcher,
     Toolbar,
     JSONSortify,
@@ -32,7 +29,6 @@ define([
     CommonRealtime,
     FO,
     AppConfig,
-    Merge,
     Listmap)
 {
     var Messages = Cryptpad.Messages;
diff --git a/www/poll/app-drive.less b/www/poll/app-drive.less
new file mode 100644
index 000000000..ea027d76e
--- /dev/null
+++ b/www/poll/app-drive.less
@@ -0,0 +1,820 @@
+@import (once) "../../customize/src/less2/include/browser.less";
+@import (once) "../../customize/src/less2/include/toolbar.less";
+@import (once) "../../customize/src/less2/include/markdown.less";
+@import (once) '../../customize/src/less2/include/fileupload.less';
+@import (once) '../../customize/src/less2/include/alertify.less';
+@import (once) '../../customize/src/less2/include/leftside-menu.less';
+@import (once) "../../customize/src/less2/include/tools.less";
+@import (once) "../../customize/src/less2/include/limit-bar.less";
+
+.toolbar_main();
+.fileupload_main();
+.alertify_main();
+.limit-bar_main();
+
+@drive_hover: #eee;
+@drive_hover-light: lighten(@drive_hover, 20%);
+@drive_info-box-bg: #d2e1f2;
+@drive_info-box-border: #bbb;
+@drive_table-header-fg: #555;
+@drive_table-header-bg: #e8e8e8;
+@drive_mobile-tree-border-col: #ccc;
+
+@drive_content-fg: @colortheme_sidebar-right-fg;
+@drive_content-bg: @colortheme_sidebar-right-bg;
+@drive_content-bg-ro: darken(@drive_content-bg, 10%);
+
+
+/* PAGE */
+
+display: flex;
+flex-flow: column;
+max-height: 100%;
+min-height: auto;
+
+.cp-unselectable {
+    .tools_unselectable();
+}
+
+/* local mixins */
+.drive_fileIcon {
+    li {
+        display: inline-block;
+        margin: 10px 10px;
+        width: 140px;
+        height: 140px;
+        text-align: center;
+        vertical-align: top;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        padding-top: 5px;
+        padding-bottom: 5px;
+
+        &:not(.cp-app-drive-element-selected):not(.cp-app-drive-element-selected-tmp) {
+            border: 1px solid #CCC;
+        }
+        .cp-app-drive-element-name {
+            width: 100%;
+            height: 48px;
+            margin: 8px 0;
+            display: inline-block;
+            //align-items: center;
+            //justify-content: center;
+            overflow: hidden;
+            //text-overflow: ellipsis;
+            word-wrap: break-word;
+        }
+        .cp-app-drive-element-truncated {
+            display: block;
+            position: absolute;
+            bottom: 0px;
+            left: 0; right: 0;
+            text-align: center;
+        }
+        img.cp-app-drive-content-icon {
+            height: 48px;
+            max-height: none;
+            max-width: none;
+            margin: 8px 0;
+        }
+        .fa {
+            display: block;
+            margin: auto;
+            font-size: 48px;
+            margin: 8px 0;
+            text-align: center;
+            &.listonly {
+                display: none;
+            }
+        }
+    }
+}
+
+img.cp-app-drive-icon {
+    max-width: 20px;
+    max-height: 16px;
+}
+
+.cp-app-drive-container {
+    flex: 1;
+    overflow: auto;
+    width: 100%;
+    display: flex;
+    flex-flow: row;
+    @media screen and (max-width: @browser_media-medium-screen) {
+        display: block;
+        #cp-app-drive-toolbar {
+            .path .element {
+                display: none;
+            }
+        }
+        #cp-app-drive-tree {
+            resize: none;
+            width: 100%;
+            max-width: unset;
+            max-height: unset;
+            border-bottom: 1px solid @drive_mobile-tree-border-col;
+            .cp-app-drive-tree-category {
+                margin-top: 0.5em;
+            }
+        }
+    }
+}
+
+div:focus {
+    outline: none;
+}
+
+.fa {
+    font-family: FontAwesome;
+}
+
+ul {
+    list-style: none;
+    padding-left: 0px; // Remove the default padding
+}
+
+li {
+    padding: 0px 5px;
+    -webkit-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+}
+
+.cp-app-drive-context {
+    display: none;
+    position: absolute;
+    z-index: 500;
+    li {
+        padding: 0;
+        font-size: @colortheme_app-font-size;
+        a {
+            cursor: pointer;
+        }
+    }
+}
+
+.cp-app-drive-element-droppable {
+    background-color: #FE9A2E;
+    color: #222;
+}
+
+.cp-app-drive-element-selected {
+    background: #666 !important;
+    color: #eee;
+    margin: -1px;
+    .fa-minus-square-o, .fa-plus-square-o {
+        color: @colortheme_sidebar-left-fg;
+    }
+}
+
+.cp-app-drive-element-selected-tmp {
+    border: 1px dotted #bbb;
+    background: #AAA;
+    color: #ddd;
+    margin: -1px;
+    .fa-minus-square-o, .fa-plus-square-o {
+        color: @colortheme_sidebar-left-fg;
+    }
+}
+
+span {
+    &.fa-folder, &.fa-folder-open {
+        //color: #FEDE8B;
+        //text-shadow: -1px 0 black, 0 1px black, 1px 0 black, 0 -1px black;
+    }
+}
+
+/* TREE */
+
+
+#cp-app-drive-tree {
+    font-size: @colortheme_app-font-size;
+    //border-right: 1px solid #ccc;
+    box-sizing: border-box;
+    background: @colortheme_sidebar-left-bg;
+    overflow: auto;
+    resize: horizontal;
+    width: auto;
+    white-space: nowrap;
+    max-width: 500px;
+    min-width: 200px;
+    padding: 0px;
+    color: @colortheme_sidebar-left-fg;
+    display: flex;
+    flex-flow: column;
+    max-height: 100%;
+    .cp-app-drive-tree-categories-container {
+        flex: 1;
+        max-width: 500px;
+        overflow: auto;
+    }
+    img.cp-app-drive-icon {
+        margin-bottom: 3px;
+        margin-left: -2px;
+    }
+    .cp-app-drive-tree-docs {
+        margin-top: 20px;
+        //padding: 0 0 0 20px;
+        padding: 0;
+        cursor: auto;
+        &li, li {
+            padding: 0;
+            &.cp-app-drive-element-collapsed ul {
+                display: none;
+            }
+            input {
+                width: ~"calc(100% - 30px)";
+                padding: 0 10px;
+                border: 0;
+                color: lighten(@colortheme_sidebar-left-fg, 40%);
+            }
+            & > span.cp-app-drive-element-row {
+                overflow: hidden;
+                text-overflow: ellipsis;
+                //min-width: ~"calc(100% + 5px)";
+                .leftside-menu-category_main();
+                width: ~"calc(100% + 5px)";
+                margin: 0;
+                margin-bottom: -6px;
+                display: inline-block;
+                cursor: pointer;
+                margin-left: -5px;
+                padding-left: 5px;
+            }
+            & > span.cp-app-drive-element-row:not(.cp-app-drive-element-selected):not(.cp-app-drive-element-active):hover {
+            }
+        }
+    }
+    span.cp-app-drive-element {
+        cursor: pointer;
+    }
+    .cp-app-drive-tree-category {
+        margin: 0;
+        margin-top: 15px;
+        .cp-app-drive-tree-root {
+            &> .fa {
+                min-width: 30px;
+                cursor: pointer;
+            }
+        }
+        li {
+            padding: 0;
+            .cp-app-drive-element-row {
+                display: block;
+                padding-left: 20px;
+                .leftside-menu-category_main();
+                margin: 0;
+                .fa {
+                    width: 25px;
+                }
+            }
+        }
+    }
+    .cp-app-drive-tree-category:last-child {
+        margin-bottom: 20px;
+    }
+    .limit-container {
+        margin-top: 0;
+    }
+    #cp-app-drive-tree-search {
+        text-align: center;
+        padding: 0;
+        position: relative;
+        input {
+            background: lighten(@colortheme_drive-bg, 8%);
+            color: @colortheme_drive-color;
+            .tools_placeholder-color(@colortheme_drive-color);
+            outline-width: 0px;
+            border-radius: 0;
+            width: 100%;
+            //border: 1px solid #ccc;
+            border: 0;
+            border-right: 1px solid lighten(@colortheme_drive-bg, 16%);
+            //border-right: 0;
+            height: @variables_bar-height;
+            padding: 0 5px;
+            padding-left: 45px;
+            &:focus {
+                outline-width: 0px;
+            }
+        }
+        .cp-app-drive-tree-search-con {
+            color: @colortheme_drive-color;
+            position: absolute;
+            left: 20px; // TODO align with drive categories
+            top: 8px;
+        }
+    }
+    .fa.cp-app-drive-icon-expcol {
+        margin-left: -10px;
+        font-size: 14px;
+        position: absolute;
+        left: -20px;
+        top: 10px;
+        width: 11px !important;
+        height: 11px !important;
+        padding: 0;
+        margin: 0;
+        background: white;
+        z-index: 10;
+        cursor: default;
+        &:before {
+            position:relative;
+            top: -1px;
+        }
+    }
+    .cp-app-drive-tree-docs {
+        .cp-app-drive-tree-root > .cp-app-drive-element-row > .cp-app-drive-icon-expcol {
+            position: relative;
+            top:0;
+            left: -10px;
+        }
+        .cp-app-drive-tree-root > .cp-app-drive-element-row > .cp-app-drive-icon-folder {
+            margin-left: -5px;
+        }
+        .cp-app-drive-tree-root {
+            &> .cp-app-drive-element-row {
+                padding-left: 20px;
+            }
+            &> ul {
+                padding-left: 30px;
+            }
+        }
+    }
+
+    // Expand/collapse lines
+    .cp-app-drive-tree-docs ul {
+        margin: 0px 0px 0px 10px;
+        list-style: none;
+        padding-left: 10px;
+        li {
+            position: relative;
+            &:before {
+                position: absolute;
+                left: -15px;
+                top: -11px;
+                content: '';
+                display: block;
+                border-left: 1px solid @colortheme_sidebar-left-branch;
+                height: ~"calc(1em + 11px)";
+                border-bottom: 1px solid @colortheme_sidebar-left-branch;
+                width: 15px;
+            }
+            &:after {
+                position: absolute;
+                left: -15px;
+                bottom: -7px;
+                content: '';
+                display: block;
+                border-left: 1px solid @colortheme_sidebar-left-branch;
+                height: 100%;
+            }
+            &.cp-app-drive-tree-root {
+                margin: 0px 0px 0px -10px;
+                &:before {
+                    display: none;
+                }
+                &:after {
+                    display: none;
+                }
+            }
+            &:last-child:after {
+                display: none;
+            }
+        }
+    }
+}
+
+/* CONTENT */
+#cp-app-drive-content-container {
+    display: flex;
+    flex-flow: column;
+    flex: 1;
+    // Needed to avoid the folder's path to overflows
+    // https://stackoverflow.com/questions/38223879/white-space-nowrap-breaks-flexbox-layout
+    min-width: 0;
+}
+#cp-app-drive-content {
+    box-sizing: border-box;
+    background: @drive_content-bg;
+    color: @drive_content-fg;
+    overflow: auto;
+    flex: 1;
+    display: flex;
+    flex-flow: column;
+    position: relative;
+    .cp-app-drive-content-select-box {
+        display: none;
+        background-color: rgba(100, 100, 100, 0.7);
+        position: absolute;
+        z-index: 50;
+    }
+    &.cp-app-drive-readonly {
+        background: @drive_content-bg-ro;
+    }
+    h1 {
+        padding-left: 10px;
+        margin-top: 10px;
+    }
+    .cp-app-drive-content-info-box {
+        line-height: 2em;
+        padding: 0.25em 0.75em;
+        margin: 1em;
+        background: @drive_info-box-bg;
+        span {
+            cursor: pointer;
+            float: right;
+            margin-top: 0.5em;
+        }
+    }
+    li {
+        cursor: default;
+        &:not(.cp-app-drive-element-header) {
+            &:hover {
+                &:not(.-cp-app-drive-element-selected, .cp-app-drive-element-selected-tmp) {
+                    background-color: @drive_hover;
+                }
+            }
+        }
+    }
+    #cp-app-drive-content-folder {
+        li {
+            &.cp-app-drive-search-result {
+                border-bottom: 1px solid @drive_info-box-border;
+                display: block;
+                &:hover {
+                    background-color: initial;
+                }
+                table {
+                    width: 100%;
+                    .cp-app-drive-search-label2 {
+                        width: 150px;
+                        font-size: 15px;
+                        text-align: right;
+                        padding-right: 15px;
+                    }
+                    .cp-app-drive-search-opendir {
+                        a {
+                            cursor: pointer;
+                            color: #41b7d8;
+                            &:hover {
+                                color: #014c8c;
+                                text-decoration: underline;
+                            }
+                        }
+                    }
+                    .cp-app-drive-search-path {
+                        font-style: italic;
+                        direction: rtl;
+                        .cp-app-drive-path-element {
+                            display: inline-block;
+                            margin-right: 5px;
+                        }
+                    }
+                    .cp-app-drive-search-title {
+                        font-weight: bold;
+                        cursor: pointer;
+                        &:hover {
+                            background-color: @drive_hover;
+                        }
+                    }
+                    .cp-app-drive-search-col2 {
+                        width: 250px;
+                    }
+                    td.cp-app-drive-search-icon {
+                        width: 50px;
+                        font-size: 40px;
+                    }
+                }
+            }
+        }
+    }
+    .cp-app-drive-element {
+        .cp-app-drive-element-truncated { display: none; }
+    }
+    div.cp-app-drive-content-grid {
+        padding: 20px;
+        .drive_fileIcon;
+        li {
+            &.cp-app-drive-element {
+                position: relative;
+            }
+            input {
+                width: 100%;
+                margin-top: 5px;
+            }
+            .cp-app-drive-element-state {
+                position: absolute;
+                top: 3px;
+                right: 3px;
+                .fa {
+                    margin:0;
+                    font-size: 18px;
+                }
+            }
+        }
+        .cp-app-drive-element-list {
+            display: none;
+        }
+        .cp-app-drive-new-ghost {
+            cursor: pointer;
+            opacity: 0.5;
+            padding: 0;
+            &:hover {
+                opacity: 0.7;
+            }
+            .fa {
+                cursor: pointer;
+                font-size: 90px;
+                margin-top: 5px;
+                margin-bottom: 0;
+            }
+        }
+    }
+
+    .cp-app-drive-content-list {
+        .cp-app-drive-element-grid {
+            display: none;
+        }
+        // Make it act as a table!
+        padding-left: 20px;
+        ul {
+            display: table;
+            width: 100%;
+            padding: 0px 10px;
+        }
+        li {
+            display: table-row;
+            &> span {
+                padding: 0 5px;
+                display: table-cell;
+            }
+            &:not(.cp-app-drive-element-header) {
+                height: @variables_bar-height;
+                line-height: @variables_bar-height;
+            }
+            &.cp-app-drive-element-header {
+                cursor: default;
+                color: @drive_table-header-fg;
+                span {
+                    &:not(.fa) {
+                        text-align: left;
+                    }
+                    &.sortasc, &.sortdesc {
+                        float: right;
+                    }
+                }
+                &> span {
+                    padding: 15px 5px;
+                    &.cp-app-drive-sort-active {
+                        font-weight: bold;
+                    }
+                    &.cp-app-drive-sort-clickable {
+                        cursor: pointer;
+                        &:hover {
+                            background: @drive_table-header-bg;
+                        }
+                    }
+                }
+            }
+        }
+        .cp-app-drive-element {
+            span {
+                overflow: hidden;
+                white-space: nowrap;
+                box-sizing: border-box;
+                &.cp-app-drive-element-state {
+                    .fa:not(:last-child) {
+                        margin-right: 5px;
+                    }
+                }
+                &.cp-app-drive-content-icon, &.cp-app-drive-element-state {
+                    width: 30px;
+                }
+                &.cp-app-drive-element-type, &.cp-app-drive-element-atime, &.cp-app-drive-element-ctime {
+                    width: 175px;
+                }
+                &.cp-app-drive-element-title {
+                    width: 250px;
+                    @media screen and (max-width: 1200px) {
+                        display: none;
+                    }
+                }
+                &.cp-app-drive-element-folders, &.cp-app-drive-element-files {
+                    width: 150px;
+                }
+            }
+        }
+    }
+}
+
+#cp-app-drive-content-folder {
+    padding-right: 10px;
+    flex: 1;
+}
+
+#cp-app-drive-new-ghost-dialog.cp-modal-container {
+    .drive_fileIcon;
+
+    li:not(.cp-app-drive-element-selected):hover {
+        border: 1px solid white;
+    }
+    .cp-modal {
+        display: flex;
+        flex-flow: column;
+        li, li .fa {
+            cursor: pointer;
+        }
+        &> p {
+            margin: 50px;
+        }
+        &> div {
+            display: flex;
+            flex-wrap: wrap;
+            justify-content: center;
+            align-content: center;
+            overflow-y: auto;
+            .cp-app-drive-new-upload {
+                break-after: always;
+                page-break-after: always;
+            }
+        }
+    }
+
+    @media screen and (max-height: @browser_media-not-big) {
+        .cp-modal {
+            & > p {
+                display: none;
+            }
+            & > div {
+                align-content: unset;
+                li {
+                    height: 40px;
+                    width: 90%;
+                    display: flex;
+                    align-items: center;
+                    .fa {
+                        font-size: 32px;
+                    }
+                    .cp-app-drive-new-name {
+                        height: auto;
+                    }
+                }
+            }
+        }
+    }
+}
+
+
+/* Toolbar */
+
+#cp-app-drive-toolbar {
+    background: lighten(@colortheme_drive-bg, 8%);
+    color: @colortheme_drive-color;
+    //height: 30px;
+    //display: flex;
+    //flex-flow: row;
+    z-index: 100;
+    box-sizing: border-box;
+    height: @variables_bar-height;
+    padding: 0;
+    display: flex;
+    flex-flow: row;
+
+    * {
+        outline-width: 0;
+        &:focus {
+            outline-width: 0;
+        }
+    }
+
+    .history {
+        float: right;
+        .cp-toolbar-drawer-element {
+            display: none;
+        }
+    }
+
+    .cp-app-drive-toolbar-rightside, .cp-app-drive-toolbar-leftside {
+        display: inline-block;
+        margin: 0;
+        padding: 0;
+        .fa {
+            margin: 0;
+        }
+        button {
+            height: @variables_bar-height;
+            padding: 0 10px;
+            border: none;
+            border-radius: 0;
+            box-sizing: border-box;
+            background: transparent;
+            font-size: @colortheme_app-font-size;
+            color: @colortheme_drive-color;
+            transition: all 0.15s;
+            .drawer {
+                display: none;
+            }
+            .fa, span {
+                font-size: @colortheme_app-font-size;
+            }
+            &:hover {
+                background: @colortheme_drive-bg;
+            }
+            &.cp-app-drive-toolbar-active {
+                display: none;
+            }
+        }
+    }
+    .cp-app-drive-toolbar-rightside {
+        float: right;
+        & > * {
+            float: right;
+        }
+        #cp-app-drive-toolbar-contextbuttons {
+            display: inline-block;
+            height: 100%;
+        }
+        padding-left: 10px;
+    }
+    .cp-app-drive-toolbar-leftside {
+        & > span {
+            height: 100%;
+            margin: 0;
+        }
+        button {
+            padding: 0 10px;
+            .fa {
+                margin-right: 5px;
+            }
+            .cp-dropdown-button-title {
+                display: inline-flex;
+                height: @variables_bar-height;
+                align-items: center;
+                span:not(.fa) {
+                    line-height: 23px;
+                }
+            }
+        }
+    }
+
+    button {
+        font: @colortheme_app-font;
+        span {
+            font: @colortheme_app-font;
+        }
+        .fa, &.fa {
+            font-family: FontAwesome;
+        }
+    }
+    /* The container <div> - needed to position the dropdown content */
+    .cp-dropdown-container {
+        margin: 2px 2px;
+        line-height: 1em;
+        position: relative;
+        display: inline-block;
+    }
+    .cp-dropdown-content {
+        margin-right: 2px;
+    }
+
+    .cp-app-drive-path {
+        flex: 1;
+        width: 100%;
+        height: @variables_bar-height;
+        line-height: @variables_bar-height;
+        cursor: default;
+        width: auto;
+        overflow: hidden;
+        white-space: nowrap;
+        direction: rtl;
+        max-width: 100%;
+        text-align: left;
+        .cp-app-drive-path-element {
+            display: inline-block;
+            height: @variables_bar-height;
+            line-height: @variables_bar-height;
+            font-size: @colortheme_app-font-size;
+            padding: 0 5px;
+            border: 0;
+            background: darken(@colortheme_drive-bg, 10%);
+            color: @colortheme_drive-color;
+            box-sizing: border-box;
+            transition: all 0.15s;
+            &.cp-app-drive-path-separator {
+                color: #ccc;
+            }
+            &.cp-app-drive-path-lickable {
+                cursor: pointer;
+                &:hover {
+                    background: darken(@colortheme_drive-bg, 15%);
+                }
+            }
+        }
+    }
+}
+
+
+
diff --git a/www/poll/app-poll.less b/www/poll/app-poll.less
new file mode 100644
index 000000000..fd751249d
--- /dev/null
+++ b/www/poll/app-poll.less
@@ -0,0 +1,477 @@
+@import (once) "../../customize/src/less2/include/browser.less";
+@import (once) "../../customize/src/less2/include/toolbar.less";
+@import (once) "../../customize/src/less2/include/markdown.less";
+@import (once) '../../customize/src/less2/include/fileupload.less';
+@import (once) '../../customize/src/less2/include/alertify.less';
+@import (once) '../../customize/src/less2/include/tokenfield.less';
+
+.toolbar_main();
+.fileupload_main();
+.alertify_main();
+.tokenfield_main();
+
+@poll-fore: #555;
+@poll-th-bg: #aaa;
+@poll-th-user-bg: #999;
+@poll-td-bg: #aaa;
+@poll-editing: #88b8cc;
+@poll-placeholder: #666;
+@poll-border-color: #555;
+@poll-cover-color: #000;
+@poll-fg: #000;
+@poll-option-yellow: #ff5;
+@poll-option-gray: #ccc;
+
+.bottom-left(@s: 5px) { border-bottom-left-radius: @s; }
+.top-left(@s: 5px) { border-top-left-radius: @s; }
+
+display: flex;
+flex-flow: column;
+overflow-x: hidden;
+
+#cp-app-poll-content {
+    display: flex;
+    flex: 1;
+    #cp-app-poll-form {
+        flex: 1;
+        overflow-y: auto;
+    }
+}
+
+/*.cp-toolbar-container h2 {
+    font: normal normal normal 12px Arial, Helvetica, Tahoma, Verdana, Sans-Serif;
+    color: #000;
+    line-height: auto;
+}
+.cp-toolbar-container {
+    display: block;
+}*/
+
+.cp-app-poll-table-text-cell input[type="text"] {
+    width: 400px;
+}
+
+input[type="text"], textarea {
+    background-color: white;
+    color: black;
+    border: 0;
+}
+
+input[type="text"][disabled], textarea[disabled] {
+    background-color: transparent;
+    border: 0px;
+}
+
+// The placeholder color only seems to effect Safari when not set
+
+input[type="text"]::placeholder {
+    color: @poll-placeholder;
+}
+
+table#cp-app-poll-table {
+    margin: 0px;
+}
+#cp-app-poll-table-container {
+    position: relative;
+    padding: 29px;
+    padding-right: 79px;
+}
+#cp-app-poll-table-container button {
+    height: 2rem;
+    display: none;
+}
+#cp-app-poll-publish {
+    display: none;
+}
+#cp-app-poll-action-publish, #cp-app-poll-action-admin {
+    margin-top: 15px;
+    margin-bottom: 15px;
+}
+#cp-app-poll-create-user {
+    position: absolute;
+    display: inline-block;
+    /*left: 0px;*/
+    top: 55px;
+    width: 50px;
+    overflow: hidden;
+}
+#cp-app-poll-create-option {
+    width: 50px;
+}
+#cp-app-poll-table-scroll {
+    overflow-y: hidden;
+    overflow-x: auto;
+    margin-left: calc(~"30% - 50px + 31px");
+    max-width: 70%;
+    width: auto;
+    display: inline-block;
+}
+#cp-app-poll-description {
+    padding: 15px;
+    margin: auto;
+
+    min-width: 80%;
+    width: 80%;
+    min-height: 7em;
+    font-size: 20px;
+    font-weight: bold;
+    border: 1px solid black;
+
+}
+#cp-app-poll-description[disabled] {
+    resize: none;
+    color: #000;
+    border: 1px solid #444;
+}
+
+#cp-app-poll-help {
+    width: 80%;
+    margin: auto;
+}
+div.cp-app-poll-upper {
+    width: 80%;
+    margin: auto;
+
+    & > * {
+        margin-right: 1em;
+    }
+}
+
+// from cryptpad.less
+
+table {
+    border-collapse: collapse;
+    border-spacing: 0;
+    margin: 20px;
+}
+tbody {
+    border: 1px solid @poll-border-color;
+    * {
+        box-sizing: border-box;
+    }
+    tr {
+        text-align: center;
+        &:first-of-type th{
+            font-size: 20px;
+            border-top: 0px;
+            font-weight: bold;
+            padding: 10px;
+            text-decoration: underline;
+            &.table-refresh {
+                color: @colortheme_cp-green;
+                text-decoration: none;
+                cursor: pointer;
+            }
+
+        }
+        &:nth-child(odd) {
+            background-color: @colortheme_light-base;
+        }
+        th:first-of-type {
+            border-left: 0px;
+        }
+        th {
+            box-sizing: border-box;
+            border: 1px solid @poll-border-color;
+        }
+        th, td {
+            color: @poll-fore;
+
+            .cp-app-poll-table-remove {
+                cursor: pointer;
+            }
+        }
+        th:last-child {
+            border-right: 0px;
+        }
+    }
+
+    td {
+        border-right: 1px solid @poll-border-color;
+        padding: 12px;
+        padding-top: 0px;
+        padding-bottom: 0px;
+        &:last-child {
+            border-right: none;
+        }
+    }
+}
+
+div.cp-app-poll-realtime {
+    display: block;
+    max-height: 100%;
+    max-width: 100%;
+
+    input {
+        &[type="text"] {
+            height: 1em;
+            margin: 0px;
+        }
+    }
+    > textarea {
+        width: 50%;
+        height: 15vh;
+    }
+
+    padding: 0px;
+    margin: 0px;
+
+    table {
+        border-collapse: collapse;
+        width: ~"calc(100% - 1px)";
+        .cp-app-poll-table-editing {
+            background-color: @poll-editing;
+        }
+        tr {
+            td:first-child {
+                position:absolute;
+                left: 29px;
+                top: auto;
+                width: ~"calc(30% - 50px)";
+            }
+            td {
+                padding: 0px;
+                margin: 0px;
+
+                div.cp-app-poll-table-text-cell {
+                    padding: 0px;
+                    margin: 0px;
+                    height: 100%;
+
+                    input {
+                        width: 80%;
+                        width: 90%;
+                        height: 100%;
+                        border: 0px;
+                        &[disabled] {
+                            background-color: transparent;
+                            color: @poll-fg;
+                            font-weight: bold;
+                        }
+                    }
+                }
+
+                &.cp-app-poll-table-checkbox-cell {
+                    margin: 0px;
+                    padding: 0px;
+                    height: 100%;
+                    min-width: 150px;
+
+                    div.cp-app-poll-table-checkbox-contain {
+                        display: inline-block;
+                        height: 100%;
+                        width: 100%;
+                        position: relative;
+
+                        label {
+                            background-color: transparent;
+                            display: block;
+                            position: absolute;
+                            top: 0px;
+                            left: 0px;
+                            height: 100%;
+                            width: 100%;
+                        }
+
+                        input {
+                            &[type="number"] {
+                                &:not(.editable) {
+                                    display: none;
+
+                                    ~ .cp-app-poll-table-cover {
+                                        display: block;
+                                        font-weight: bold;
+
+                                        color: @poll-cover-color;
+
+                                        &:after {
+                                            height: 100%;
+                                        }
+
+                                        display: block;
+                                        &.yes {
+                                            background-color: @colortheme_cp-green;
+                                        }
+
+                                        &.uncommitted {
+                                            background: #ddd;
+                                        }
+
+                                        &.mine {
+                                            display: none;
+                                        }
+                                    }
+                                }
+                            }
+                        }
+
+                        input[type="number"][value="0"] {
+                            ~ .cp-app-poll-table-cover {
+                                background-color: @colortheme_cp-red;
+                                &:after { content: "✖"; }
+                            }
+                        }
+                        input[type="number"][value="1"] {
+                            ~ .cp-app-poll-table-cover {
+                                background-color: @colortheme_cp-green;
+                                &:after { content: "✔"; }
+                            }
+                        }
+                        input[type="number"][value="2"] {
+                            ~ .cp-app-poll-table-cover {
+                                background-color: @poll-option-yellow;
+                                &:after { content: "~"; }
+                            }
+                        }
+                        input[type="number"][value="3"] {
+                            ~ .cp-app-poll-table-cover {
+                                background-color: @poll-option-gray;
+                                &:after { content: "?"; }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        input {
+            &[type="text"] {
+                height: auto;
+                width: 80%;
+            }
+        }
+        span {
+            user-select: none;
+            -moz-user-select: none;
+            -webkit-user-select: none;
+            -ms-user-select: none;
+        }
+        thead {
+            td {
+                padding: 0px 5px;
+                background: @poll-th-bg;
+                border-radius: 20px 20px 0 0;
+                //text-align: center;
+                &:nth-of-type(2) {
+                    background: @poll-th-user-bg;
+                    .cp-app-poll-table-lock {
+                        cursor: default;
+                    }
+                }
+                input {
+                    &[type="text"] {
+                        width: 100%;
+                        box-sizing: border-box;
+                        padding: 1px 5px;
+                        &[disabled] {
+                            color: @poll-fg;
+                            border: 1px solid transparent;
+                        }
+                    }
+                }
+            }
+        }
+
+        tbody {
+            td:not(.cp-app-poll-table-editing) {
+                .cp-app-poll-table-text-cell {
+                    background: @poll-td-bg;
+                }
+            }
+            .cp-app-poll-table-text-cell {
+                //border-radius: 20px 0 0 20px;
+                input[type="text"] {
+                    width: ~"calc(100% - 50px)";
+                    padding: 0 0.5em;
+                }
+                .cp-app-poll-table-edit {
+                    float:right;
+                    margin: 0 10px 0 0;
+                }
+                .cp-app-poll-table-remove {
+                    float: left;
+                    margin: 0 0 0 10px;
+                }
+            }
+            tr:not(:first-child) {
+                td:not(:first-child) {
+                    label {
+                        border-top: 1px solid @poll-border-color;
+                    }
+                }
+            }
+        }
+        .cp-app-poll-table-edit {
+            color: @poll-cover-color;
+            cursor: pointer;
+            float: left;
+            margin-left: 10px;
+        }
+
+        .cp-app-poll-table-lock {
+            margin-left: ~"calc(50% - 0.5em)";
+            cursor: pointer;
+            width: 1em;
+            text-align: center;
+        }
+        .cp-app-poll-table-remove {
+            float: right;
+            margin-right: 10px;
+        }
+
+        thead {
+            tr {
+                th {
+                    input[type="text"][disabled] {
+                        background-color: transparent;
+                        color: @poll-fore;
+                        font-weight: bold;
+                    }
+                    .cp-app-poll-table-remove {
+                        cursor: pointer;
+                        font-size: 20px;
+                    }
+                }
+            }
+        }
+        tbody {
+            tr {
+                td {
+
+                }
+            }
+        }
+        tfoot {
+            tr {
+                border: none;
+                td {
+                    border: none;
+                    text-align: center;
+                    .save {
+                        padding: 15px;
+                        border-top-left-radius: 5px;
+                        border-top-right-radius: 5px;
+                    }
+                }
+            }
+        }
+    }
+
+    #adduser,
+    #addoption {
+        color: @colortheme_cp-green;
+        border: 1px solid @colortheme_cp-green;
+        padding: 15px;
+        cursor: pointer;
+    }
+
+    #adduser { .top-left; }
+    #addoption { .bottom-left; }
+}
+
+.btn {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+}
+
diff --git a/www/poll/index.html b/www/poll/index.html
new file mode 100644
index 000000000..e3f7eacc4
--- /dev/null
+++ b/www/poll/index.html
@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>CryptPad</title>
+    <meta content="text/html; charset=utf-8" http-equiv="content-type"/>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="referrer" content="no-referrer" />
+    <script async data-bootload="main.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
+    <style>
+        html, body {
+            margin: 0px;
+            padding: 0px;
+        }
+        #sbox-iframe {
+            position:fixed;
+            top:0px;
+            left:0px;
+            bottom:0px;
+            right:0px;
+            width:100%;
+            height:100%;
+            border:none;
+            margin:0;
+            padding:0;
+            overflow:hidden;
+        }
+        #sbox-filePicker-iframe {
+            position: fixed;
+            top:0; left:0;
+            bottom:0; right:0;
+            width:100%;
+            height: 100%;
+            border: 0;
+        }
+    </style>
+</head>
+<body>
+<iframe id="sbox-iframe">
diff --git a/www/poll/inner.html b/www/poll/inner.html
new file mode 100644
index 000000000..b3d27a828
--- /dev/null
+++ b/www/poll/inner.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+    <meta content="text/html; charset=utf-8" http-equiv="content-type"/>
+    <script async data-bootload="/poll/inner.js" data-main="/common/sframe-boot.js?ver=1.6" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
+    <style>
+        .loading-hidden { display: none; }
+        #editor1 { display: none; }
+        html, body {
+            width: 100%;
+            height: 100%;
+            margin: 0px;
+            padding: 0px;
+            border: 0px;
+        }
+    </style>
+</head>
+<body class="cp-app-poll">
+
diff --git a/www/poll/inner.js b/www/poll/inner.js
new file mode 100644
index 000000000..371ce078a
--- /dev/null
+++ b/www/poll/inner.js
@@ -0,0 +1,972 @@
+define([
+    'jquery',
+    '/bower_components/textpatcher/TextPatcher.js',
+    '/common/toolbar3.js',
+    'json.sortify',
+    '/common/cryptpad-common.js',
+    '/common/common-util.js',
+    '/common/cryptget.js',
+    '/bower_components/nthen/index.js',
+    '/common/sframe-common.js',
+    '/common/common-realtime.js',
+    '/customize/application_config.js',
+    '/common/sframe-chainpad-listmap.js',
+    '/customize/pages.js',
+    '/poll/render.js',
+
+    '/bower_components/file-saver/FileSaver.min.js',
+
+    'css!/bower_components/bootstrap/dist/css/bootstrap.min.css',
+    'less!/bower_components/components-font-awesome/css/font-awesome.min.css',
+    'less!/customize/src/less2/main.less',
+], function (
+    $,
+    TextPatcher,
+    Toolbar,
+    JSONSortify,
+    Cryptpad,
+    Util,
+    Cryptget,
+    nThen,
+    SFCommon,
+    CommonRealtime,
+    AppConfig,
+    Listmap,
+    Pages,
+    Renderer)
+{
+    var Messages = Cryptpad.Messages;
+
+    var Render = Renderer(Cryptpad);
+    var APP = window.APP = {
+        Render: Render,
+        unlocked: {
+            row: [],
+            col: []
+        },
+        readOnly: false,
+        Cryptpad: Cryptpad,
+        mobile: function () { return $('body').width() <= 600; } // Menu and content area are not inline-block anymore for mobiles
+    };
+
+    var debug = $.noop; //console.log;
+
+    var stringify = function (obj) {
+        return JSONSortify(obj);
+    };
+
+    var onConnectError = function () {
+        Cryptpad.errorLoadingScreen(Messages.websocketError);
+    };
+
+    var HIDE_INTRODUCTION_TEXT = "hide-text";
+
+    var metadataMgr;
+    var Title;
+    var defaultName;
+    var common;
+    var readOnly;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    var sortColumns = function (order, firstcol) {
+        var colsOrder = order.slice();
+        colsOrder.sort(function (a, b) {
+            return (a === firstcol) ? -1 :
+                        ((b === firstcol) ? 1 : 0);
+        });
+        return colsOrder;
+    };
+
+    var isOwnColumnCommitted = function () {
+        return APP.proxy && APP.proxy.content.colsOrder.indexOf(APP.userid) !== -1;
+    };
+
+    var mergeUncommitted = function (proxy, uncommitted, commit) {
+        var newObj;
+        if (commit) {
+            newObj = proxy;
+        } else {
+            newObj = $.extend(true, {}, proxy);
+        }
+        // We have uncommitted data only if the user's column is not in the proxy
+        // If it is already is the proxy, nothing to merge
+        /*if (isOwnColumnCommitted()) {
+            return newObj;
+        }*/
+
+        // Merge uncommitted into the proxy
+        uncommitted.content.colsOrder = uncommitted.content.colsOrder || [];
+        uncommitted.content.colsOrder.forEach(function (x) {
+            if (newObj.content.colsOrder.indexOf(x) !== -1) { return; }
+            newObj.content.colsOrder.push(x);
+        });
+        for (var k in uncommitted.content.cols) {
+            if (!newObj.content.cols[k]) {
+                newObj.content.cols[k] = uncommitted.content.cols[k];
+            }
+        }
+        for (var l in uncommitted.content.cells) {
+            if (!newObj.content.cells[l]) {
+                newObj.content.cells[l] = uncommitted.content.cells[l];
+            }
+        }
+        // Uncommitted rows
+        uncommitted.content.rowsOrder = uncommitted.content.rowsOrder || [];
+        uncommitted.content.rowsOrder.forEach(function (x) {
+            if (newObj.content.rowsOrder.indexOf(x) !== -1) { return; }
+            newObj.content.rowsOrder.push(x);
+        });
+        for (var k in uncommitted.content.rows) {
+            if (!newObj.content.rows[k]) {
+                newObj.content.rows[k] = uncommitted.content.rows[k];
+            }
+        }
+
+        if (commit) {
+            APP.uncommited = {};
+            prepareProxy(APP.uncommitted, copyObject(Render.Example));
+        }
+        return newObj;
+    };
+
+    var styleUncommittedColumn = function () {
+        var id = APP.userid;
+
+        // TODO: move?
+        // Enable input for the userid column
+        $('input[disabled="disabled"][data-rt-id^="' + id + '"]').removeAttr('disabled');
+        $('input[type="number"][data-rt-id^="' + id + '"]').addClass('enabled');
+        $('.cp-app-poll-table-lock[data-rt-id="' + id + '"]').addClass('fa-unlock').removeClass('fa-lock').attr('title', Messages.poll_unlocked);
+
+        APP.uncommitted.content.colsOrder.forEach(function(id) {
+            // Enable the checkboxes for the uncommitted column
+            $('input[disabled="disabled"][data-rt-id^="' + id + '"]').removeAttr('disabled');
+            $('input[type="number"][data-rt-id^="' + id + '"]').addClass('enabled');
+            $('.cp-app-poll-table-lock[data-rt-id="' + id + '"]').addClass('fa-unlock').removeClass('fa-lock').attr('title', Messages.poll_unlocked);
+
+            $('[data-rt-id^="' + id + '"]').closest('td').addClass("cp-app-poll-table-uncommitted");
+            $('td.cp-app-poll-table-uncommitted .cover').addClass("cp-app-poll-table-uncommitted");
+        });
+        APP.uncommitted.content.rowsOrder.forEach(function(id) {
+            // Enable the checkboxes for the uncommitted column
+            $('input[disabled="disabled"][data-rt-id="' + id + '"]').removeAttr('disabled');
+
+            $('[data-rt-id="' + id + '"]').closest('tr').addClass("cp-app-poll-table-uncommitted");
+            //$('td.uncommitted .cover').addClass("uncommitted");
+            //$('.uncommitted input[type="text"]').attr("placeholder", Messages.poll_userPlaceholder);
+        });
+    };
+
+    var unlockElements = function () {
+        APP.unlocked.row.forEach(function (id) {
+            var $input = $('input[type="text"][disabled="disabled"][data-rt-id="' + id + '"]').removeAttr('disabled');
+            $input.parent().parent().addClass('cp-app-poll-table-editing');
+            $('span.cp-app-poll-table-edit[data-rt-id="' + id + '"]').css('visibility', 'hidden');
+        });
+        APP.unlocked.col.forEach(function (id) {
+            var $input = $('input[disabled="disabled"][data-rt-id^="' + id + '"]')
+                .removeAttr('disabled');
+            $input.parent().addClass('cp-app-poll-table-editing');
+            $('input[type="number"][data-rt-id^="' + id + '"]').addClass('enabled');
+            $('.cp-app-poll-table-lock[data-rt-id="' + id + '"]').addClass('fa-unlock')
+                .removeClass('fa-lock').attr('title', Messages.poll_unlocked);
+        });
+    };
+
+    var updateTableButtons = function () {
+        var $createOption = APP.$table.find('tfoot tr td:first-child');
+        $createOption.append(APP.$createRow);
+
+        $('#cp-app-poll-create-user, #cp-app-poll-create-option').css('display', 'inline-flex');
+        if (!APP.proxy ||
+            !APP.proxy.content.rowsOrder ||
+            APP.proxy.content.rowsOrder.length === 0) {
+            //$('#create-user').hide();
+        }
+        var width = $('#cp-app-poll-table').outerWidth();
+        if (width) {
+            //$('#create-user').css('left', width + 30 + 'px');
+        }
+    };
+
+    var setTablePublished = function (bool) {
+        if (bool) {
+            if (APP.$publish) { APP.$publish.hide(); }
+            if (APP.$admin) { APP.$admin.show(); }
+            $('#cp-app-poll-create-option').hide();
+            $('.cp-app-poll-table-remove[data-rt-id^="y"], .cp-app-poll-table-edit[data-rt-id^="y"]').hide();
+        } else {
+            if (APP.$publish) { APP.$publish.show(); }
+            if (APP.$admin) { APP.$admin.hide(); }
+            $('#cp-app-poll-create-option').show();
+            $('.cp-app-poll-table-remove[data-rt-id^="y"], .cp-app-poll-table-edit[data-rt-id^="y"]').show();
+        }
+    };
+
+    var updateDisplayedTable = function () {
+        styleUncommittedColumn();
+        unlockElements();
+        updateTableButtons();
+        setTablePublished(APP.proxy.published);
+
+        /*
+        APP.proxy.table.rowsOrder.forEach(function (rowId) {
+            $('[data-rt-id="' + rowId +'"]').val(APP.proxy.table.rows[rowId] || '');
+        });*/
+    };
+
+    var unlockColumn = function (id, cb) {
+        if (APP.unlocked.col.indexOf(id) === -1) {
+            APP.unlocked.col.push(id);
+        }
+        if (typeof(cb) === "function") {
+            cb();
+        }
+    };
+    var unlockRow = function (id, cb) {
+        if (APP.unlocked.row.indexOf(id) === -1) {
+            APP.unlocked.row.push(id);
+        }
+        if (typeof(cb) === "function") {
+            cb();
+        }
+    };
+    var lockColumn = function (id, cb) {
+        var idx = APP.unlocked.col.indexOf(id);
+        if (idx !== -1) {
+            APP.unlocked.col.splice(idx, 1);
+        }
+        if (typeof(cb) === "function") {
+            cb();
+        }
+    };
+    var lockRow = function (id, cb) {
+        var idx = APP.unlocked.row.indexOf(id);
+        if (idx !== -1) {
+            APP.unlocked.row.splice(idx, 1);
+        }
+        if (typeof(cb) === "function") {
+            cb();
+        }
+    };
+
+    /*  Any time the realtime object changes, call this function */
+    var change = function (o, n, path, throttle, cb) {
+        if (path && !Cryptpad.isArray(path)) {
+            return;
+        }
+        if (path && path.join) {
+            debug("Change from [%s] to [%s] at [%s]",
+                o, n, path.join(', '));
+        }
+
+        var table = APP.$table[0];
+
+        var displayedObj = mergeUncommitted(APP.proxy, APP.uncommitted);
+
+        var colsOrder = sortColumns(displayedObj.content.colsOrder, APP.userid);
+        var conf = {
+            cols: colsOrder,
+            readOnly: readOnly
+        };
+
+        //Render.updateTable(table, displayedObj, conf);
+
+        /*  FIXME browser autocomplete fills in new fields sometimes
+            calling updateTable twice removes the autofilled in values
+            setting autocomplete="off" is not reliable
+
+            https://developer.mozilla.org/en-US/docs/Web/Security/Securing_your_site/Turning_off_form_autocompletion
+        */
+        common.notify();
+
+        var getFocus = function () {
+            var active = document.activeElement;
+            if (!active) { return; }
+            return {
+                el: active,
+                start: active.selectionStart,
+                end: active.selectionEnd
+            };
+        };
+        var setFocus = function (obj) {
+            if (obj.el) { obj.el.focus(); }
+            else { return; }
+            if (obj.start) { obj.el.selectionStart = obj.start; }
+            if (obj.end) { obj.el.selectionEnd = obj.end; }
+        };
+
+        var updateTable = function () {
+            var displayedObj2 = mergeUncommitted(APP.proxy, APP.uncommitted);
+            var f = getFocus();
+            Render.updateTable(table, displayedObj2, conf);
+            APP.proxy.content.rowsOrder.forEach(function (rowId) {
+                $('input[data-rt-id="' + rowId +'"]').val(APP.proxy.content.rows[rowId] || '');
+            });
+            updateDisplayedTable();
+            setFocus(f);
+            if (typeof(cb) === "function") {
+                cb();
+            }
+        };
+
+        if (throttle) {
+            if (APP.throttled) { window.clearTimeout(APP.throttled); }
+            updateTable();
+            APP.throttled = window.setTimeout(function () {
+                updateDisplayedTable();
+            }, throttle);
+            return;
+        }
+
+        window.setTimeout(updateTable);
+    };
+
+    var getRealtimeId = function (input) {
+        return input.getAttribute && input.getAttribute('data-rt-id');
+    };
+
+    /*  Called whenever an event is fired on an input element */
+    var handleInput = function (input) {
+        var type = input.type.toLowerCase();
+        var id = getRealtimeId(input);
+
+        debug(input);
+
+        var object = APP.proxy;
+
+        var x = Render.getCoordinates(id)[0];
+        if (type !== "row" && x === APP.userid && APP.proxy.content.colsOrder.indexOf(x) === -1) {
+            object = APP.uncommitted;
+        }
+
+        switch (type) {
+            case 'text':
+                debug("text[rt-id='%s'] [%s]", id, input.value);
+                Render.setValue(object, id, input.value);
+                change(null, null, null, 50);
+                break;
+            case 'number':
+                debug("checkbox[tr-id='%s'] %s", id, input.value);
+                if (APP.unlocked.col.indexOf(x) >= 0 || x === APP.userid) {
+                    var value = parseInt(input.value);
+
+                    if (isNaN(value)) {
+                        console.error("Got NaN?!");
+                        break;
+                    }
+
+                    Render.setValue(object, id, value);
+                    change();
+                } else {
+                    debug('checkbox locked');
+                }
+                break;
+            default:
+                debug("Input[type='%s']", type);
+                break;
+        }
+    };
+
+    var hideInputs = function (id) {
+        if (APP.readOnly) { return; }
+        console.log(id);
+        if (id) {
+            var type = Render.typeofId(id);
+            console.log(type);
+            if (type === 'col') { return void lockColumn(id, change); }
+            if (type === 'row') { return void lockRow(id, change); }
+            return;
+        }
+        APP.unlocked.col = Cryptpad.deduplicateString([APP.userid].concat(APP.uncommitted.content.colsOrder).slice());
+        APP.unlocked.row = APP.uncommitted.content.rowsOrder.slice();
+        change();
+    };
+
+    /*  Called whenever an event is fired on a span */
+    var handleSpan = function (span) {
+        var id = span.getAttribute('data-rt-id');
+        var type = Render.typeofId(id);
+        var isRemove = span.className && span.className.split(' ')
+            .indexOf('cp-app-poll-table-remove') !== -1;
+        var isEdit = span.className && span.className.split(' ')
+            .indexOf('cp-app-poll-table-edit') !== -1;
+        var isLock = span.className && span.className.split(' ')
+            .indexOf('cp-app-poll-table-lock') !== -1;
+        var isLocked = span.className && span.className.split(' ').indexOf('fa-lock') !== -1;
+        if (type === 'row') {
+            if (isRemove) {
+                Cryptpad.confirm(Messages.poll_removeOption, function (res) {
+                    if (!res) { return; }
+                    Render.removeRow(APP.proxy, id, function () {
+                        change();
+                    });
+                });
+            } else if (isEdit) {
+                //hideInputs(span);
+                unlockRow(id, function () {
+                    change(null, null, null, null, function() {
+                        $('input[data-rt-id="' + id + '"]').focus();
+                    });
+                });
+            }
+        } else if (type === 'col') {
+            if (isRemove) {
+                Cryptpad.confirm(Messages.poll_removeUser, function (res) {
+                    if (!res) { return; }
+                    Render.removeColumn(APP.proxy, id, function () {
+                        change();
+                    });
+                });
+            } else if (isLock && isLocked) {
+                //hideInputs(span);
+                unlockColumn(id, function () {
+                    change(null, null, null, null, function() {
+                        $('input[data-rt-id="' + id + '"]').focus();
+                    });
+                });
+            } else if (isLock) {
+                lockColumn(id, function () {
+                    change(null, null, null, null, function() {
+                    });
+                });
+            }
+        } else if (type === 'cell') {
+            change();
+        } else {
+            debug("UNHANDLED");
+        }
+    };
+
+    var handleClick = function (e, isKeyup) {
+        if (APP.readOnly) { return; }
+
+        e.stopPropagation();
+
+        if (!APP.ready) { return; }
+        if (!isKeyup && e.which !== 1) { return; } // only allow left clicks
+
+        var target = e && e.target;
+
+        if (!target) { return void debug("NO TARGET"); }
+
+        var nodeName = target && target.nodeName;
+        //var shouldLock = $(target).hasClass('fa-unlock');
+
+        if ((!$(target).parents('#cp-app-poll-table tbody').length &&
+            $(target).hasClass('cp-app-poll-table-lock'))) {
+            //hideInputs(e);
+        }
+
+        switch (nodeName) {
+            case 'INPUT':
+                if (isKeyup && (e.keyCode === 13 || e.keyCode === 27)) {
+                    var id = target.getAttribute('data-rt-id');
+                    hideInputs(id);
+                    break;
+                }
+                if ($(target).is('input[type="number"]')) { console.error("number input focused?"); break; }
+
+                handleInput(target);
+                break;
+            case 'LABEL':
+                var input = $('input[type="number"][id=' + $(target).attr('for') + ']');
+                var value = parseInt(input.val());
+
+                input.val((value + 1) % 4);
+
+                handleInput(input[0]);
+                break;
+            case 'SPAN':
+                /*if (shouldLock) {
+                    break;
+                }*/
+                handleSpan(target);
+                break;
+            case undefined:
+                //console.error(new Error("C'est pas possible!"));
+                break;
+            default:
+                debug(target, nodeName);
+                break;
+        }
+    };
+
+    /*
+        Make sure that the realtime data structure has all the required fields
+    */
+    var prepareProxy = function (proxy, schema) {
+        if (proxy && proxy.version === 1) { return; }
+        debug("Configuring proxy schema...");
+
+        proxy.metadata = proxy.metadata || schema.metadata;
+        Object.keys(schema.metadata).forEach(function (k) {
+            if (!proxy.metadata[k]) { proxy.metadata[k] = schema.metadata[k]; }
+        });
+
+        proxy.content = proxy.content || schema.content;
+        Object.keys(schema.content).forEach(function (k) {
+            if (!proxy.content[k]) { proxy.content[k] = schema.content[k]; }
+        });
+
+        proxy.version = 1;
+        proxy.type = 'poll';
+    };
+
+    /*
+
+    */
+    var publish = APP.publish = function (bool) {
+        if (!APP.ready) { return; }
+        if (APP.proxy.published !== bool) {
+            APP.proxy.published = bool;
+        }
+        setTablePublished(bool);
+        ['textarea'].forEach(function (sel) {
+            $(sel).attr('disabled', bool);
+        });
+    };
+
+    var showHelp = function(help) {
+        if (typeof help === 'undefined') {
+            help = !$('#cp-app-poll-help').is(':visible');
+        }
+
+        var msg = (help ? Messages.poll_hide_help_button : Messages.poll_show_help_button);
+
+        $('#cp-app-poll-help').toggle(help);
+        $('#cp-app-poll-action-help').text(msg);
+    };
+
+    var copyObject = function (obj) {
+        return JSON.parse(JSON.stringify(obj));
+    };
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    var setEditable = function (editable) {
+        APP.readOnly = !editable;
+
+        if (editable === false) {
+            // disable all the things
+            $('.icp-app-poll-realtime input, .cp-app-poll-realtime button, .cp-app-poll-upper button, .cp-app-poll-realtime textarea').attr('disabled', true);
+            $('span.cp-app-poll-table-edit, span.cp-app-poll-table-remove').hide();
+            $('span.cp-app-poll-table-lock').addClass('fa-lock').removeClass('fa-unlock')
+                .attr('title', Messages.poll_locked)
+                .css({'cursor': 'default'});
+        } else {
+            // enable
+            $('span.cp-app-poll-table-edit, span.cp-app-poll-table-remove').show();
+            $('span.cp-app-poll-table-lock').css({'cursor': ''});
+            $('.cp-app-poll-realtime button, .cp-app-poll-upper button, .cp-app-poll-realtime textarea').attr('disabled', false);
+            unlockElements();
+        }
+    };
+
+    var updateDescription = function (n) {
+        var o = APP.$description.val();
+        var op = TextPatcher.diff(o, n);
+        var el = APP.$description[0];
+
+        var selects = ['selectionStart', 'selectionEnd'].map(function (attr) {
+            return TextPatcher.transformCursor(el[attr], op);
+        });
+        APP.$description.val(n);
+        if (op) {
+            el.selectionStart = selects[0];
+            el.selectionEnd = selects[1];
+        }
+        common.notify();
+    };
+    var updateLocalDescription = function (n) {
+        var md = copyObject(metadataMgr.getMetadata());
+        md.description = n;
+        metadataMgr.updateMetadata(md);
+        APP.proxy.metadata.description = n;
+    };
+
+    var onReady = function (info, userid, readOnly) {
+        var proxy = APP.proxy;
+
+        var isNew = false;
+        var userDoc = JSON.stringify(proxy);
+        if (userDoc === "" || userDoc === "{}") { isNew = true; }
+
+        if (!isNew) {
+            if (proxy.info) {
+                // Migration??
+                proxy.metadata = proxy.info;
+                delete proxy.info;
+            }
+            if (proxy.table) {
+                // Migration??
+                proxy.content = proxy.table;
+                delete proxy.table;
+            }
+            if (proxy && proxy.metadata) {
+                metadataMgr.updateMetadata(proxy.metadata);
+            }
+            if (typeof (proxy) !== 'object' || Array.isArray(proxy) ||
+                (proxy.metadata && typeof(proxy.metadata.type) !== 'undefined' &&
+                 proxy.metadata.type !== 'poll')) {
+                var errorText = Messages.typeError;
+                Cryptpad.errorLoadingScreen(errorText);
+                throw new Error(errorText);
+            }
+        } else {
+            //Title.updateTitle(Title.defaultTitle);
+        }
+
+        if (typeof(proxy.type) === 'undefined') {
+            proxy.type = 'poll';
+        }
+
+        // Add uncommitted and unlock uncommited & own column
+        var uncommitted = APP.uncommitted = {};
+        prepareProxy(proxy, copyObject(Render.Example));
+        prepareProxy(uncommitted, copyObject(Render.Example));
+        if (!readOnly) {
+            var coluid = Render.coluid();
+            if (proxy.content.colsOrder.indexOf(userid) === -1 &&
+                uncommitted.content.colsOrder.indexOf(userid) === -1) {
+                // The user doesn't have his own column: the new one should be his
+                coluid = userid;
+            } else {
+                // The user already has his own column: unlock it
+                unlockColumn(userid);
+            }
+            uncommitted.content.colsOrder.push(coluid);
+            unlockColumn(coluid);
+
+            var rowuid = Render.rowuid();
+            uncommitted.content.rowsOrder.push(rowuid);
+            unlockRow(coluid);
+        }
+
+        var displayedObj = mergeUncommitted(proxy, uncommitted, false);
+
+        var colsOrder = sortColumns(displayedObj.content.colsOrder, userid);
+
+        var $table = APP.$table = $(Render.asHTML(displayedObj, null, colsOrder, readOnly));
+
+        var getUncommitted = function (type) {
+            var ret = {};
+            var uncommitted = APP.uncommitted.content;
+            if (type === 'col') {
+                ret.colsOrder = uncommitted.colsOrder.slice();
+                ret.cols = copyObject(uncommitted.cols);
+                // get only the cells corresponding to the committed rows
+                var toRemove = Object.keys(uncommitted.cells).filter(function (coor) {
+                    var c = Render.getCoordinates(coor);
+                    return APP.proxy.content.rowsOrder.indexOf(c[1]) !== -1;
+                });
+                ret.cells = {};
+                toRemove.forEach(function (k) {
+                    ret.cells[k] = uncommitted.cells[k];
+                    delete uncommitted.cells[k];
+                });
+                uncommitted.colsOrder = [Render.coluid()];
+                uncommitted.cols = {};
+                return ret;
+            }
+
+            // Row
+            ret.rowsOrder = uncommitted.rowsOrder.slice();
+            ret.rows = copyObject(uncommitted.rows);
+            // get only the cells corresponding to the committed rows
+            var toRemove = Object.keys(uncommitted.cells).filter(function (coor) {
+                var c = Render.getCoordinates(coor);
+                return APP.proxy.content.colsOrder.indexOf(c[1]) !== -1;
+            });
+            ret.cells = {};
+            toRemove.forEach(function (k) {
+                ret.cells[k] = uncommitted.cells[k];
+                delete uncommitted.cells[k];
+            });
+            uncommitted.rowsOrder = [Render.rowuid()];
+            uncommitted.rows = {};
+            return ret;
+        };
+        APP.$createCol = $('#cp-app-poll-create-user').click(function () {
+            var uncommittedCopy = { content: getUncommitted('col') };
+            var id = uncommittedCopy.content.colsOrder[0];
+            mergeUncommitted(proxy, uncommittedCopy, true);
+            change(null, null, null, null, function() {
+                handleSpan($('.cp-app-poll-table-lock[data-rt-id="' + id + '"]')[0]);
+            });
+        });
+        APP.$createRow = $('#cp-app-poll-create-option').click(function () {
+            var uncommittedCopy = { content: getUncommitted('row') };
+            var id = uncommittedCopy.content.rowsOrder[0];
+            mergeUncommitted(proxy, uncommittedCopy, true);
+            change(null, null, null, null, function() {
+                handleSpan($('.cp-app-poll-table-edit[data-rt-id="' + id + '"]')[0]);
+            });
+        });
+
+        // Commit button
+        APP.$commit = $('#commit').click(function () {
+            var uncommittedCopy = copyObject(APP.uncommitted);
+            APP.uncommitted = {};
+            prepareProxy(APP.uncommitted, copyObject(Render.Example));
+            mergeUncommitted(proxy, uncommittedCopy, true);
+            APP.$commit.hide();
+            change();
+        }).remove(); // TODO
+
+        // #publish button is removed in readonly
+        APP.$publish = $('#cp-app-poll-action-publish')
+            .click(function () {
+                publish(true);
+            });
+
+        APP.$admin = $('#cp-app-poll-action-admin')
+            .click(function () {
+                publish(false);
+            });
+
+        APP.$help = $('#cp-app-poll-action-help')
+            .click(function () {
+                showHelp();
+            });
+
+        if (!readOnly) {
+            common.setPadAttribute('userid', userid, function (e) {
+                if (e) { console.error(e); }
+            });
+        }
+
+        // Description
+        var resize = function () {
+            var lineCount = APP.$description.val().split('\n').length;
+            APP.$description.css('height', lineCount + 'rem');
+        };
+        APP.$description.on('change keyup', function () {
+            var val = APP.$description.val();
+            updateLocalDescription(val);
+            resize();
+        });
+        resize();
+
+        $('#cp-app-poll-table-scroll').html('').prepend($table);
+        updateDisplayedTable();
+
+        $table
+            .click(handleClick)
+            .on('keyup', function (e) { handleClick(e, true); });
+
+        $(window).click(function(e) {
+            if (e.which !== 1) { return; }
+            hideInputs();
+        });
+
+        proxy
+            .on('change', ['metadata'], function (o, n, p) {
+                metadataMgr.updateMetadata(proxy.metadata);
+            })
+            .on('change', ['content'], change)
+            .on('remove', [], change);
+
+        // If the user's column is not committed, add his username
+        var $userInput = $('.cp-app-poll-table-uncommitted > input[data-rt-id^='+ APP.userid +']');
+        if ($userInput.val() === '') {
+            $userInput.val(metadataMgr.getUserData().name);
+        }
+
+        APP.ready = true;
+        if (!proxy.published) {
+            publish(false);
+        } else {
+            publish(true);
+        }
+
+        Cryptpad.removeLoadingScreen();
+    };
+
+    var onDisconnect = function () {
+        setEditable(false);
+        // TODO toolar.failed?
+        APP.toolbar.failed();
+        Cryptpad.alert(Messages.common_connectionLost, undefined, true);
+    };
+
+    var onReconnect = function (info) {
+        setEditable(true);
+        // TODO: reconnecting??
+        APP.toolbar.reconnecting(info.myId);
+        Cryptpad.findOKButton().click();
+    };
+
+    var onCreate = function (info) {
+        APP.myID = info.myID;
+
+        if (APP.realtime !== info.realtime) {
+            APP.realtime = info.realtime;
+            APP.patchText = TextPatcher.create({
+                realtime: info.realtime,
+                logging: true,
+            });
+        }
+
+        metadataMgr = common.getMetadataMgr();
+
+        Title = common.createTitle();
+
+        var configTb = {
+            displayed: ['title', 'useradmin', 'spinner', 'share', 'userlist', 'newpad', 'limit'],
+            title: Title.getTitleConfig(),
+            metadataMgr: metadataMgr,
+            readOnly: readOnly,
+            realtime: info.realtime,
+            common: Cryptpad,
+            sfCommon: common,
+            $container: APP.$bar,
+            $contentContainer: APP.$content
+        };
+        var toolbar = APP.toolbar = Toolbar.create(configTb);
+
+        Title.setToolbar(APP.toolbar);
+
+        var $rightside = APP.toolbar.$rightside;
+
+        metadataMgr.onChange(function () {
+            var md = copyObject(metadataMgr.getMetadata());
+            if (md.description) {
+                updateDescription(md.description);
+            }
+            APP.proxy.metadata = md;
+        });
+        return; // TODO
+
+
+
+
+        /* add a forget button */
+        var forgetCb = function (err) {
+            if (err) { return; }
+            setEditable(false);
+        };
+        var $forgetPad = Cryptpad.createButton('forget', true, {}, forgetCb);
+        $rightside.append($forgetPad);
+
+        // set the hash
+        if (!readOnly) { Cryptpad.replaceHash(editHash); }
+
+        /* save as template */
+        if (!Cryptpad.isTemplate(window.location.href)) {
+            var templateObj = {
+                rt: info.realtime,
+                Crypt: Cryptget,
+                getTitle: function () { return document.title; }
+            };
+            var $templateButton = Cryptpad.createButton('template', true, templateObj);
+            $rightside.append($templateButton);
+        }
+    };
+
+
+    var main = function () {
+
+        nThen(function (waitFor) {
+            $(waitFor(function () {
+                Cryptpad.addLoadingScreen();
+                var $div = $('<div>').append(Pages['/poll/']());
+                $('body').append($div.html());
+            }));
+            SFCommon.create(waitFor(function (c) { APP.common = common = c; }));
+        }).nThen(function (waitFor) {
+            var privReady = Util.once(waitFor());
+            var metadataMgr = common.getMetadataMgr();
+            if (JSON.stringify(metadataMgr.getPrivateData()) !== '{}') {
+                privReady();
+                return;
+            }
+            metadataMgr.onChange(function () {
+                if (typeof(metadataMgr.getPrivateData().readOnly) === 'boolean') {
+                    readOnly = metadataMgr.getPrivateData().readOnly;
+                    privReady();
+                }
+            });
+        }).nThen(function (/* waitFor */) {
+            APP.loggedIn = common.isLoggedIn();
+            APP.SFCommon = common;
+
+            APP.$body = $('body');
+            APP.$bar = $('#cp-toolbar');
+            APP.$content = $('#cp-app-poll-content');
+            APP.$description = $('#cp-app-poll-description')
+                .attr('placeholder', Messages.poll_descriptionHint || 'description');
+
+            var listmapConfig = {
+                data: {},
+                common: common,
+                logLevel: 1
+            };
+
+            if (readOnly) {
+                $('#cp-app-poll-create-user, #cp-app-poll-create-option, #cp-app-poll-action-publish, #cp-app-poll-action-admin').remove();
+            }
+
+            var metadataMgr;
+            var rt = APP.rt = Listmap.create(listmapConfig);
+            APP.proxy = rt.proxy;
+
+            rt.proxy.on('create', onCreate)
+                 .on('ready', function (info) {
+                    common.getPadAttribute('userid', function (e, userid) {
+                        if (e) { console.error(e); }
+                        if (!userid) { userid = Render.coluid(); }
+                        APP.userid = userid;
+                        onReady(info, userid, readOnly);
+                    });
+                 })
+                 .on('disconnect', onDisconnect)
+                 .on('reconnect', onReconnect);
+
+            common.getAttribute(['poll', HIDE_INTRODUCTION_TEXT], function (e, value) {
+                if (e) { console.error(e); }
+                if (!value) {
+                    common.setAttribute(['poll', HIDE_INTRODUCTION_TEXT], "1", function (e) {
+                        if (e) { console.error(e); }
+                    });
+                    showHelp(true);
+                } else {
+                    showHelp(false);
+                }
+            });
+
+            /*Cryptpad.onError(function (info) {
+                if (info && info.type === "store") {
+                    onConnectError();
+                }
+            });*/
+            //Cryptpad.onLogout(function () { setEditable(false); });
+        });
+    };
+    main();
+});
diff --git a/www/poll/main.js b/www/poll/main.js
new file mode 100644
index 000000000..66493ef48
--- /dev/null
+++ b/www/poll/main.js
@@ -0,0 +1,41 @@
+// Load #1, load as little as possible because we are in a race to get the loading screen up.
+define([
+    '/bower_components/nthen/index.js',
+    '/api/config',
+    'jquery',
+    '/common/requireconfig.js',
+    '/common/sframe-common-outer.js',
+], function (nThen, ApiConfig, $, RequireConfig, SFCommonO, Cryptpad, Netflux) {
+    var requireConfig = RequireConfig();
+
+    // Loaded in load #2
+    nThen(function (waitFor) {
+        $(waitFor());
+    }).nThen(function (waitFor) {
+        var req = {
+            cfg: requireConfig,
+            req: [ '/common/loading.js' ],
+            pfx: window.location.origin
+        };
+        window.rc = requireConfig;
+        window.apiconf = ApiConfig;
+        $('#sbox-iframe').attr('src',
+            ApiConfig.httpSafeOrigin + '/poll/inner.html?' + requireConfig.urlArgs +
+                '#' + encodeURIComponent(JSON.stringify(req)));
+
+        // This is a cheap trick to avoid loading sframe-channel in parallel with the
+        // loading screen setup.
+        var done = waitFor();
+        var onMsg = function (msg) {
+            var data = JSON.parse(msg.data);
+            if (data.q !== 'READY') { return; }
+            window.removeEventListener('message', onMsg);
+            var _done = done;
+            done = function () { };
+            _done();
+        };
+        window.addEventListener('message', onMsg);
+    }).nThen(function (/*waitFor*/) {
+        SFCommonO.start();
+    });
+});
diff --git a/www/poll/render.js b/www/poll/render.js
new file mode 100644
index 000000000..e5712aab9
--- /dev/null
+++ b/www/poll/render.js
@@ -0,0 +1,453 @@
+define([
+    //'/common/cryptpad-common.js',
+    '/bower_components/hyperjson/hyperjson.js',
+    '/bower_components/textpatcher/TextPatcher.js',
+    '/bower_components/diff-dom/diffDOM.js',
+], function (Hyperjson, TextPatcher) {
+    var DiffDOM = window.diffDOM;
+
+    var Example = {
+        metadata: {
+            title: '',
+            description: '',
+            userData: {}
+        },
+        content: {
+/*  TODO
+
+deprecate the practice of storing cells, cols, and rows separately.
+
+Instead, keep everything in one map, and iterate over columns and rows
+by maintaining indexes in rowsOrder and colsOrder
+
+*/
+            cells: {},
+            cols: {},
+            colsOrder: [],
+            rows: {},
+            rowsOrder: []
+        }
+    };
+
+var Renderer = function (Cryptpad) {
+
+    var Render = {
+        Example: Example
+    };
+
+    var Uid = Render.Uid = function (prefix, f) {
+        f = f || function () {
+            return Number(Math.random() * Number.MAX_SAFE_INTEGER)
+                .toString(32).replace(/\./g, '');
+        };
+        return function () { return prefix + '-' + f(); };
+    };
+
+    var coluid = Render.coluid = Uid('x');
+    var rowuid = Render.rowuid = Uid('y');
+
+    var isRow = Render.isRow = function (id) { return /^y\-[^_]*$/.test(id); };
+    var isColumn = Render.isColumn = function (id) { return /^x\-[^_]*$/.test(id); };
+    var isCell = Render.isCell = function (id) { return /^x\-[^_]*_y\-.*$/.test(id); };
+
+    var typeofId = Render.typeofId = function (id) {
+        if (isRow(id)) { return 'row'; }
+        if (isColumn(id)) { return 'col'; }
+        if (isCell(id)) { return 'cell'; }
+        return null;
+    };
+
+    Render.getCoordinates = function (id) {
+        return id.split('_');
+    };
+
+    var getColumnValue = Render.getColumnValue = function (obj, colId) {
+        return Cryptpad.find(obj, ['content', 'cols'].concat([colId]));
+    };
+
+    var getRowValue = Render.getRowValue = function (obj, rowId) {
+        return Cryptpad.find(obj, ['content', 'rows'].concat([rowId]));
+    };
+
+    var getCellValue = Render.getCellValue = function (obj, cellId) {
+        var value = Cryptpad.find(obj, ['content', 'cells'].concat([cellId]));
+        if (typeof value === 'boolean') {
+            return (value === true ? 1 : 0);
+        } else {
+            return value;
+        }
+    };
+
+    var setRowValue = Render.setRowValue = function (obj, rowId, value) {
+        var parent = Cryptpad.find(obj, ['content', 'rows']);
+        if (typeof(parent) === 'object') { return (parent[rowId] = value); }
+        return null;
+    };
+
+    var setColumnValue = Render.setColumnValue = function (obj, colId, value) {
+        var parent = Cryptpad.find(obj, ['content', 'cols']);
+        if (typeof(parent) === 'object') { return (parent[colId] = value); }
+        return null;
+    };
+
+    var setCellValue = Render.setCellValue = function (obj, cellId, value) {
+        var parent = Cryptpad.find(obj, ['content', 'cells']);
+        if (typeof(parent) === 'object') { return (parent[cellId] = value); }
+        return null;
+    };
+
+    Render.createColumn = function (obj, cb, id, value) {
+        var order = Cryptpad.find(obj, ['content', 'colsOrder']);
+        if (!order) { throw new Error("Uninitialized realtime object!"); }
+        id = id || coluid();
+        value = value || "";
+        setColumnValue(obj, id, value);
+        order.push(id);
+        if (typeof(cb) === 'function') { cb(void 0, id); }
+    };
+
+    Render.removeColumn = function (obj, id, cb) {
+        var order = Cryptpad.find(obj, ['content', 'colsOrder']);
+        var parent = Cryptpad.find(obj, ['content', 'cols']);
+
+        if (!(order && parent)) { throw new Error("Uninitialized realtime object!"); }
+
+        var idx = order.indexOf(id);
+        if (idx === -1) {
+            return void console
+                .error(new Error("Attempted to remove id which does not exist"));
+        }
+
+        Object.keys(obj.content.cells).forEach(function (key) {
+            if (key.indexOf(id) === 0) {
+                delete obj.content.cells[key];
+            }
+        });
+
+        order.splice(idx, 1);
+        if (parent[id]) { delete parent[id]; }
+        if (typeof(cb) === 'function') {
+            cb();
+        }
+    };
+
+    Render.createRow = function (obj, cb, id, value) {
+        var order = Cryptpad.find(obj, ['content', 'rowsOrder']);
+        if (!order) { throw new Error("Uninitialized realtime object!"); }
+        id = id || rowuid();
+        value = value || "";
+        setRowValue(obj, id, value);
+        order.push(id);
+        if (typeof(cb) === 'function') { cb(void 0, id); }
+    };
+
+    Render.removeRow = function (obj, id, cb) {
+        var order = Cryptpad.find(obj, ['content', 'rowsOrder']);
+        var parent = Cryptpad.find(obj, ['content', 'rows']);
+
+        if (!(order && parent)) { throw new Error("Uninitialized realtime object!"); }
+
+        var idx = order.indexOf(id);
+        if (idx === -1) {
+            return void console
+                .error(new Error("Attempted to remove id which does not exist"));
+        }
+
+        order.splice(idx, 1);
+        if (parent[id]) { delete parent[id]; }
+        if (typeof(cb) === 'function') { cb(); }
+    };
+
+    Render.setValue = function (obj, id, value) {
+        var type = typeofId(id);
+
+        switch (type) {
+            case 'row': return setRowValue(obj, id, value);
+            case 'col': return setColumnValue(obj, id, value);
+            case 'cell': return setCellValue(obj, id, value);
+            case null: break;
+            default:
+                console.log("[%s] has type [%s]", id, type);
+            throw new Error("Unexpected type!");
+        }
+    };
+
+    Render.getValue = function (obj, id) {
+        switch (typeofId(id)) {
+            case 'row': return getRowValue(obj, id);
+            case 'col': return getColumnValue(obj, id);
+            case 'cell': return getCellValue(obj, id);
+            case null: break;
+            default: throw new Error("Unexpected type!");
+        }
+    };
+
+    var getRowIds = Render.getRowIds = function (obj) {
+        return Cryptpad.find(obj, ['content', 'rowsOrder']);
+    };
+
+    var getColIds = Render.getColIds = function (obj) {
+        return Cryptpad.find(obj, ['content', 'colsOrder']);
+    };
+
+    var getCells = Render.getCells = function (obj) {
+        return Cryptpad.find(obj, ['content', 'cells']);
+    };
+
+    /*  cellMatrix takes a proxy object, and optionally an alternate ordering
+        of row/column keys (as an array).
+
+        it returns an array of arrays containing the relevant data for each
+        cell in table we wish to construct.
+    */
+    var cellMatrix = Render.cellMatrix = function (obj, rows, cols, readOnly) {
+        if (typeof(obj) !== 'object') {
+            throw new Error('expected realtime-proxy object');
+        }
+
+        var cells = getCells(obj);
+        rows = rows || getRowIds(obj);
+        rows.push('');
+        cols = cols || getColIds(obj);
+
+        return [null].concat(rows).map(function (row, i) {
+            if (i === 0) {
+                return [null].concat(cols.map(function (col) {
+                    var result = {
+                        'data-rt-id': col,
+                        type: 'text',
+                        value: getColumnValue(obj, col) || "",
+                        placeholder: Cryptpad.Messages.poll_userPlaceholder,
+                        disabled: 'disabled'
+                    };
+                    return result;
+                }));
+            }
+            if (i === rows.length) {
+                return [null].concat(cols.map(function () {
+                    return {
+                        'class': 'cp-app-poll-table-lastrow',
+                    };
+                }));
+            }
+
+            return [{
+                'data-rt-id': row,
+                value: getRowValue(obj, row) || '',
+                type: 'text',
+                placeholder: Cryptpad.Messages.poll_optionPlaceholder,
+                disabled: 'disabled',
+            }].concat(cols.map(function (col) {
+                var id = [col, rows[i-1]].join('_');
+                var val = cells[id];
+                var result = {
+                    'data-rt-id': id,
+                    type: 'number',
+                    autocomplete: 'nope',
+                    value: '3',
+                };
+                if (readOnly) {
+                    result.disabled = "disabled";
+                }
+                if (typeof val !== 'undefined') {
+                    if (typeof val === 'boolean') { val = (val ? '1' : '0'); }
+                    result.value = val;
+                }
+                return result;
+            }));
+        });
+    };
+
+    var makeRemoveElement = Render.makeRemoveElement = function (id) {
+        return ['SPAN', {
+            'data-rt-id': id,
+            'title': Cryptpad.Messages.poll_remove,
+            class: 'cp-app-poll-table-remove',
+        }, ['✖']];
+    };
+
+    var makeEditElement = Render.makeEditElement = function (id) {
+        return ['SPAN', {
+            'data-rt-id': id,
+            'title': Cryptpad.Messages.poll_edit,
+            class: 'cp-app-poll-table-edit',
+        }, ['✐']];
+    };
+
+    var makeLockElement = Render.makeLockElement = function (id) {
+        return ['SPAN', {
+            'data-rt-id': id,
+            'title': Cryptpad.Messages.poll_locked,
+            class: 'cp-app-poll-table-lock fa fa-lock',
+        }, []];
+    };
+
+    var makeHeadingCell = Render.makeHeadingCell = function (cell, readOnly) {
+        if (!cell) { return ['TD', {}, []]; }
+        if (cell.type === 'text') {
+            var elements = [['INPUT', cell, []]];
+            if (!readOnly) {
+                elements.unshift(makeRemoveElement(cell['data-rt-id']));
+                elements.unshift(makeLockElement(cell['data-rt-id']));
+            }
+            return ['TD', {}, elements];
+        }
+        return ['TD', cell, []];
+    };
+
+    var clone = function (o) {
+        return JSON.parse(JSON.stringify(o));
+    };
+
+    var makeCheckbox = Render.makeCheckbox = function (cell) {
+        var attrs = clone(cell);
+
+        // FIXME
+        attrs.id = cell['data-rt-id'];
+
+        var labelClass = 'cp-app-poll-table-cover';
+
+        // TODO implement Yes/No/Maybe/Undecided
+        return ['TD', {class:"cp-app-poll-table-checkbox-cell"}, [
+            ['DIV', {class: 'cp-app-poll-table-checkbox-contain'}, [
+                ['INPUT', attrs, []],
+                ['SPAN', {class: labelClass}, []],
+                ['LABEL', {
+                    for: attrs.id,
+                    'data-rt-id': attrs.id,
+                }, []]
+            ]]
+        ]];
+    };
+
+    var makeBodyCell = Render.makeBodyCell = function (cell, readOnly) {
+        if (cell && cell.type === 'text') {
+            var elements = [['INPUT', cell, []]];
+            if (!readOnly) {
+                elements.push(makeRemoveElement(cell['data-rt-id']));
+                elements.push(makeEditElement(cell['data-rt-id']));
+            }
+            return ['TD', {}, [
+                    ['DIV', {class: 'cp-app-poll-table-text-cell'}, elements]
+            ]];
+        }
+
+        if (cell && cell.type === 'number') {
+            return makeCheckbox(cell);
+        }
+        return ['TD', cell, []];
+    };
+
+    var makeBodyRow = Render.makeBodyRow = function (row, readOnly) {
+        return ['TR', {}, row.map(function (cell) {
+            return makeBodyCell(cell, readOnly);
+        })];
+    };
+
+    var toHyperjson = Render.toHyperjson = function (matrix, readOnly) {
+        if (!matrix || !matrix.length) { return; }
+        var head = ['THEAD', {}, [ ['TR', {}, matrix[0].map(function (cell) {
+            return makeHeadingCell(cell, readOnly);
+        })] ]];
+        var foot = ['TFOOT', {}, matrix.slice(-1).map(function (row) {
+            return makeBodyRow(row, readOnly);
+        })];
+        var body = ['TBODY', {}, matrix.slice(1, -1).map(function (row) {
+            return makeBodyRow(row, readOnly);
+        })];
+        return ['TABLE', {id:'cp-app-poll-table'}, [head, foot, body]];
+    };
+
+    Render.asHTML = function (obj, rows, cols, readOnly) {
+        return Hyperjson.toDOM(toHyperjson(cellMatrix(obj, rows, cols, readOnly), readOnly));
+    };
+
+    var diffIsInput = Render.diffIsInput = function (info) {
+        var nodeName = Cryptpad.find(info, ['node', 'nodeName']);
+        if (nodeName !== 'INPUT') { return; }
+        return true;
+    };
+
+    var getInputType = Render.getInputType = function (info) {
+        return Cryptpad.find(info, ['node', 'type']);
+    };
+
+    var preserveCursor = Render.preserveCursor = function (info) {
+        if (['modifyValue', 'modifyAttribute'].indexOf(info.diff.action) !== -1) {
+            var element = info.node;
+
+            if (typeof(element.selectionStart) !== 'number') { return; }
+
+            var o = info.oldValue || '';
+            var n = info.newValue || '';
+            var op = TextPatcher.diff(o, n);
+
+            info.selection = ['selectionStart', 'selectionEnd'].map(function (attr) {
+                return TextPatcher.transformCursor(element[attr], op);
+            });
+        }
+    };
+
+    var recoverCursor = Render.recoverCursor = function (info) {
+        try {
+            if (info.selection && info.node) {
+                info.node.selectionStart = info.selection[0];
+                info.node.selectionEnd = info.selection[1];
+            }
+        } catch (err) {
+            // FIXME LOL empty try-catch?
+            //console.log(info.node);
+            //console.error(err);
+        }
+    };
+
+    var diffOptions = {
+        preDiffApply: function (info) {
+            if (!diffIsInput(info)) { return; }
+            switch (getInputType(info)) {
+                case 'number':
+                    //console.log('checkbox');
+                    //console.log("[preDiffApply]", info);
+                    break;
+                case 'text':
+                    preserveCursor(info);
+                    break;
+                default: break;
+            }
+        },
+        postDiffApply: function (info) {
+            if (info.selection) { recoverCursor(info); }
+            /*
+            if (!diffIsInput(info)) { return; }
+            switch (getInputType(info)) {
+                case 'checkbox':
+                    console.log("[postDiffApply]", info);
+                    break;
+                case 'text': break;
+                default: break;
+            }*/
+        }
+    };
+
+    Render.updateTable = function (table, obj, conf) {
+        var DD = new DiffDOM(diffOptions);
+
+        var rows = conf ? conf.rows : null;
+        var cols = conf ? conf.cols : null;
+        var readOnly = conf ? conf.readOnly : false;
+        var matrix = cellMatrix(obj, rows, cols, readOnly);
+
+        var hj = toHyperjson(matrix, readOnly);
+
+        if (!hj) { throw new Error("Expected Hyperjson!"); }
+
+        var table2 = Hyperjson.toDOM(hj);
+        var patch = DD.diff(table, table2);
+        DD.apply(table, patch);
+    };
+
+    return Render;
+};
+
+    return Renderer;
+});
diff --git a/www/whiteboard/inner.js b/www/whiteboard/inner.js
index cd14ef9f3..8bdac38cc 100644
--- a/www/whiteboard/inner.js
+++ b/www/whiteboard/inner.js
@@ -363,7 +363,7 @@ define([
             updateLocalPalette(palette);
             readOnly = metadataMgr.getPrivateData().readOnly;
 
-            Title = common.createTitle({}, config.onLocal);
+            Title = common.createTitle({});
 
             var configTb = {
                 displayed: ['title', 'useradmin', 'spinner', 'share', 'userlist', 'newpad', 'limit'],

From 126742a1c3de2c5aae6b23bbc2d07558b9ceb3ee Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Mon, 2 Oct 2017 19:02:31 +0200
Subject: [PATCH 03/20] Fix bugs in sframe poll and update UI

---
 www/common/metadata-manager.js    |   1 +
 www/common/sframe-common-title.js |   2 +
 www/poll/app-drive.less           | 820 ------------------------------
 www/poll/app-poll.less            | 241 +++++----
 www/poll/inner.js                 | 286 +++++++----
 www/poll/render.js                |  24 +-
 6 files changed, 329 insertions(+), 1045 deletions(-)
 delete mode 100644 www/poll/app-drive.less

diff --git a/www/common/metadata-manager.js b/www/common/metadata-manager.js
index 1c8994d00..e319c3ecb 100644
--- a/www/common/metadata-manager.js
+++ b/www/common/metadata-manager.js
@@ -68,6 +68,7 @@ define(['json.sortify'], function (Sortify) {
         };
         var change = function (lazy) {
             dirty = true;
+            console.error('METADATA CHANGE CALLED');
             setTimeout(function () {
                 checkUpdate(lazy);
             });
diff --git a/www/common/sframe-common-title.js b/www/common/sframe-common-title.js
index f07da43fa..b716c090e 100644
--- a/www/common/sframe-common-title.js
+++ b/www/common/sframe-common-title.js
@@ -17,6 +17,7 @@ define(['jquery'], function ($) {
         var $title;
         exp.setToolbar = function (toolbar) {
             $title = toolbar && (toolbar.title || toolbar.pageTitle);
+            console.log('SET TOOLBAR');
         };
 
         exp.getTitle = function () { return exp.title; };
@@ -40,6 +41,7 @@ define(['jquery'], function ($) {
         };
 
         metadataMgr.onChange(function () {
+            console.error('METADATA CHANGE');
             var md = metadataMgr.getMetadata();
             if ($title) {
                 $title.find('span.cp-toolbar-title-value').text(md.title || md.defaultTitle);
diff --git a/www/poll/app-drive.less b/www/poll/app-drive.less
deleted file mode 100644
index ea027d76e..000000000
--- a/www/poll/app-drive.less
+++ /dev/null
@@ -1,820 +0,0 @@
-@import (once) "../../customize/src/less2/include/browser.less";
-@import (once) "../../customize/src/less2/include/toolbar.less";
-@import (once) "../../customize/src/less2/include/markdown.less";
-@import (once) '../../customize/src/less2/include/fileupload.less';
-@import (once) '../../customize/src/less2/include/alertify.less';
-@import (once) '../../customize/src/less2/include/leftside-menu.less';
-@import (once) "../../customize/src/less2/include/tools.less";
-@import (once) "../../customize/src/less2/include/limit-bar.less";
-
-.toolbar_main();
-.fileupload_main();
-.alertify_main();
-.limit-bar_main();
-
-@drive_hover: #eee;
-@drive_hover-light: lighten(@drive_hover, 20%);
-@drive_info-box-bg: #d2e1f2;
-@drive_info-box-border: #bbb;
-@drive_table-header-fg: #555;
-@drive_table-header-bg: #e8e8e8;
-@drive_mobile-tree-border-col: #ccc;
-
-@drive_content-fg: @colortheme_sidebar-right-fg;
-@drive_content-bg: @colortheme_sidebar-right-bg;
-@drive_content-bg-ro: darken(@drive_content-bg, 10%);
-
-
-/* PAGE */
-
-display: flex;
-flex-flow: column;
-max-height: 100%;
-min-height: auto;
-
-.cp-unselectable {
-    .tools_unselectable();
-}
-
-/* local mixins */
-.drive_fileIcon {
-    li {
-        display: inline-block;
-        margin: 10px 10px;
-        width: 140px;
-        height: 140px;
-        text-align: center;
-        vertical-align: top;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        padding-top: 5px;
-        padding-bottom: 5px;
-
-        &:not(.cp-app-drive-element-selected):not(.cp-app-drive-element-selected-tmp) {
-            border: 1px solid #CCC;
-        }
-        .cp-app-drive-element-name {
-            width: 100%;
-            height: 48px;
-            margin: 8px 0;
-            display: inline-block;
-            //align-items: center;
-            //justify-content: center;
-            overflow: hidden;
-            //text-overflow: ellipsis;
-            word-wrap: break-word;
-        }
-        .cp-app-drive-element-truncated {
-            display: block;
-            position: absolute;
-            bottom: 0px;
-            left: 0; right: 0;
-            text-align: center;
-        }
-        img.cp-app-drive-content-icon {
-            height: 48px;
-            max-height: none;
-            max-width: none;
-            margin: 8px 0;
-        }
-        .fa {
-            display: block;
-            margin: auto;
-            font-size: 48px;
-            margin: 8px 0;
-            text-align: center;
-            &.listonly {
-                display: none;
-            }
-        }
-    }
-}
-
-img.cp-app-drive-icon {
-    max-width: 20px;
-    max-height: 16px;
-}
-
-.cp-app-drive-container {
-    flex: 1;
-    overflow: auto;
-    width: 100%;
-    display: flex;
-    flex-flow: row;
-    @media screen and (max-width: @browser_media-medium-screen) {
-        display: block;
-        #cp-app-drive-toolbar {
-            .path .element {
-                display: none;
-            }
-        }
-        #cp-app-drive-tree {
-            resize: none;
-            width: 100%;
-            max-width: unset;
-            max-height: unset;
-            border-bottom: 1px solid @drive_mobile-tree-border-col;
-            .cp-app-drive-tree-category {
-                margin-top: 0.5em;
-            }
-        }
-    }
-}
-
-div:focus {
-    outline: none;
-}
-
-.fa {
-    font-family: FontAwesome;
-}
-
-ul {
-    list-style: none;
-    padding-left: 0px; // Remove the default padding
-}
-
-li {
-    padding: 0px 5px;
-    -webkit-user-select: none;
-    -moz-user-select: none;
-    -ms-user-select: none;
-    user-select: none;
-}
-
-.cp-app-drive-context {
-    display: none;
-    position: absolute;
-    z-index: 500;
-    li {
-        padding: 0;
-        font-size: @colortheme_app-font-size;
-        a {
-            cursor: pointer;
-        }
-    }
-}
-
-.cp-app-drive-element-droppable {
-    background-color: #FE9A2E;
-    color: #222;
-}
-
-.cp-app-drive-element-selected {
-    background: #666 !important;
-    color: #eee;
-    margin: -1px;
-    .fa-minus-square-o, .fa-plus-square-o {
-        color: @colortheme_sidebar-left-fg;
-    }
-}
-
-.cp-app-drive-element-selected-tmp {
-    border: 1px dotted #bbb;
-    background: #AAA;
-    color: #ddd;
-    margin: -1px;
-    .fa-minus-square-o, .fa-plus-square-o {
-        color: @colortheme_sidebar-left-fg;
-    }
-}
-
-span {
-    &.fa-folder, &.fa-folder-open {
-        //color: #FEDE8B;
-        //text-shadow: -1px 0 black, 0 1px black, 1px 0 black, 0 -1px black;
-    }
-}
-
-/* TREE */
-
-
-#cp-app-drive-tree {
-    font-size: @colortheme_app-font-size;
-    //border-right: 1px solid #ccc;
-    box-sizing: border-box;
-    background: @colortheme_sidebar-left-bg;
-    overflow: auto;
-    resize: horizontal;
-    width: auto;
-    white-space: nowrap;
-    max-width: 500px;
-    min-width: 200px;
-    padding: 0px;
-    color: @colortheme_sidebar-left-fg;
-    display: flex;
-    flex-flow: column;
-    max-height: 100%;
-    .cp-app-drive-tree-categories-container {
-        flex: 1;
-        max-width: 500px;
-        overflow: auto;
-    }
-    img.cp-app-drive-icon {
-        margin-bottom: 3px;
-        margin-left: -2px;
-    }
-    .cp-app-drive-tree-docs {
-        margin-top: 20px;
-        //padding: 0 0 0 20px;
-        padding: 0;
-        cursor: auto;
-        &li, li {
-            padding: 0;
-            &.cp-app-drive-element-collapsed ul {
-                display: none;
-            }
-            input {
-                width: ~"calc(100% - 30px)";
-                padding: 0 10px;
-                border: 0;
-                color: lighten(@colortheme_sidebar-left-fg, 40%);
-            }
-            & > span.cp-app-drive-element-row {
-                overflow: hidden;
-                text-overflow: ellipsis;
-                //min-width: ~"calc(100% + 5px)";
-                .leftside-menu-category_main();
-                width: ~"calc(100% + 5px)";
-                margin: 0;
-                margin-bottom: -6px;
-                display: inline-block;
-                cursor: pointer;
-                margin-left: -5px;
-                padding-left: 5px;
-            }
-            & > span.cp-app-drive-element-row:not(.cp-app-drive-element-selected):not(.cp-app-drive-element-active):hover {
-            }
-        }
-    }
-    span.cp-app-drive-element {
-        cursor: pointer;
-    }
-    .cp-app-drive-tree-category {
-        margin: 0;
-        margin-top: 15px;
-        .cp-app-drive-tree-root {
-            &> .fa {
-                min-width: 30px;
-                cursor: pointer;
-            }
-        }
-        li {
-            padding: 0;
-            .cp-app-drive-element-row {
-                display: block;
-                padding-left: 20px;
-                .leftside-menu-category_main();
-                margin: 0;
-                .fa {
-                    width: 25px;
-                }
-            }
-        }
-    }
-    .cp-app-drive-tree-category:last-child {
-        margin-bottom: 20px;
-    }
-    .limit-container {
-        margin-top: 0;
-    }
-    #cp-app-drive-tree-search {
-        text-align: center;
-        padding: 0;
-        position: relative;
-        input {
-            background: lighten(@colortheme_drive-bg, 8%);
-            color: @colortheme_drive-color;
-            .tools_placeholder-color(@colortheme_drive-color);
-            outline-width: 0px;
-            border-radius: 0;
-            width: 100%;
-            //border: 1px solid #ccc;
-            border: 0;
-            border-right: 1px solid lighten(@colortheme_drive-bg, 16%);
-            //border-right: 0;
-            height: @variables_bar-height;
-            padding: 0 5px;
-            padding-left: 45px;
-            &:focus {
-                outline-width: 0px;
-            }
-        }
-        .cp-app-drive-tree-search-con {
-            color: @colortheme_drive-color;
-            position: absolute;
-            left: 20px; // TODO align with drive categories
-            top: 8px;
-        }
-    }
-    .fa.cp-app-drive-icon-expcol {
-        margin-left: -10px;
-        font-size: 14px;
-        position: absolute;
-        left: -20px;
-        top: 10px;
-        width: 11px !important;
-        height: 11px !important;
-        padding: 0;
-        margin: 0;
-        background: white;
-        z-index: 10;
-        cursor: default;
-        &:before {
-            position:relative;
-            top: -1px;
-        }
-    }
-    .cp-app-drive-tree-docs {
-        .cp-app-drive-tree-root > .cp-app-drive-element-row > .cp-app-drive-icon-expcol {
-            position: relative;
-            top:0;
-            left: -10px;
-        }
-        .cp-app-drive-tree-root > .cp-app-drive-element-row > .cp-app-drive-icon-folder {
-            margin-left: -5px;
-        }
-        .cp-app-drive-tree-root {
-            &> .cp-app-drive-element-row {
-                padding-left: 20px;
-            }
-            &> ul {
-                padding-left: 30px;
-            }
-        }
-    }
-
-    // Expand/collapse lines
-    .cp-app-drive-tree-docs ul {
-        margin: 0px 0px 0px 10px;
-        list-style: none;
-        padding-left: 10px;
-        li {
-            position: relative;
-            &:before {
-                position: absolute;
-                left: -15px;
-                top: -11px;
-                content: '';
-                display: block;
-                border-left: 1px solid @colortheme_sidebar-left-branch;
-                height: ~"calc(1em + 11px)";
-                border-bottom: 1px solid @colortheme_sidebar-left-branch;
-                width: 15px;
-            }
-            &:after {
-                position: absolute;
-                left: -15px;
-                bottom: -7px;
-                content: '';
-                display: block;
-                border-left: 1px solid @colortheme_sidebar-left-branch;
-                height: 100%;
-            }
-            &.cp-app-drive-tree-root {
-                margin: 0px 0px 0px -10px;
-                &:before {
-                    display: none;
-                }
-                &:after {
-                    display: none;
-                }
-            }
-            &:last-child:after {
-                display: none;
-            }
-        }
-    }
-}
-
-/* CONTENT */
-#cp-app-drive-content-container {
-    display: flex;
-    flex-flow: column;
-    flex: 1;
-    // Needed to avoid the folder's path to overflows
-    // https://stackoverflow.com/questions/38223879/white-space-nowrap-breaks-flexbox-layout
-    min-width: 0;
-}
-#cp-app-drive-content {
-    box-sizing: border-box;
-    background: @drive_content-bg;
-    color: @drive_content-fg;
-    overflow: auto;
-    flex: 1;
-    display: flex;
-    flex-flow: column;
-    position: relative;
-    .cp-app-drive-content-select-box {
-        display: none;
-        background-color: rgba(100, 100, 100, 0.7);
-        position: absolute;
-        z-index: 50;
-    }
-    &.cp-app-drive-readonly {
-        background: @drive_content-bg-ro;
-    }
-    h1 {
-        padding-left: 10px;
-        margin-top: 10px;
-    }
-    .cp-app-drive-content-info-box {
-        line-height: 2em;
-        padding: 0.25em 0.75em;
-        margin: 1em;
-        background: @drive_info-box-bg;
-        span {
-            cursor: pointer;
-            float: right;
-            margin-top: 0.5em;
-        }
-    }
-    li {
-        cursor: default;
-        &:not(.cp-app-drive-element-header) {
-            &:hover {
-                &:not(.-cp-app-drive-element-selected, .cp-app-drive-element-selected-tmp) {
-                    background-color: @drive_hover;
-                }
-            }
-        }
-    }
-    #cp-app-drive-content-folder {
-        li {
-            &.cp-app-drive-search-result {
-                border-bottom: 1px solid @drive_info-box-border;
-                display: block;
-                &:hover {
-                    background-color: initial;
-                }
-                table {
-                    width: 100%;
-                    .cp-app-drive-search-label2 {
-                        width: 150px;
-                        font-size: 15px;
-                        text-align: right;
-                        padding-right: 15px;
-                    }
-                    .cp-app-drive-search-opendir {
-                        a {
-                            cursor: pointer;
-                            color: #41b7d8;
-                            &:hover {
-                                color: #014c8c;
-                                text-decoration: underline;
-                            }
-                        }
-                    }
-                    .cp-app-drive-search-path {
-                        font-style: italic;
-                        direction: rtl;
-                        .cp-app-drive-path-element {
-                            display: inline-block;
-                            margin-right: 5px;
-                        }
-                    }
-                    .cp-app-drive-search-title {
-                        font-weight: bold;
-                        cursor: pointer;
-                        &:hover {
-                            background-color: @drive_hover;
-                        }
-                    }
-                    .cp-app-drive-search-col2 {
-                        width: 250px;
-                    }
-                    td.cp-app-drive-search-icon {
-                        width: 50px;
-                        font-size: 40px;
-                    }
-                }
-            }
-        }
-    }
-    .cp-app-drive-element {
-        .cp-app-drive-element-truncated { display: none; }
-    }
-    div.cp-app-drive-content-grid {
-        padding: 20px;
-        .drive_fileIcon;
-        li {
-            &.cp-app-drive-element {
-                position: relative;
-            }
-            input {
-                width: 100%;
-                margin-top: 5px;
-            }
-            .cp-app-drive-element-state {
-                position: absolute;
-                top: 3px;
-                right: 3px;
-                .fa {
-                    margin:0;
-                    font-size: 18px;
-                }
-            }
-        }
-        .cp-app-drive-element-list {
-            display: none;
-        }
-        .cp-app-drive-new-ghost {
-            cursor: pointer;
-            opacity: 0.5;
-            padding: 0;
-            &:hover {
-                opacity: 0.7;
-            }
-            .fa {
-                cursor: pointer;
-                font-size: 90px;
-                margin-top: 5px;
-                margin-bottom: 0;
-            }
-        }
-    }
-
-    .cp-app-drive-content-list {
-        .cp-app-drive-element-grid {
-            display: none;
-        }
-        // Make it act as a table!
-        padding-left: 20px;
-        ul {
-            display: table;
-            width: 100%;
-            padding: 0px 10px;
-        }
-        li {
-            display: table-row;
-            &> span {
-                padding: 0 5px;
-                display: table-cell;
-            }
-            &:not(.cp-app-drive-element-header) {
-                height: @variables_bar-height;
-                line-height: @variables_bar-height;
-            }
-            &.cp-app-drive-element-header {
-                cursor: default;
-                color: @drive_table-header-fg;
-                span {
-                    &:not(.fa) {
-                        text-align: left;
-                    }
-                    &.sortasc, &.sortdesc {
-                        float: right;
-                    }
-                }
-                &> span {
-                    padding: 15px 5px;
-                    &.cp-app-drive-sort-active {
-                        font-weight: bold;
-                    }
-                    &.cp-app-drive-sort-clickable {
-                        cursor: pointer;
-                        &:hover {
-                            background: @drive_table-header-bg;
-                        }
-                    }
-                }
-            }
-        }
-        .cp-app-drive-element {
-            span {
-                overflow: hidden;
-                white-space: nowrap;
-                box-sizing: border-box;
-                &.cp-app-drive-element-state {
-                    .fa:not(:last-child) {
-                        margin-right: 5px;
-                    }
-                }
-                &.cp-app-drive-content-icon, &.cp-app-drive-element-state {
-                    width: 30px;
-                }
-                &.cp-app-drive-element-type, &.cp-app-drive-element-atime, &.cp-app-drive-element-ctime {
-                    width: 175px;
-                }
-                &.cp-app-drive-element-title {
-                    width: 250px;
-                    @media screen and (max-width: 1200px) {
-                        display: none;
-                    }
-                }
-                &.cp-app-drive-element-folders, &.cp-app-drive-element-files {
-                    width: 150px;
-                }
-            }
-        }
-    }
-}
-
-#cp-app-drive-content-folder {
-    padding-right: 10px;
-    flex: 1;
-}
-
-#cp-app-drive-new-ghost-dialog.cp-modal-container {
-    .drive_fileIcon;
-
-    li:not(.cp-app-drive-element-selected):hover {
-        border: 1px solid white;
-    }
-    .cp-modal {
-        display: flex;
-        flex-flow: column;
-        li, li .fa {
-            cursor: pointer;
-        }
-        &> p {
-            margin: 50px;
-        }
-        &> div {
-            display: flex;
-            flex-wrap: wrap;
-            justify-content: center;
-            align-content: center;
-            overflow-y: auto;
-            .cp-app-drive-new-upload {
-                break-after: always;
-                page-break-after: always;
-            }
-        }
-    }
-
-    @media screen and (max-height: @browser_media-not-big) {
-        .cp-modal {
-            & > p {
-                display: none;
-            }
-            & > div {
-                align-content: unset;
-                li {
-                    height: 40px;
-                    width: 90%;
-                    display: flex;
-                    align-items: center;
-                    .fa {
-                        font-size: 32px;
-                    }
-                    .cp-app-drive-new-name {
-                        height: auto;
-                    }
-                }
-            }
-        }
-    }
-}
-
-
-/* Toolbar */
-
-#cp-app-drive-toolbar {
-    background: lighten(@colortheme_drive-bg, 8%);
-    color: @colortheme_drive-color;
-    //height: 30px;
-    //display: flex;
-    //flex-flow: row;
-    z-index: 100;
-    box-sizing: border-box;
-    height: @variables_bar-height;
-    padding: 0;
-    display: flex;
-    flex-flow: row;
-
-    * {
-        outline-width: 0;
-        &:focus {
-            outline-width: 0;
-        }
-    }
-
-    .history {
-        float: right;
-        .cp-toolbar-drawer-element {
-            display: none;
-        }
-    }
-
-    .cp-app-drive-toolbar-rightside, .cp-app-drive-toolbar-leftside {
-        display: inline-block;
-        margin: 0;
-        padding: 0;
-        .fa {
-            margin: 0;
-        }
-        button {
-            height: @variables_bar-height;
-            padding: 0 10px;
-            border: none;
-            border-radius: 0;
-            box-sizing: border-box;
-            background: transparent;
-            font-size: @colortheme_app-font-size;
-            color: @colortheme_drive-color;
-            transition: all 0.15s;
-            .drawer {
-                display: none;
-            }
-            .fa, span {
-                font-size: @colortheme_app-font-size;
-            }
-            &:hover {
-                background: @colortheme_drive-bg;
-            }
-            &.cp-app-drive-toolbar-active {
-                display: none;
-            }
-        }
-    }
-    .cp-app-drive-toolbar-rightside {
-        float: right;
-        & > * {
-            float: right;
-        }
-        #cp-app-drive-toolbar-contextbuttons {
-            display: inline-block;
-            height: 100%;
-        }
-        padding-left: 10px;
-    }
-    .cp-app-drive-toolbar-leftside {
-        & > span {
-            height: 100%;
-            margin: 0;
-        }
-        button {
-            padding: 0 10px;
-            .fa {
-                margin-right: 5px;
-            }
-            .cp-dropdown-button-title {
-                display: inline-flex;
-                height: @variables_bar-height;
-                align-items: center;
-                span:not(.fa) {
-                    line-height: 23px;
-                }
-            }
-        }
-    }
-
-    button {
-        font: @colortheme_app-font;
-        span {
-            font: @colortheme_app-font;
-        }
-        .fa, &.fa {
-            font-family: FontAwesome;
-        }
-    }
-    /* The container <div> - needed to position the dropdown content */
-    .cp-dropdown-container {
-        margin: 2px 2px;
-        line-height: 1em;
-        position: relative;
-        display: inline-block;
-    }
-    .cp-dropdown-content {
-        margin-right: 2px;
-    }
-
-    .cp-app-drive-path {
-        flex: 1;
-        width: 100%;
-        height: @variables_bar-height;
-        line-height: @variables_bar-height;
-        cursor: default;
-        width: auto;
-        overflow: hidden;
-        white-space: nowrap;
-        direction: rtl;
-        max-width: 100%;
-        text-align: left;
-        .cp-app-drive-path-element {
-            display: inline-block;
-            height: @variables_bar-height;
-            line-height: @variables_bar-height;
-            font-size: @colortheme_app-font-size;
-            padding: 0 5px;
-            border: 0;
-            background: darken(@colortheme_drive-bg, 10%);
-            color: @colortheme_drive-color;
-            box-sizing: border-box;
-            transition: all 0.15s;
-            &.cp-app-drive-path-separator {
-                color: #ccc;
-            }
-            &.cp-app-drive-path-lickable {
-                cursor: pointer;
-                &:hover {
-                    background: darken(@colortheme_drive-bg, 15%);
-                }
-            }
-        }
-    }
-}
-
-
-
diff --git a/www/poll/app-poll.less b/www/poll/app-poll.less
index fd751249d..8960d1094 100644
--- a/www/poll/app-poll.less
+++ b/www/poll/app-poll.less
@@ -11,10 +11,19 @@
 .tokenfield_main();
 
 @poll-fore: #555;
-@poll-th-bg: #aaa;
-@poll-th-user-bg: #999;
-@poll-td-bg: #aaa;
-@poll-editing: #88b8cc;
+
+@poll-th-bg: #005bef;
+@poll-th-fg: #fff;
+@poll-th-user-bg: darken(@poll-th-bg, 10%);
+@poll-editing: lighten(@poll-th-bg, 10%);
+@poll-winner: darken(@poll-th-bg, 15%);
+@poll-td-bg: @poll-th-bg;
+@poll-td-fg: @poll-th-fg;
+
+@poll-uncommitted-cell: #eee;
+@poll-uncommitted-bg: #ddd; //lighten(@poll-th-bg, 50%);
+@poll-uncommitted-text: black;
+
 @poll-placeholder: #666;
 @poll-border-color: #555;
 @poll-cover-color: #000;
@@ -35,18 +44,20 @@ overflow-x: hidden;
     #cp-app-poll-form {
         flex: 1;
         overflow-y: auto;
+        &.cp-app-poll-published {
+            #cp-app-poll-create-option {
+                display: none;
+            }
+            .cp-app-poll-table-remove[data-rt-id^="y"], .cp-app-poll-table-edit[data-rt-id^="y"] {
+                display: none;
+            }
+            tr.cp-app-poll-table-uncommitted {
+                display: none;
+            }
+        }
     }
 }
 
-/*.cp-toolbar-container h2 {
-    font: normal normal normal 12px Arial, Helvetica, Tahoma, Verdana, Sans-Serif;
-    color: #000;
-    line-height: auto;
-}
-.cp-toolbar-container {
-    display: block;
-}*/
-
 .cp-app-poll-table-text-cell input[type="text"] {
     width: 400px;
 }
@@ -64,8 +75,9 @@ input[type="text"][disabled], textarea[disabled] {
 
 // The placeholder color only seems to effect Safari when not set
 
-input[type="text"]::placeholder {
-    color: @poll-placeholder;
+input[type="text"][disabled]::placeholder {
+    //color: @poll-placeholder;
+    opacity: 1;
 }
 
 table#cp-app-poll-table {
@@ -73,12 +85,13 @@ table#cp-app-poll-table {
 }
 #cp-app-poll-table-container {
     position: relative;
-    padding: 29px;
-    padding-right: 79px;
+    padding: 30px 0;
+    width: ~"calc(100% - 30px)";
 }
 #cp-app-poll-table-container button {
-    height: 2rem;
-    display: none;
+    //display: none;
+    border-radius: 0;
+    border: 0;
 }
 #cp-app-poll-publish {
     display: none;
@@ -88,21 +101,23 @@ table#cp-app-poll-table {
     margin-bottom: 15px;
 }
 #cp-app-poll-create-user {
-    position: absolute;
-    display: inline-block;
-    /*left: 0px;*/
-    top: 55px;
+    display: inline-flex;
+    height: 24px;
+    padding: 0;
     width: 50px;
     overflow: hidden;
 }
 #cp-app-poll-create-option {
+    display: inline-flex;
     width: 50px;
+    height: 24px;
+    padding: 0;
 }
 #cp-app-poll-table-scroll {
     overflow-y: hidden;
     overflow-x: auto;
-    margin-left: calc(~"30% - 50px + 31px");
-    max-width: 70%;
+    margin-left: ~"calc(25% + 30px)";
+    max-width: ~"calc(75% - 30px - 100px - 100px)";
     width: auto;
     display: inline-block;
 }
@@ -145,45 +160,12 @@ table {
     margin: 20px;
 }
 tbody {
-    border: 1px solid @poll-border-color;
+    //border: 1px solid @poll-border-color;
     * {
         box-sizing: border-box;
     }
     tr {
         text-align: center;
-        &:first-of-type th{
-            font-size: 20px;
-            border-top: 0px;
-            font-weight: bold;
-            padding: 10px;
-            text-decoration: underline;
-            &.table-refresh {
-                color: @colortheme_cp-green;
-                text-decoration: none;
-                cursor: pointer;
-            }
-
-        }
-        &:nth-child(odd) {
-            background-color: @colortheme_light-base;
-        }
-        th:first-of-type {
-            border-left: 0px;
-        }
-        th {
-            box-sizing: border-box;
-            border: 1px solid @poll-border-color;
-        }
-        th, td {
-            color: @poll-fore;
-
-            .cp-app-poll-table-remove {
-                cursor: pointer;
-            }
-        }
-        th:last-child {
-            border-right: 0px;
-        }
     }
 
     td {
@@ -222,12 +204,48 @@ div.cp-app-poll-realtime {
         .cp-app-poll-table-editing {
             background-color: @poll-editing;
         }
+        .cp-app-poll-table-uncommitted {
+            .cp-app-poll-table-cover {
+                background-color: @poll-uncommitted-cell !important;
+            }
+            div.cp-app-poll-table-text-cell {
+                background-color: @poll-uncommitted-bg !important;
+                color: @poll-uncommitted-text !important;
+                input {
+                    width: ~"calc(100% - 80px)" !important;
+                    vertical-align: middle;
+                }
+            }
+            text-align: center;
+            background-color: @poll-uncommitted-bg !important;
+            color: @poll-uncommitted-text !important;
+        }
         tr {
+            height: 28px;
+            /* Options */
             td:first-child {
                 position:absolute;
-                left: 29px;
+                left: 30px;
+                top: auto;
+                width: 25%;
+            }
+            /* Uncommitted column */
+            td:nth-last-child(2) {
+                position: absolute;
+                top: auto;
+                width: 100px;
+                min-width: unset !important;
+                height: auto !important;
+            }
+            /* Results */
+            td:last-child {
+                color: @poll-th-fg;
+                position:absolute;
                 top: auto;
-                width: ~"calc(30% - 50px)";
+                margin-left: 100px;
+                width: 100px;
+                min-width: unset !important;
+                background-color: @poll-th-bg;
             }
             td {
                 padding: 0px;
@@ -243,10 +261,11 @@ div.cp-app-poll-realtime {
                         width: 90%;
                         height: 100%;
                         border: 0px;
+                        margin: 2px;
                         &[disabled] {
                             background-color: transparent;
-                            color: @poll-fg;
-                            font-weight: bold;
+                            color: @poll-td-fg;
+                            //font-weight: bold;
                         }
                     }
                 }
@@ -279,8 +298,11 @@ div.cp-app-poll-realtime {
                                     display: none;
 
                                     ~ .cp-app-poll-table-cover {
+                                        line-height: 28px;
                                         display: block;
                                         font-weight: bold;
+                                        height: 100%;
+                                        display: block;
 
                                         color: @poll-cover-color;
 
@@ -288,18 +310,6 @@ div.cp-app-poll-realtime {
                                             height: 100%;
                                         }
 
-                                        display: block;
-                                        &.yes {
-                                            background-color: @colortheme_cp-green;
-                                        }
-
-                                        &.uncommitted {
-                                            background: #ddd;
-                                        }
-
-                                        &.mine {
-                                            display: none;
-                                        }
                                     }
                                 }
                             }
@@ -350,22 +360,40 @@ div.cp-app-poll-realtime {
             td {
                 padding: 0px 5px;
                 background: @poll-th-bg;
-                border-radius: 20px 20px 0 0;
+                color: @poll-th-fg;
+                &:not(:last-child) {
+                    border-right: 1px solid rgba(255,255,255,0.2);
+                }
+                &:nth-last-child(2) {
+                    border-right: 1px solid @poll-border-color;
+                }
                 //text-align: center;
-                &:nth-of-type(2) {
+                &.cp-app-poll-table-own {
                     background: @poll-th-user-bg;
                     .cp-app-poll-table-lock {
                         cursor: default;
                     }
                 }
+                .cp-app-poll-table-buttons {
+                    display: flex;
+                    justify-content: space-between;
+                    flex-wrap: wrap;
+                    align-items: center;
+                    span {
+                        cursor: pointer;
+                        width: 1em;
+                        text-align: center;
+                    }
+                }
                 input {
                     &[type="text"] {
-                        width: 100%;
+                        break-after: always;
+                        width: ~"calc(100% - 2px)"; // borders...
                         box-sizing: border-box;
                         padding: 1px 5px;
+                        margin: 1px;
                         &[disabled] {
-                            color: @poll-fg;
-                            border: 1px solid transparent;
+                            color: @poll-th-fg;
                         }
                     }
                 }
@@ -373,24 +401,26 @@ div.cp-app-poll-realtime {
         }
 
         tbody {
-            td:not(.cp-app-poll-table-editing) {
-                .cp-app-poll-table-text-cell {
-                    background: @poll-td-bg;
-                }
+            td:first-child {
+                background: @poll-td-bg;
+                color: @poll-td-fg;
+            }
+            td.cp-app-poll-table-winner {
+                background-color: @poll-winner;
+                &:last-child { font-weight: bold; }
             }
             .cp-app-poll-table-text-cell {
-                //border-radius: 20px 0 0 20px;
                 input[type="text"] {
                     width: ~"calc(100% - 50px)";
                     padding: 0 0.5em;
                 }
                 .cp-app-poll-table-edit {
                     float:right;
-                    margin: 0 10px 0 0;
+                    margin: 2px 10px 0 0;
                 }
                 .cp-app-poll-table-remove {
                     float: left;
-                    margin: 0 0 0 10px;
+                    margin: 2px 0 0 10px;
                 }
             }
             tr:not(:first-child) {
@@ -402,23 +432,12 @@ div.cp-app-poll-realtime {
             }
         }
         .cp-app-poll-table-edit {
-            color: @poll-cover-color;
+            //color: @poll-cover-color;
             cursor: pointer;
             float: left;
             margin-left: 10px;
         }
 
-        .cp-app-poll-table-lock {
-            margin-left: ~"calc(50% - 0.5em)";
-            cursor: pointer;
-            width: 1em;
-            text-align: center;
-        }
-        .cp-app-poll-table-remove {
-            float: right;
-            margin-right: 10px;
-        }
-
         thead {
             tr {
                 th {
@@ -442,31 +461,9 @@ div.cp-app-poll-realtime {
             }
         }
         tfoot {
-            tr {
-                border: none;
-                td {
-                    border: none;
-                    text-align: center;
-                    .save {
-                        padding: 15px;
-                        border-top-left-radius: 5px;
-                        border-top-right-radius: 5px;
-                    }
-                }
-            }
+            display: none;
         }
     }
-
-    #adduser,
-    #addoption {
-        color: @colortheme_cp-green;
-        border: 1px solid @colortheme_cp-green;
-        padding: 15px;
-        cursor: pointer;
-    }
-
-    #adduser { .top-left; }
-    #addoption { .bottom-left; }
 }
 
 .btn {
diff --git a/www/poll/inner.js b/www/poll/inner.js
index 371ce078a..57916294e 100644
--- a/www/poll/inner.js
+++ b/www/poll/inner.js
@@ -75,14 +75,51 @@ define([
 
 
 
+    var copyObject = function (obj) {
+        return JSON.parse(JSON.stringify(obj));
+    };
 
 
 
+    /*
+        Make sure that the realtime data structure has all the required fields
+    */
+    var prepareProxy = function (proxy, schema) {
+        if (proxy && proxy.version === 1) { return; }
+        debug("Configuring proxy schema...");
+
+        proxy.metadata = proxy.metadata || schema.metadata;
+        Object.keys(schema.metadata).forEach(function (k) {
+            if (!proxy.metadata[k]) { proxy.metadata[k] = schema.metadata[k]; }
+        });
+
+        proxy.content = proxy.content || schema.content;
+        Object.keys(schema.content).forEach(function (k) {
+            if (!proxy.content[k]) { proxy.content[k] = schema.content[k]; }
+        });
+
+        proxy.version = 1;
+        proxy.type = 'poll';
+    };
 
 
 
+    var setUserId = function (id, cb) {
+        cb  =cb || $.noop;
+        APP.userid = id;
+        common.setPadAttribute('userid', id, function (e) {
+            if (e) {
+                console.error(e);
+                return void cb(e);
+            }
+            cb();
+        });
+    };
+
     var sortColumns = function (order, firstcol) {
         var colsOrder = order.slice();
+        // Never put at the first position an uncommitted column
+        if (APP.proxy.content.colsOrder.indexOf(firstcol) === -1) { return colsOrder; }
         colsOrder.sort(function (a, b) {
             return (a === firstcol) ? -1 :
                         ((b === firstcol) ? 1 : 0);
@@ -90,8 +127,9 @@ define([
         return colsOrder;
     };
 
-    var isOwnColumnCommitted = function () {
-        return APP.proxy && APP.proxy.content.colsOrder.indexOf(APP.userid) !== -1;
+    var isUncommitted = function (id) {
+        return APP.uncommitted.content.colsOrder.indexOf(id) !== -1 ||
+               APP.uncommitted.content.rowsOrder.indexOf(id) !== -1;
     };
 
     var mergeUncommitted = function (proxy, uncommitted, commit) {
@@ -101,11 +139,6 @@ define([
         } else {
             newObj = $.extend(true, {}, proxy);
         }
-        // We have uncommitted data only if the user's column is not in the proxy
-        // If it is already is the proxy, nothing to merge
-        /*if (isOwnColumnCommitted()) {
-            return newObj;
-        }*/
 
         // Merge uncommitted into the proxy
         uncommitted.content.colsOrder = uncommitted.content.colsOrder || [];
@@ -129,9 +162,9 @@ define([
             if (newObj.content.rowsOrder.indexOf(x) !== -1) { return; }
             newObj.content.rowsOrder.push(x);
         });
-        for (var k in uncommitted.content.rows) {
-            if (!newObj.content.rows[k]) {
-                newObj.content.rows[k] = uncommitted.content.rows[k];
+        for (var m in uncommitted.content.rows) {
+            if (!newObj.content.rows[m]) {
+                newObj.content.rows[m] = uncommitted.content.rows[m];
             }
         }
 
@@ -143,26 +176,46 @@ define([
     };
 
     var styleUncommittedColumn = function () {
-        var id = APP.userid;
+        var userid = APP.userid;
 
         // TODO: move?
         // Enable input for the userid column
-        $('input[disabled="disabled"][data-rt-id^="' + id + '"]').removeAttr('disabled');
-        $('input[type="number"][data-rt-id^="' + id + '"]').addClass('enabled');
-        $('.cp-app-poll-table-lock[data-rt-id="' + id + '"]').addClass('fa-unlock').removeClass('fa-lock').attr('title', Messages.poll_unlocked);
-
+        $('input[disabled="disabled"][data-rt-id^="' + userid + '"]').removeAttr('disabled')
+            .attr('placeholder', Messages.poll_userPlaceholder);
+        $('input[type="number"][data-rt-id^="' + userid + '"]').addClass('enabled');
+        $('.cp-app-poll-table-lock[data-rt-id="' + userid + '"]').remove();
+        $('[data-rt-id^="' + userid + '"]').closest('td')
+            .addClass("cp-app-poll-table-own");
+        $('.cp-app-poll-table-bookmark[data-rt-id="' + userid + '"]').css('visibility', '')
+            .removeClass('fa-bookmark-o').addClass('fa-bookmark')
+            .attr('title', 'TODO: this is your bookmarked column. It will always be unlocked and displayed at the beginning for you');
+        //.addClass('fa-unlock').removeClass('fa-lock').attr('title', Messages.poll_unlocked);
+        //$('.cp-app-poll-table-remove[data-rt-id="' + userid + '"]').remove();
+
+        var $scroll = $('#cp-app-poll-table-scroll');
+        var hasScroll = $scroll.width() < $scroll[0].scrollWidth;
         APP.uncommitted.content.colsOrder.forEach(function(id) {
             // Enable the checkboxes for the uncommitted column
             $('input[disabled="disabled"][data-rt-id^="' + id + '"]').removeAttr('disabled');
             $('input[type="number"][data-rt-id^="' + id + '"]').addClass('enabled');
-            $('.cp-app-poll-table-lock[data-rt-id="' + id + '"]').addClass('fa-unlock').removeClass('fa-lock').attr('title', Messages.poll_unlocked);
+            $('.cp-app-poll-table-lock[data-rt-id="' + id + '"]').remove();
+            //.addClass('fa-unlock').removeClass('fa-lock').attr('title', Messages.poll_unlocked);
+            $('.cp-app-poll-table-remove[data-rt-id="' + id + '"]').remove();
+            $('.cp-app-poll-table-bookmark[data-rt-id="' + id + '"]').remove();
 
-            $('[data-rt-id^="' + id + '"]').closest('td').addClass("cp-app-poll-table-uncommitted");
             $('td.cp-app-poll-table-uncommitted .cover').addClass("cp-app-poll-table-uncommitted");
+            var $uncommittedCol = $('[data-rt-id^="' + id + '"]').closest('td');
+            $uncommittedCol.addClass("cp-app-poll-table-uncommitted");
+
+            if (hasScroll) {
+                $uncommittedCol.css('right', '100px');
+            }
         });
         APP.uncommitted.content.rowsOrder.forEach(function(id) {
             // Enable the checkboxes for the uncommitted column
             $('input[disabled="disabled"][data-rt-id="' + id + '"]').removeAttr('disabled');
+            $('.cp-app-poll-table-edit[data-rt-id="' + id + '"]').remove();
+            $('.cp-app-poll-table-remove[data-rt-id="' + id + '"]').remove();
 
             $('[data-rt-id="' + id + '"]').closest('tr').addClass("cp-app-poll-table-uncommitted");
             //$('td.uncommitted .cover').addClass("uncommitted");
@@ -187,10 +240,20 @@ define([
     };
 
     var updateTableButtons = function () {
-        var $createOption = APP.$table.find('tfoot tr td:first-child');
+        var uncomColId = APP.uncommitted.content.colsOrder[0];
+        var uncomRowId = APP.uncommitted.content.rowsOrder[0];
+        var $createOption = APP.$table.find('tbody input[data-rt-id="' + uncomRowId+'"]')
+                                .closest('td').find('> div');
         $createOption.append(APP.$createRow);
+        var $createUser = APP.$table.find('thead input[data-rt-id="' + uncomColId + '"]')
+                                .closest('td');
+        $createUser.prepend(APP.$createCol);
+
+        if (APP.proxy.content.colsOrder.indexOf(APP.userid) === -1) {
+            APP.$table.find('.cp-app-poll-table-bookmark').css('visibility', '');
+        }
 
-        $('#cp-app-poll-create-user, #cp-app-poll-create-option').css('display', 'inline-flex');
+        //$('#cp-app-poll-create-user, #cp-app-poll-create-option').css('display', 'inline-flex');
         if (!APP.proxy ||
             !APP.proxy.content.rowsOrder ||
             APP.proxy.content.rowsOrder.length === 0) {
@@ -206,21 +269,64 @@ define([
         if (bool) {
             if (APP.$publish) { APP.$publish.hide(); }
             if (APP.$admin) { APP.$admin.show(); }
-            $('#cp-app-poll-create-option').hide();
-            $('.cp-app-poll-table-remove[data-rt-id^="y"], .cp-app-poll-table-edit[data-rt-id^="y"]').hide();
+            $('#cp-app-poll-form').addClass('cp-app-poll-published');
         } else {
             if (APP.$publish) { APP.$publish.show(); }
             if (APP.$admin) { APP.$admin.hide(); }
-            $('#cp-app-poll-create-option').show();
-            $('.cp-app-poll-table-remove[data-rt-id^="y"], .cp-app-poll-table-edit[data-rt-id^="y"]').show();
+            $('#cp-app-poll-form').removeClass('cp-app-poll-published');
         }
     };
 
+    var addCount = function () {
+        var $scroll = $('#cp-app-poll-table-scroll');
+        var hasScroll = $scroll.width() < $scroll[0].scrollWidth;
+        var $countCol = $('tr td:last-child');
+        if (hasScroll) {
+            $countCol.css('right', '0');
+        }
+        var $thead = APP.$table.find('thead');
+        var $tr = APP.$table.find('tbody tr').first();
+        $thead.find('tr td').last()
+            .css({
+                'height': $thead.height()+'px',
+                'text-align': 'center',
+                'line-height': $thead.height()+'px'
+            })
+            .text('TOTAL'); // TODO
+        var winner = {
+            v: 0,
+            ids: []
+        };
+        APP.proxy.content.rowsOrder.forEach(function (rId) {
+            var count = Object.keys(APP.proxy.content.cells)
+                .filter(function (k) {
+                    return k.indexOf(rId) !== -1 && APP.proxy.content.cells[k] === 1;
+                }).length;
+            if (count > winner.v) {
+                winner.v = count;
+                winner.ids = [rId];
+            } else if (count && count === winner.v) {
+                winner.ids.push(rId);
+            }
+            APP.$table.find('[data-rt-count-id="' + rId + '"]')
+                .text(count)
+                .css({
+                    'height': $tr.height()+'px',
+                    'line-height': $tr.height()+'px'
+                });
+        });
+        winner.ids.forEach(function (rId) {
+            $('[data-rt-id="' + rId + '"]').closest('td').addClass('cp-app-poll-table-winner');
+            $('[data-rt-count-id="' + rId + '"]').addClass('cp-app-poll-table-winner');
+        });
+    };
+
     var updateDisplayedTable = function () {
         styleUncommittedColumn();
         unlockElements();
         updateTableButtons();
         setTablePublished(APP.proxy.published);
+        addCount();
 
         /*
         APP.proxy.table.rowsOrder.forEach(function (rowId) {
@@ -283,14 +389,6 @@ define([
             readOnly: readOnly
         };
 
-        //Render.updateTable(table, displayedObj, conf);
-
-        /*  FIXME browser autocomplete fills in new fields sometimes
-            calling updateTable twice removes the autofilled in values
-            setting autocomplete="off" is not reliable
-
-            https://developer.mozilla.org/en-US/docs/Web/Security/Securing_your_site/Turning_off_form_autocompletion
-        */
         common.notify();
 
         var getFocus = function () {
@@ -298,23 +396,36 @@ define([
             if (!active) { return; }
             return {
                 el: active,
+                id: $(active).attr('data-rt-id'),
                 start: active.selectionStart,
                 end: active.selectionEnd
             };
         };
         var setFocus = function (obj) {
-            if (obj.el) { obj.el.focus(); }
+            var el;
+            if (document.body.contains(obj.el)) { el = obj.el; }
+            else if($('input[data-rt-id="' + obj.id + '"]').length) {
+                el = $('input[data-rt-id="' + obj.id + '"]')[0];
+            }
             else { return; }
-            if (obj.start) { obj.el.selectionStart = obj.start; }
-            if (obj.end) { obj.el.selectionEnd = obj.end; }
+            el.focus();
+            if (obj.start) { el.selectionStart = obj.start; }
+            if (obj.end) { el.selectionEnd = obj.end; }
         };
 
         var updateTable = function () {
             var displayedObj2 = mergeUncommitted(APP.proxy, APP.uncommitted);
             var f = getFocus();
+            APP.$createRow.detach();
+            APP.$createCol.detach();
             Render.updateTable(table, displayedObj2, conf);
-            APP.proxy.content.rowsOrder.forEach(function (rowId) {
-                $('input[data-rt-id="' + rowId +'"]').val(APP.proxy.content.rows[rowId] || '');
+            // Fix autocomplete bug:
+            displayedObj2.content.rowsOrder.forEach(function (rowId) {
+                $('input[data-rt-id="' + rowId +'"]').val(displayedObj2.content.rows[rowId] || '');
+            });
+            displayedObj2.content.colsOrder.forEach(function (rowId) {
+                $('input[data-rt-id="' + rowId +'"]')
+                    .val(displayedObj2.content.cols[rowId] || '');
             });
             updateDisplayedTable();
             setFocus(f);
@@ -339,6 +450,10 @@ define([
         return input.getAttribute && input.getAttribute('data-rt-id');
     };
 
+    var handleBookmark = function (id) {
+        setUserId(id === APP.userid ? '' : id, change);
+    };
+
     /*  Called whenever an event is fired on an input element */
     var handleInput = function (input) {
         var type = input.type.toLowerCase();
@@ -349,9 +464,7 @@ define([
         var object = APP.proxy;
 
         var x = Render.getCoordinates(id)[0];
-        if (type !== "row" && x === APP.userid && APP.proxy.content.colsOrder.indexOf(x) === -1) {
-            object = APP.uncommitted;
-        }
+        if (isUncommitted(id)) { object = APP.uncommitted; }
 
         switch (type) {
             case 'text':
@@ -383,7 +496,6 @@ define([
 
     var hideInputs = function (id) {
         if (APP.readOnly) { return; }
-        console.log(id);
         if (id) {
             var type = Render.typeofId(id);
             console.log(type);
@@ -404,6 +516,8 @@ define([
             .indexOf('cp-app-poll-table-remove') !== -1;
         var isEdit = span.className && span.className.split(' ')
             .indexOf('cp-app-poll-table-edit') !== -1;
+        var isBookmark = span.className && span.className.split(' ')
+            .indexOf('cp-app-poll-table-bookmark') !== -1;
         var isLock = span.className && span.className.split(' ')
             .indexOf('cp-app-poll-table-lock') !== -1;
         var isLocked = span.className && span.className.split(' ').indexOf('fa-lock') !== -1;
@@ -431,6 +545,9 @@ define([
                         change();
                     });
                 });
+            } else if (isBookmark) {
+                //hideInputs(span);
+                handleBookmark(id);
             } else if (isLock && isLocked) {
                 //hideInputs(span);
                 unlockColumn(id, function () {
@@ -466,19 +583,30 @@ define([
         var nodeName = target && target.nodeName;
         //var shouldLock = $(target).hasClass('fa-unlock');
 
-        if ((!$(target).parents('#cp-app-poll-table tbody').length &&
+        /*if ((!$(target).parents('#cp-app-poll-table tbody').length &&
             $(target).hasClass('cp-app-poll-table-lock'))) {
             //hideInputs(e);
-        }
+        }*/
 
         switch (nodeName) {
             case 'INPUT':
                 if (isKeyup && (e.keyCode === 13 || e.keyCode === 27)) {
                     var id = target.getAttribute('data-rt-id');
+                    if ($(target).parents('.cp-app-poll-table-uncommitted').length
+                        && e.keyCode === 13) {
+                        var type = Render.typeofId(id);
+                        if (type === "row") { APP.$createRow.click(); }
+                        else if (type === "col") { APP.$createCol.click(); }
+                        break;
+                    }
                     hideInputs(id);
                     break;
                 }
-                if ($(target).is('input[type="number"]')) { console.error("number input focused?"); break; }
+                if ($(target).is('input[type="number"]')) {
+                    // Nothing to do...
+                    //console.error("number input focused?");
+                    break;
+                }
 
                 handleInput(target);
                 break;
@@ -505,27 +633,6 @@ define([
         }
     };
 
-    /*
-        Make sure that the realtime data structure has all the required fields
-    */
-    var prepareProxy = function (proxy, schema) {
-        if (proxy && proxy.version === 1) { return; }
-        debug("Configuring proxy schema...");
-
-        proxy.metadata = proxy.metadata || schema.metadata;
-        Object.keys(schema.metadata).forEach(function (k) {
-            if (!proxy.metadata[k]) { proxy.metadata[k] = schema.metadata[k]; }
-        });
-
-        proxy.content = proxy.content || schema.content;
-        Object.keys(schema.content).forEach(function (k) {
-            if (!proxy.content[k]) { proxy.content[k] = schema.content[k]; }
-        });
-
-        proxy.version = 1;
-        proxy.type = 'poll';
-    };
-
     /*
 
     */
@@ -551,10 +658,6 @@ define([
         $('#cp-app-poll-action-help').text(msg);
     };
 
-    var copyObject = function (obj) {
-        return JSON.parse(JSON.stringify(obj));
-    };
-
 
 
 
@@ -588,9 +691,9 @@ define([
         }
     };
 
-    var updateDescription = function (n) {
+    var updateDescription = function (old, n) {
         var o = APP.$description.val();
-        var op = TextPatcher.diff(o, n);
+        var op = TextPatcher.diff(o, n || '');
         var el = APP.$description[0];
 
         var selects = ['selectionStart', 'selectionEnd'].map(function (attr) {
@@ -604,10 +707,7 @@ define([
         common.notify();
     };
     var updateLocalDescription = function (n) {
-        var md = copyObject(metadataMgr.getMetadata());
-        md.description = n;
-        metadataMgr.updateMetadata(md);
-        APP.proxy.metadata.description = n;
+        APP.proxy.description = n;
     };
 
     var onReady = function (info, userid, readOnly) {
@@ -639,7 +739,7 @@ define([
                 throw new Error(errorText);
             }
         } else {
-            //Title.updateTitle(Title.defaultTitle);
+            Title.updateTitle(Title.defaultTitle);
         }
 
         if (typeof(proxy.type) === 'undefined') {
@@ -675,13 +775,13 @@ define([
         var $table = APP.$table = $(Render.asHTML(displayedObj, null, colsOrder, readOnly));
 
         var getUncommitted = function (type) {
-            var ret = {};
+            var ret = {}, toRemove;
             var uncommitted = APP.uncommitted.content;
             if (type === 'col') {
                 ret.colsOrder = uncommitted.colsOrder.slice();
                 ret.cols = copyObject(uncommitted.cols);
                 // get only the cells corresponding to the committed rows
-                var toRemove = Object.keys(uncommitted.cells).filter(function (coor) {
+                toRemove = Object.keys(uncommitted.cells).filter(function (coor) {
                     var c = Render.getCoordinates(coor);
                     return APP.proxy.content.rowsOrder.indexOf(c[1]) !== -1;
                 });
@@ -699,7 +799,7 @@ define([
             ret.rowsOrder = uncommitted.rowsOrder.slice();
             ret.rows = copyObject(uncommitted.rows);
             // get only the cells corresponding to the committed rows
-            var toRemove = Object.keys(uncommitted.cells).filter(function (coor) {
+            toRemove = Object.keys(uncommitted.cells).filter(function (coor) {
                 var c = Render.getCoordinates(coor);
                 return APP.proxy.content.colsOrder.indexOf(c[1]) !== -1;
             });
@@ -710,6 +810,7 @@ define([
             });
             uncommitted.rowsOrder = [Render.rowuid()];
             uncommitted.rows = {};
+            console.log(JSON.stringify(ret, 0, 2));
             return ret;
         };
         APP.$createCol = $('#cp-app-poll-create-user').click(function () {
@@ -722,23 +823,13 @@ define([
         });
         APP.$createRow = $('#cp-app-poll-create-option').click(function () {
             var uncommittedCopy = { content: getUncommitted('row') };
-            var id = uncommittedCopy.content.rowsOrder[0];
             mergeUncommitted(proxy, uncommittedCopy, true);
             change(null, null, null, null, function() {
-                handleSpan($('.cp-app-poll-table-edit[data-rt-id="' + id + '"]')[0]);
+                var newId = APP.uncommitted.content.rowsOrder[0];
+                $('input[data-rt-id="' + newId + '"]').focus();
             });
         });
 
-        // Commit button
-        APP.$commit = $('#commit').click(function () {
-            var uncommittedCopy = copyObject(APP.uncommitted);
-            APP.uncommitted = {};
-            prepareProxy(APP.uncommitted, copyObject(Render.Example));
-            mergeUncommitted(proxy, uncommittedCopy, true);
-            APP.$commit.hide();
-            change();
-        }).remove(); // TODO
-
         // #publish button is removed in readonly
         APP.$publish = $('#cp-app-poll-action-publish')
             .click(function () {
@@ -756,9 +847,7 @@ define([
             });
 
         if (!readOnly) {
-            common.setPadAttribute('userid', userid, function (e) {
-                if (e) { console.error(e); }
-            });
+            setUserId(userid);
         }
 
         // Description
@@ -775,6 +864,7 @@ define([
 
         $('#cp-app-poll-table-scroll').html('').prepend($table);
         updateDisplayedTable();
+        updateDescription(null, APP.proxy.description);
 
         $table
             .click(handleClick)
@@ -786,16 +876,19 @@ define([
         });
 
         proxy
-            .on('change', ['metadata'], function (o, n, p) {
+            .on('change', ['metadata'], function () {
                 metadataMgr.updateMetadata(proxy.metadata);
             })
             .on('change', ['content'], change)
+            .on('change', ['description'], updateDescription)
             .on('remove', [], change);
 
         // If the user's column is not committed, add his username
         var $userInput = $('.cp-app-poll-table-uncommitted > input[data-rt-id^='+ APP.userid +']');
         if ($userInput.val() === '') {
-            $userInput.val(metadataMgr.getUserData().name);
+            var uname = metadataMgr.getUserData().name;
+            APP.uncommitted.content.cols[APP.userid] = uname;
+            $userInput.val(uname);
         }
 
         APP.ready = true;
@@ -856,9 +949,6 @@ define([
 
         metadataMgr.onChange(function () {
             var md = copyObject(metadataMgr.getMetadata());
-            if (md.description) {
-                updateDescription(md.description);
-            }
             APP.proxy.metadata = md;
         });
         return; // TODO
diff --git a/www/poll/render.js b/www/poll/render.js
index e5712aab9..c9f6f7c1f 100644
--- a/www/poll/render.js
+++ b/www/poll/render.js
@@ -217,11 +217,11 @@ var Renderer = function (Cryptpad) {
                         'data-rt-id': col,
                         type: 'text',
                         value: getColumnValue(obj, col) || "",
-                        placeholder: Cryptpad.Messages.poll_userPlaceholder,
+                        placeholder: Cryptpad.Messages.anonymous,
                         disabled: 'disabled'
                     };
                     return result;
-                }));
+                })).concat([null]);
             }
             if (i === rows.length) {
                 return [null].concat(cols.map(function () {
@@ -254,7 +254,9 @@ var Renderer = function (Cryptpad) {
                     result.value = val;
                 }
                 return result;
-            }));
+            })).concat([{
+                'data-rt-count-id': row
+            }]);
         });
     };
 
@@ -282,13 +284,25 @@ var Renderer = function (Cryptpad) {
         }, []];
     };
 
+    var makeBookmarkElement = Render.makeBookmarkElement = function (id) {
+        return ['SPAN', {
+            'data-rt-id': id,
+            'title': 'TODO: Bookmark this column so that it is always unlocked and displayed at the beginning for you.',
+            'style': 'visibility: hidden;',
+            class: 'cp-app-poll-table-bookmark fa fa-bookmark-o',
+        }, []];
+    };
+
     var makeHeadingCell = Render.makeHeadingCell = function (cell, readOnly) {
         if (!cell) { return ['TD', {}, []]; }
         if (cell.type === 'text') {
             var elements = [['INPUT', cell, []]];
             if (!readOnly) {
-                elements.unshift(makeRemoveElement(cell['data-rt-id']));
-                elements.unshift(makeLockElement(cell['data-rt-id']));
+                var buttons = [];
+                buttons.unshift(makeRemoveElement(cell['data-rt-id']));
+                buttons.unshift(makeLockElement(cell['data-rt-id']));
+                buttons.unshift(makeBookmarkElement(cell['data-rt-id']));
+                elements.unshift(['DIV', {'class': 'cp-app-poll-table-buttons'}, buttons]);
             }
             return ['TD', {}, elements];
         }

From 33376896306ab5dbf9e60f8381291e40a90a7528 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 3 Oct 2017 14:04:07 +0200
Subject: [PATCH 04/20] Wrong translation key in toolbar

---
 www/common/toolbar3.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/common/toolbar3.js b/www/common/toolbar3.js
index 3218f40f4..75102b1ad 100644
--- a/www/common/toolbar3.js
+++ b/www/common/toolbar3.js
@@ -448,7 +448,7 @@ define([
                 var $content = $('<div>');
                 $('<input>', {'style':'display:none;'}).appendTo($content);
                 $('<h3>').text(Messages.viewEmbedTitle).appendTo($content);
-                var $tag = $('<p>').text(Messages.fileEmbedTag).appendTo($content);
+                var $tag = $('<p>').text(Messages.viewEmbedTag).appendTo($content);
                 $('<br>').appendTo($tag);
                 var iframeId = uid();
                 var iframeEmbed = '<iframe src="' + url + '"></iframe>';

From 5cf86bf74ab1f069888a29d7bf75ad9783856ae7 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 3 Oct 2017 14:11:11 +0200
Subject: [PATCH 05/20] Update UI in poll and remove old code

---
 customize.dist/pages.js                    |  19 +-
 customize.dist/translations/messages.fr.js |   4 +
 customize.dist/translations/messages.js    |   4 +
 www/common/sframe-common-outer.js          |   1 +
 www/poll/app-poll.less                     |  30 ++--
 www/poll/inner.js                          | 199 ++++++++-------------
 www/poll/main.js                           |   2 +-
 www/poll/render.js                         |   2 +-
 8 files changed, 100 insertions(+), 161 deletions(-)

diff --git a/customize.dist/pages.js b/customize.dist/pages.js
index 2427b2a28..5bf87b928 100644
--- a/customize.dist/pages.js
+++ b/customize.dist/pages.js
@@ -570,15 +570,12 @@ define([
     };
 
     var appToolbar = function () {
-        return h('div#toolbar.cryptpad-toolbar');
-    };
-    var appToolbar3 = function () {
         return h('div#cp-toolbar.cp-toolbar-container');
     };
 
     Pages['/whiteboard/'] = Pages['/whiteboard/index.html'] = function () {
         return [
-            appToolbar3(),
+            appToolbar(),
             h('div#cp-app-whiteboard-canvas-area', h('canvas#cp-app-whiteboard-canvas', {
                 width: 600,
                 height: 600
@@ -638,7 +635,7 @@ define([
 
     Pages['/poll/'] = Pages['/poll/index.html'] = function () {
         return [
-            appToolbar3(),
+            appToolbar(),
             h('div#cp-app-poll-content', [
                 h('div#cp-app-poll-form', [
                     h('div#cp-app-poll-help', [
@@ -647,18 +644,6 @@ define([
                         h('p', Msg.poll_p_save),
                         h('p', Msg.poll_p_encryption)
                     ]),
-                    h('div.cp-app-poll-upper', [
-                        h('button#cp-app-poll-action-publish.btn.btn-success', {
-                            style: { display: 'none' }
-                        }, Msg.poll_publish_button),
-                        h('button#cp-app-poll-action-admin.btn.btn-primary', {
-                            style: { display: 'none' },
-                            title: Msg.poll_admin_button
-                        }, Msg.poll_admin_button),
-                        h('button#cp-app-poll-action-help.btn.btn-secondary', {
-                            title: Msg.poll_show_help_button
-                        }, Msg.poll_show_help_button)
-                    ]),
                     h('div.cp-app-poll-realtime', [
                         h('br'),
                         h('center', [
diff --git a/customize.dist/translations/messages.fr.js b/customize.dist/translations/messages.fr.js
index 118eb6f7b..fb04d7bc0 100644
--- a/customize.dist/translations/messages.fr.js
+++ b/customize.dist/translations/messages.fr.js
@@ -256,6 +256,10 @@ define(function () {
     out.poll_show_help_button = "Afficher l'aide";
     out.poll_hide_help_button = "Cacher l'aide";
 
+    out.poll_bookmark_col = "Marquer cette colonne comme favorite pour qu'elle soit toujours déverouillée et affichée en première position.";
+    out.poll_bookmarked_col = "Voici votre colonne favorite; elle sera toujours dévérouillée et affichée en première position.";
+    out.poll_total = 'TOTAL';
+
     // Canvas
     out.canvas_clear = "Nettoyer";
     out.canvas_delete = "Supprimer la sélection";
diff --git a/customize.dist/translations/messages.js b/customize.dist/translations/messages.js
index fc7c204d9..755c52a53 100644
--- a/customize.dist/translations/messages.js
+++ b/customize.dist/translations/messages.js
@@ -258,6 +258,10 @@ define(function () {
     out.poll_show_help_button = "Show help";
     out.poll_hide_help_button = "Hide help";
 
+    out.poll_bookmark_col = 'Bookmark this column so that it is always unlocked and displayed at the beginning for you';
+    out.poll_bookmarked_col = 'This is your bookmarked column. It will always be unlocked and displayed at the beginning for you.';
+    out.poll_total = 'TOTAL';
+
     // Canvas
     out.canvas_clear = "Clear";
     out.canvas_delete = "Delete selection";
diff --git a/www/common/sframe-common-outer.js b/www/common/sframe-common-outer.js
index f50bc1de2..878b355f0 100644
--- a/www/common/sframe-common-outer.js
+++ b/www/common/sframe-common-outer.js
@@ -62,6 +62,7 @@ define([
                 Cryptpad.ready(waitFor());
             }));
         }).nThen(function (waitFor) {
+            $('#sbox-iframe').focus();
 
             sframeChan.on('EV_CACHE_PUT', function (x) {
                 Object.keys(x).forEach(function (k) {
diff --git a/www/poll/app-poll.less b/www/poll/app-poll.less
index 8960d1094..7714e5538 100644
--- a/www/poll/app-poll.less
+++ b/www/poll/app-poll.less
@@ -4,6 +4,7 @@
 @import (once) '../../customize/src/less2/include/fileupload.less';
 @import (once) '../../customize/src/less2/include/alertify.less';
 @import (once) '../../customize/src/less2/include/tokenfield.less';
+@import (once) '../../customize/src/less2/include/tools.less';
 
 .toolbar_main();
 .fileupload_main();
@@ -93,13 +94,6 @@ table#cp-app-poll-table {
     border-radius: 0;
     border: 0;
 }
-#cp-app-poll-publish {
-    display: none;
-}
-#cp-app-poll-action-publish, #cp-app-poll-action-admin {
-    margin-top: 15px;
-    margin-bottom: 15px;
-}
 #cp-app-poll-create-user {
     display: inline-flex;
     height: 24px;
@@ -128,29 +122,24 @@ table#cp-app-poll-table {
     min-width: 80%;
     width: 80%;
     min-height: 7em;
-    font-size: 20px;
-    font-weight: bold;
+    font: @colortheme_app-font;
+    //font-size: 20px;
+    /*font-weight: bold;*/
     border: 1px solid black;
 
 }
 #cp-app-poll-description[disabled] {
     resize: none;
     color: #000;
-    border: 1px solid #444;
+    border: 1px solid transparent;
+    background-color: #eeeeee;
+    font: @colortheme_app-font;
 }
 
 #cp-app-poll-help {
     width: 80%;
     margin: auto;
 }
-div.cp-app-poll-upper {
-    width: 80%;
-    margin: auto;
-
-    & > * {
-        margin-right: 1em;
-    }
-}
 
 // from cryptpad.less
 
@@ -169,6 +158,7 @@ tbody {
     }
 
     td {
+        .tools_unselectable();
         border-right: 1px solid @poll-border-color;
         padding: 12px;
         padding-top: 0px;
@@ -274,7 +264,7 @@ div.cp-app-poll-realtime {
                     margin: 0px;
                     padding: 0px;
                     height: 100%;
-                    min-width: 150px;
+                    min-width: 100px;
 
                     div.cp-app-poll-table-checkbox-contain {
                         display: inline-block;
@@ -387,6 +377,8 @@ div.cp-app-poll-realtime {
                 }
                 input {
                     &[type="text"] {
+                        overflow: hidden;
+                        text-overflow: ellipsis;
                         break-after: always;
                         width: ~"calc(100% - 2px)"; // borders...
                         box-sizing: border-box;
diff --git a/www/poll/inner.js b/www/poll/inner.js
index 57916294e..18eefacd4 100644
--- a/www/poll/inner.js
+++ b/www/poll/inner.js
@@ -2,7 +2,6 @@ define([
     'jquery',
     '/bower_components/textpatcher/TextPatcher.js',
     '/common/toolbar3.js',
-    'json.sortify',
     '/common/cryptpad-common.js',
     '/common/common-util.js',
     '/common/cryptget.js',
@@ -23,7 +22,6 @@ define([
     $,
     TextPatcher,
     Toolbar,
-    JSONSortify,
     Cryptpad,
     Util,
     Cryptget,
@@ -51,36 +49,16 @@ define([
 
     var debug = $.noop; //console.log;
 
-    var stringify = function (obj) {
-        return JSONSortify(obj);
-    };
-
-    var onConnectError = function () {
-        Cryptpad.errorLoadingScreen(Messages.websocketError);
-    };
-
     var HIDE_INTRODUCTION_TEXT = "hide-text";
 
     var metadataMgr;
     var Title;
-    var defaultName;
     var common;
-    var readOnly;
-
-
-
-
-
-
-
-
 
     var copyObject = function (obj) {
         return JSON.parse(JSON.stringify(obj));
     };
 
-
-
     /*
         Make sure that the realtime data structure has all the required fields
     */
@@ -102,8 +80,9 @@ define([
         proxy.type = 'poll';
     };
 
-
-
+    /*
+        Set the user id (user column) in the pad attributes
+    */
     var setUserId = function (id, cb) {
         cb  =cb || $.noop;
         APP.userid = id;
@@ -128,8 +107,11 @@ define([
     };
 
     var isUncommitted = function (id) {
-        return APP.uncommitted.content.colsOrder.indexOf(id) !== -1 ||
-               APP.uncommitted.content.rowsOrder.indexOf(id) !== -1;
+        var idArr = id.split('_');
+        var idx = idArr[0];
+        var idy = idArr[1] || idArr[0]; // if id is y-{...} (no 'x'), use idArr[0] as 'y' coordinate
+        return APP.uncommitted.content.colsOrder.indexOf(idx) !== -1 ||
+               APP.uncommitted.content.rowsOrder.indexOf(idy) !== -1;
     };
 
     var mergeUncommitted = function (proxy, uncommitted, commit) {
@@ -175,10 +157,9 @@ define([
         return newObj;
     };
 
-    var styleUncommittedColumn = function () {
+    var styleUserColumn = function () {
         var userid = APP.userid;
 
-        // TODO: move?
         // Enable input for the userid column
         $('input[disabled="disabled"][data-rt-id^="' + userid + '"]').removeAttr('disabled')
             .attr('placeholder', Messages.poll_userPlaceholder);
@@ -188,10 +169,9 @@ define([
             .addClass("cp-app-poll-table-own");
         $('.cp-app-poll-table-bookmark[data-rt-id="' + userid + '"]').css('visibility', '')
             .removeClass('fa-bookmark-o').addClass('fa-bookmark')
-            .attr('title', 'TODO: this is your bookmarked column. It will always be unlocked and displayed at the beginning for you');
-        //.addClass('fa-unlock').removeClass('fa-lock').attr('title', Messages.poll_unlocked);
-        //$('.cp-app-poll-table-remove[data-rt-id="' + userid + '"]').remove();
-
+            .attr('title', Messages.poll_bookmarked_col);
+    };
+    var styleUncommittedColumn = function () {
         var $scroll = $('#cp-app-poll-table-scroll');
         var hasScroll = $scroll.width() < $scroll[0].scrollWidth;
         APP.uncommitted.content.colsOrder.forEach(function(id) {
@@ -222,7 +202,6 @@ define([
             //$('.uncommitted input[type="text"]').attr("placeholder", Messages.poll_userPlaceholder);
         });
     };
-
     var unlockElements = function () {
         APP.unlocked.row.forEach(function (id) {
             var $input = $('input[type="text"][disabled="disabled"][data-rt-id="' + id + '"]').removeAttr('disabled');
@@ -238,7 +217,6 @@ define([
                 .removeClass('fa-lock').attr('title', Messages.poll_unlocked);
         });
     };
-
     var updateTableButtons = function () {
         var uncomColId = APP.uncommitted.content.colsOrder[0];
         var uncomRowId = APP.uncommitted.content.rowsOrder[0];
@@ -264,7 +242,6 @@ define([
             //$('#create-user').css('left', width + 30 + 'px');
         }
     };
-
     var setTablePublished = function (bool) {
         if (bool) {
             if (APP.$publish) { APP.$publish.hide(); }
@@ -276,7 +253,6 @@ define([
             $('#cp-app-poll-form').removeClass('cp-app-poll-published');
         }
     };
-
     var addCount = function () {
         var $scroll = $('#cp-app-poll-table-scroll');
         var hasScroll = $scroll.width() < $scroll[0].scrollWidth;
@@ -292,7 +268,7 @@ define([
                 'text-align': 'center',
                 'line-height': $thead.height()+'px'
             })
-            .text('TOTAL'); // TODO
+            .text(Messages.poll_total);
         var winner = {
             v: 0,
             ids: []
@@ -322,16 +298,12 @@ define([
     };
 
     var updateDisplayedTable = function () {
+        styleUserColumn();
         styleUncommittedColumn();
         unlockElements();
         updateTableButtons();
         setTablePublished(APP.proxy.published);
         addCount();
-
-        /*
-        APP.proxy.table.rowsOrder.forEach(function (rowId) {
-            $('[data-rt-id="' + rowId +'"]').val(APP.proxy.table.rows[rowId] || '');
-        });*/
     };
 
     var unlockColumn = function (id, cb) {
@@ -386,7 +358,7 @@ define([
         var colsOrder = sortColumns(displayedObj.content.colsOrder, APP.userid);
         var conf = {
             cols: colsOrder,
-            readOnly: readOnly
+            readOnly: APP.readOnly
         };
 
         common.notify();
@@ -530,7 +502,6 @@ define([
                     });
                 });
             } else if (isEdit) {
-                //hideInputs(span);
                 unlockRow(id, function () {
                     change(null, null, null, null, function() {
                         $('input[data-rt-id="' + id + '"]').focus();
@@ -546,10 +517,8 @@ define([
                     });
                 });
             } else if (isBookmark) {
-                //hideInputs(span);
                 handleBookmark(id);
             } else if (isLock && isLocked) {
-                //hideInputs(span);
                 unlockColumn(id, function () {
                     change(null, null, null, null, function() {
                         $('input[data-rt-id="' + id + '"]').focus();
@@ -581,12 +550,6 @@ define([
         if (!target) { return void debug("NO TARGET"); }
 
         var nodeName = target && target.nodeName;
-        //var shouldLock = $(target).hasClass('fa-unlock');
-
-        /*if ((!$(target).parents('#cp-app-poll-table tbody').length &&
-            $(target).hasClass('cp-app-poll-table-lock'))) {
-            //hideInputs(e);
-        }*/
 
         switch (nodeName) {
             case 'INPUT':
@@ -619,9 +582,6 @@ define([
                 handleInput(input[0]);
                 break;
             case 'SPAN':
-                /*if (shouldLock) {
-                    break;
-                }*/
                 handleSpan(target);
                 break;
             case undefined:
@@ -636,17 +596,45 @@ define([
     /*
 
     */
+    var updatePublishButton = function () {
+        if (!APP.ready || !APP.proxy || !APP.$publishButton) { return; }
+        var p = APP.proxy.published;
+        var msg = (p ? Messages.poll_admin_button : Messages.poll_publish_button);
+        APP.$publishButton.attr('title', msg);
+        if (p) {
+            APP.$publishButton.removeClass('fa-check').addClass('fa-pencil');
+            return;
+        }
+        APP.$publishButton.addClass('fa-check').removeClass('fa-pencil');
+    };
     var publish = APP.publish = function (bool) {
-        if (!APP.ready) { return; }
-        if (APP.proxy.published !== bool) {
-            APP.proxy.published = bool;
+        if (!APP.readOnly) {
+            if (!APP.ready) { return; }
+            if (APP.proxy.published !== bool) {
+                APP.proxy.published = bool;
+            }
+        } else {
+            // If readOnly, always put the app in published mode
+            bool = true;
         }
         setTablePublished(bool);
         ['textarea'].forEach(function (sel) {
             $(sel).attr('disabled', bool);
         });
+        updatePublishButton();
     };
 
+    var updateHelpButton = function () {
+        if (!APP.$helpButton) { return; }
+        var help = $('#cp-app-poll-help').is(':visible');
+        var msg = (help ? Messages.poll_hide_help_button : Messages.poll_show_help_button);
+        APP.$helpButton.attr('title', msg);
+        if (help) {
+            APP.$helpButton.addClass('cp-toolbar-button-active');
+            return;
+        }
+        APP.$helpButton.removeClass('cp-toolbar-button-active');
+    };
     var showHelp = function(help) {
         if (typeof help === 'undefined') {
             help = !$('#cp-app-poll-help').is(':visible');
@@ -656,22 +644,9 @@ define([
 
         $('#cp-app-poll-help').toggle(help);
         $('#cp-app-poll-action-help').text(msg);
+        updateHelpButton();
     };
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
     var setEditable = function (editable) {
         APP.readOnly = !editable;
 
@@ -710,7 +685,7 @@ define([
         APP.proxy.description = n;
     };
 
-    var onReady = function (info, userid, readOnly) {
+    var onReady = function (info, userid) {
         var proxy = APP.proxy;
 
         var isNew = false;
@@ -750,7 +725,7 @@ define([
         var uncommitted = APP.uncommitted = {};
         prepareProxy(proxy, copyObject(Render.Example));
         prepareProxy(uncommitted, copyObject(Render.Example));
-        if (!readOnly) {
+        if (!APP.readOnly) {
             var coluid = Render.coluid();
             if (proxy.content.colsOrder.indexOf(userid) === -1 &&
                 uncommitted.content.colsOrder.indexOf(userid) === -1) {
@@ -772,7 +747,7 @@ define([
 
         var colsOrder = sortColumns(displayedObj.content.colsOrder, userid);
 
-        var $table = APP.$table = $(Render.asHTML(displayedObj, null, colsOrder, readOnly));
+        var $table = APP.$table = $(Render.asHTML(displayedObj, null, colsOrder, APP.readOnly));
 
         var getUncommitted = function (type) {
             var ret = {}, toRemove;
@@ -830,23 +805,7 @@ define([
             });
         });
 
-        // #publish button is removed in readonly
-        APP.$publish = $('#cp-app-poll-action-publish')
-            .click(function () {
-                publish(true);
-            });
-
-        APP.$admin = $('#cp-app-poll-action-admin')
-            .click(function () {
-                publish(false);
-            });
-
-        APP.$help = $('#cp-app-poll-action-help')
-            .click(function () {
-                showHelp();
-            });
-
-        if (!readOnly) {
+        if (!APP.readOnly) {
             setUserId(userid);
         }
 
@@ -899,19 +858,18 @@ define([
         }
 
         Cryptpad.removeLoadingScreen();
+        if (isNew) {
+            common.openTemplatePicker();
+        }
     };
 
     var onDisconnect = function () {
         setEditable(false);
-        // TODO toolar.failed?
-        APP.toolbar.failed();
         Cryptpad.alert(Messages.common_connectionLost, undefined, true);
     };
 
-    var onReconnect = function (info) {
+    var onReconnect = function () {
         setEditable(true);
-        // TODO: reconnecting??
-        APP.toolbar.reconnecting(info.myId);
         Cryptpad.findOKButton().click();
     };
 
@@ -934,14 +892,14 @@ define([
             displayed: ['title', 'useradmin', 'spinner', 'share', 'userlist', 'newpad', 'limit'],
             title: Title.getTitleConfig(),
             metadataMgr: metadataMgr,
-            readOnly: readOnly,
+            readOnly: APP.readOnly,
             realtime: info.realtime,
             common: Cryptpad,
             sfCommon: common,
             $container: APP.$bar,
             $contentContainer: APP.$content
         };
-        var toolbar = APP.toolbar = Toolbar.create(configTb);
+        APP.toolbar = Toolbar.create(configTb);
 
         Title.setToolbar(APP.toolbar);
 
@@ -951,32 +909,35 @@ define([
             var md = copyObject(metadataMgr.getMetadata());
             APP.proxy.metadata = md;
         });
-        return; // TODO
-
-
-
 
         /* add a forget button */
         var forgetCb = function (err) {
             if (err) { return; }
             setEditable(false);
         };
-        var $forgetPad = Cryptpad.createButton('forget', true, {}, forgetCb);
+        var $forgetPad = common.createButton('forget', true, {}, forgetCb);
         $rightside.append($forgetPad);
 
-        // set the hash
-        if (!readOnly) { Cryptpad.replaceHash(editHash); }
-
         /* save as template */
-        if (!Cryptpad.isTemplate(window.location.href)) {
+        if (!metadataMgr.getPrivateData().isTemplate) {
             var templateObj = {
                 rt: info.realtime,
-                Crypt: Cryptget,
-                getTitle: function () { return document.title; }
+                getTitle: function () { return metadataMgr.getMetadata().title; }
             };
-            var $templateButton = Cryptpad.createButton('template', true, templateObj);
+            var $templateButton = common.createButton('template', true, templateObj);
             $rightside.append($templateButton);
         }
+
+        var $help = common.createButton().click(function () { showHelp(); }).appendTo($rightside);
+        APP.$helpButton = $help;
+        updateHelpButton();
+
+        if (APP.readOnly) { publish(true); return; }
+        var $publish = common.createButton()
+            .removeClass('fa-question').addClass('fa-check')
+            .click(function () { publish(!APP.proxy.published); }).appendTo($rightside);
+        APP.$publishButton = $publish;
+        updatePublishButton();
     };
 
 
@@ -998,7 +959,7 @@ define([
             }
             metadataMgr.onChange(function () {
                 if (typeof(metadataMgr.getPrivateData().readOnly) === 'boolean') {
-                    readOnly = metadataMgr.getPrivateData().readOnly;
+                    APP.readOnly = metadataMgr.getPrivateData().readOnly;
                     privReady();
                 }
             });
@@ -1018,11 +979,10 @@ define([
                 logLevel: 1
             };
 
-            if (readOnly) {
-                $('#cp-app-poll-create-user, #cp-app-poll-create-option, #cp-app-poll-action-publish, #cp-app-poll-action-admin').remove();
+            if (APP.readOnly) {
+                $('#cp-app-poll-create-user, #cp-app-poll-create-option').remove();
             }
 
-            var metadataMgr;
             var rt = APP.rt = Listmap.create(listmapConfig);
             APP.proxy = rt.proxy;
 
@@ -1032,7 +992,7 @@ define([
                         if (e) { console.error(e); }
                         if (!userid) { userid = Render.coluid(); }
                         APP.userid = userid;
-                        onReady(info, userid, readOnly);
+                        onReady(info, userid);
                     });
                  })
                  .on('disconnect', onDisconnect)
@@ -1049,13 +1009,6 @@ define([
                     showHelp(false);
                 }
             });
-
-            /*Cryptpad.onError(function (info) {
-                if (info && info.type === "store") {
-                    onConnectError();
-                }
-            });*/
-            //Cryptpad.onLogout(function () { setEditable(false); });
         });
     };
     main();
diff --git a/www/poll/main.js b/www/poll/main.js
index 66493ef48..04c9b8f2f 100644
--- a/www/poll/main.js
+++ b/www/poll/main.js
@@ -5,7 +5,7 @@ define([
     'jquery',
     '/common/requireconfig.js',
     '/common/sframe-common-outer.js',
-], function (nThen, ApiConfig, $, RequireConfig, SFCommonO, Cryptpad, Netflux) {
+], function (nThen, ApiConfig, $, RequireConfig, SFCommonO) {
     var requireConfig = RequireConfig();
 
     // Loaded in load #2
diff --git a/www/poll/render.js b/www/poll/render.js
index c9f6f7c1f..cbf6bf2ca 100644
--- a/www/poll/render.js
+++ b/www/poll/render.js
@@ -287,7 +287,7 @@ var Renderer = function (Cryptpad) {
     var makeBookmarkElement = Render.makeBookmarkElement = function (id) {
         return ['SPAN', {
             'data-rt-id': id,
-            'title': 'TODO: Bookmark this column so that it is always unlocked and displayed at the beginning for you.',
+            'title': Cryptpad.Messages.poll_bookmark_col,
             'style': 'visibility: hidden;',
             class: 'cp-app-poll-table-bookmark fa fa-bookmark-o',
         }, []];

From 707d3b3e94269f831806364bc644dc89f187061f Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 3 Oct 2017 16:50:59 +0200
Subject: [PATCH 06/20] Ability to export polls as csv

---
 www/poll/app-poll.less | 11 ++++---
 www/poll/inner.js      | 67 ++++++++++++++++++++++++++++++++++++++++--
 www/poll/render.js     |  2 +-
 3 files changed, 72 insertions(+), 8 deletions(-)

diff --git a/www/poll/app-poll.less b/www/poll/app-poll.less
index 7714e5538..f310acf9f 100644
--- a/www/poll/app-poll.less
+++ b/www/poll/app-poll.less
@@ -341,10 +341,7 @@ div.cp-app-poll-realtime {
             }
         }
         span {
-            user-select: none;
-            -moz-user-select: none;
-            -webkit-user-select: none;
-            -ms-user-select: none;
+            .tools_unselectable();
         }
         thead {
             td {
@@ -374,6 +371,12 @@ div.cp-app-poll-realtime {
                         width: 1em;
                         text-align: center;
                     }
+                    .cp-app-poll-table-bookmark {
+                        color: darken(@poll-th-fg, 30%);
+                        &.cp-app-poll-table-bookmark-full {
+                            color: @poll-th-fg;
+                        }
+                    }
                 }
                 input {
                     &[type="text"] {
diff --git a/www/poll/inner.js b/www/poll/inner.js
index 18eefacd4..d8610ae9e 100644
--- a/www/poll/inner.js
+++ b/www/poll/inner.js
@@ -34,6 +34,7 @@ define([
     Renderer)
 {
     var Messages = Cryptpad.Messages;
+    var saveAs = window.saveAs;
 
     var Render = Renderer(Cryptpad);
     var APP = window.APP = {
@@ -59,6 +60,59 @@ define([
         return JSON.parse(JSON.stringify(obj));
     };
 
+    var getCSV = APP.getCSV = function () {
+        if (!APP.proxy) { return; }
+        var data = copyObject(APP.proxy.content);
+        var res = '';
+
+        var escapeStr = function (str) {
+            return '"' + str.replace(/"/g, '""') + '"';
+        };
+
+        [null].concat(data.rowsOrder).forEach(function (rowId, i) {
+            [null].concat(data.colsOrder).forEach(function (colId, j) {
+                // thead
+                if (i === 0) {
+                    if (j === 0) { res += ','; return; }
+                    if (!colId) { throw new Error("Invalid data"); }
+                    res += escapeStr(data.cols[colId] || Messages.anonymous) + ',';
+                    return;
+                }
+                // tbody
+                if (!rowId) { throw new Error("Invalid data"); }
+                if (j === 0) {
+                    res += escapeStr(data.rows[rowId] || Messages.poll_optionPlaceholder) + ',';
+                    return;
+                }
+                if (!colId) { throw new Error("Invalid data"); }
+                res += (data.cells[colId + '_' + rowId] || 3) + ',';
+            });
+            // last column: total
+            // thead
+            if (i === 0) {
+                res += escapeStr(Messages.poll_total) + '\n';
+                return;
+            }
+            // tbody
+            if (!rowId) { throw new Error("Invalid data"); }
+            res += APP.count[rowId] || '?';
+            res += '\n';
+        });
+
+        return res;
+    };
+    var exportFile = function () {
+        var csv = getCSV();
+        var suggestion = Title.suggestTitle(Title.defaultTitle);
+        Cryptpad.prompt(Messages.exportPrompt,
+            Cryptpad.fixFileName(suggestion) + '.csv', function (filename) {
+            if (!(typeof(filename) === 'string' && filename)) { return; }
+            var blob = new Blob([csv], {type: "application/csv;charset=utf-8"});
+            saveAs(blob, filename);
+        });
+    };
+
+
     /*
         Make sure that the realtime data structure has all the required fields
     */
@@ -168,7 +222,7 @@ define([
         $('[data-rt-id^="' + userid + '"]').closest('td')
             .addClass("cp-app-poll-table-own");
         $('.cp-app-poll-table-bookmark[data-rt-id="' + userid + '"]').css('visibility', '')
-            .removeClass('fa-bookmark-o').addClass('fa-bookmark')
+            .addClass('cp-app-poll-table-bookmark-full')
             .attr('title', Messages.poll_bookmarked_col);
     };
     var styleUncommittedColumn = function () {
@@ -273,6 +327,7 @@ define([
             v: 0,
             ids: []
         };
+        APP.count = {};
         APP.proxy.content.rowsOrder.forEach(function (rId) {
             var count = Object.keys(APP.proxy.content.cells)
                 .filter(function (k) {
@@ -284,6 +339,7 @@ define([
             } else if (count && count === winner.v) {
                 winner.ids.push(rId);
             }
+            APP.count[rId] = count;
             APP.$table.find('[data-rt-count-id="' + rId + '"]')
                 .text(count)
                 .css({
@@ -928,12 +984,17 @@ define([
             $rightside.append($templateButton);
         }
 
-        var $help = common.createButton().click(function () { showHelp(); }).appendTo($rightside);
+        /* add an export button */
+        var $export = common.createButton('export', true, {}, exportFile);
+        $rightside.append($export);
+
+        var $help = common.createButton('', true).click(function () { showHelp(); })
+            .appendTo($rightside);
         APP.$helpButton = $help;
         updateHelpButton();
 
         if (APP.readOnly) { publish(true); return; }
-        var $publish = common.createButton()
+        var $publish = common.createButton('', true)
             .removeClass('fa-question').addClass('fa-check')
             .click(function () { publish(!APP.proxy.published); }).appendTo($rightside);
         APP.$publishButton = $publish;
diff --git a/www/poll/render.js b/www/poll/render.js
index cbf6bf2ca..5428535ac 100644
--- a/www/poll/render.js
+++ b/www/poll/render.js
@@ -289,7 +289,7 @@ var Renderer = function (Cryptpad) {
             'data-rt-id': id,
             'title': Cryptpad.Messages.poll_bookmark_col,
             'style': 'visibility: hidden;',
-            class: 'cp-app-poll-table-bookmark fa fa-bookmark-o',
+            class: 'cp-app-poll-table-bookmark fa fa-thumb-tack',
         }, []];
     };
 

From 68bda922911c303a497b8ec6c04cb1f1b4859474 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 3 Oct 2017 19:04:29 +0200
Subject: [PATCH 07/20] Use codemirror for description in poll

---
 customize.dist/pages.js                |   3 +-
 www/common/metadata-manager.js         |   1 -
 www/common/sframe-common-codemirror.js | 102 +++++++++++++------------
 www/common/sframe-common-title.js      |   1 -
 www/poll/app-poll.less                 |  39 +++++++---
 www/poll/inner.js                      |  62 ++++++++-------
 6 files changed, 120 insertions(+), 88 deletions(-)

diff --git a/customize.dist/pages.js b/customize.dist/pages.js
index 5bf87b928..b944e2624 100644
--- a/customize.dist/pages.js
+++ b/customize.dist/pages.js
@@ -646,12 +646,13 @@ define([
                     ]),
                     h('div.cp-app-poll-realtime', [
                         h('br'),
-                        h('center', [
+                        h('div', [
                             h('textarea#cp-app-poll-description', {
                                 rows: "5",
                                 cols: "50",
                                 disabled: true
                             }),
+                            h('div#cp-app-poll-description-published'),
                             h('br')
                         ]),
                         h('div#cp-app-poll-table-container', [
diff --git a/www/common/metadata-manager.js b/www/common/metadata-manager.js
index e319c3ecb..1c8994d00 100644
--- a/www/common/metadata-manager.js
+++ b/www/common/metadata-manager.js
@@ -68,7 +68,6 @@ define(['json.sortify'], function (Sortify) {
         };
         var change = function (lazy) {
             dirty = true;
-            console.error('METADATA CHANGE CALLED');
             setTimeout(function () {
                 checkUpdate(lazy);
             });
diff --git a/www/common/sframe-common-codemirror.js b/www/common/sframe-common-codemirror.js
index 6686a9a55..098972161 100644
--- a/www/common/sframe-common-codemirror.js
+++ b/www/common/sframe-common-codemirror.js
@@ -9,6 +9,58 @@ define([
     var saveAs = window.saveAs;
     var module = {};
 
+    var cursorToPos = function(cursor, oldText) {
+        var cLine = cursor.line;
+        var cCh = cursor.ch;
+        var pos = 0;
+        var textLines = oldText.split("\n");
+        for (var line = 0; line <= cLine; line++) {
+            if(line < cLine) {
+                pos += textLines[line].length+1;
+            }
+            else if(line === cLine) {
+                pos += cCh;
+            }
+        }
+        return pos;
+    };
+
+    var posToCursor = function(position, newText) {
+        var cursor = {
+            line: 0,
+            ch: 0
+        };
+        var textLines = newText.substr(0, position).split("\n");
+        cursor.line = textLines.length - 1;
+        cursor.ch = textLines[cursor.line].length;
+        return cursor;
+    };
+
+    module.setValueAndCursor = function (editor, oldDoc, remoteDoc, TextPatcher) {
+        var scroll = editor.getScrollInfo();
+        //get old cursor here
+        var oldCursor = {};
+        oldCursor.selectionStart = cursorToPos(editor.getCursor('from'), oldDoc);
+        oldCursor.selectionEnd = cursorToPos(editor.getCursor('to'), oldDoc);
+
+        editor.setValue(remoteDoc);
+        editor.save();
+
+        var op = TextPatcher.diff(oldDoc, remoteDoc);
+        var selects = ['selectionStart', 'selectionEnd'].map(function (attr) {
+            return TextPatcher.transformCursor(oldCursor[attr], op);
+        });
+
+        if(selects[0] === selects[1]) {
+            editor.setCursor(posToCursor(selects[0], remoteDoc));
+        }
+        else {
+            editor.setSelection(posToCursor(selects[0], remoteDoc), posToCursor(selects[1], remoteDoc));
+        }
+
+        editor.scrollTo(scroll.left, scroll.top);
+    };
+
     module.create = function (Common, defaultMode, CMeditor) {
         var exp = {};
         var Messages = Cryptpad.Messages;
@@ -253,56 +305,8 @@ define([
             onLocal();
         };
 
-        var cursorToPos = function(cursor, oldText) {
-            var cLine = cursor.line;
-            var cCh = cursor.ch;
-            var pos = 0;
-            var textLines = oldText.split("\n");
-            for (var line = 0; line <= cLine; line++) {
-                if(line < cLine) {
-                    pos += textLines[line].length+1;
-                }
-                else if(line === cLine) {
-                    pos += cCh;
-                }
-            }
-            return pos;
-        };
-
-        var posToCursor = function(position, newText) {
-            var cursor = {
-                line: 0,
-                ch: 0
-            };
-            var textLines = newText.substr(0, position).split("\n");
-            cursor.line = textLines.length - 1;
-            cursor.ch = textLines[cursor.line].length;
-            return cursor;
-        };
-
         exp.setValueAndCursor = function (oldDoc, remoteDoc, TextPatcher) {
-            var scroll = editor.getScrollInfo();
-            //get old cursor here
-            var oldCursor = {};
-            oldCursor.selectionStart = cursorToPos(editor.getCursor('from'), oldDoc);
-            oldCursor.selectionEnd = cursorToPos(editor.getCursor('to'), oldDoc);
-
-            editor.setValue(remoteDoc);
-            editor.save();
-
-            var op = TextPatcher.diff(oldDoc, remoteDoc);
-            var selects = ['selectionStart', 'selectionEnd'].map(function (attr) {
-                return TextPatcher.transformCursor(oldCursor[attr], op);
-            });
-
-            if(selects[0] === selects[1]) {
-                editor.setCursor(posToCursor(selects[0], remoteDoc));
-            }
-            else {
-                editor.setSelection(posToCursor(selects[0], remoteDoc), posToCursor(selects[1], remoteDoc));
-            }
-
-            editor.scrollTo(scroll.left, scroll.top);
+            return module.setValueAndCursor(editor, oldDoc, remoteDoc, TextPatcher);
         };
 
         return exp;
diff --git a/www/common/sframe-common-title.js b/www/common/sframe-common-title.js
index b716c090e..6e0712011 100644
--- a/www/common/sframe-common-title.js
+++ b/www/common/sframe-common-title.js
@@ -41,7 +41,6 @@ define(['jquery'], function ($) {
         };
 
         metadataMgr.onChange(function () {
-            console.error('METADATA CHANGE');
             var md = metadataMgr.getMetadata();
             if ($title) {
                 $title.find('span.cp-toolbar-title-value').text(md.title || md.defaultTitle);
diff --git a/www/poll/app-poll.less b/www/poll/app-poll.less
index f310acf9f..4c2ecadae 100644
--- a/www/poll/app-poll.less
+++ b/www/poll/app-poll.less
@@ -21,6 +21,8 @@
 @poll-td-bg: @poll-th-bg;
 @poll-td-fg: @poll-th-fg;
 
+@poll-help-bg: #bbffbb; // lightgreen
+
 @poll-uncommitted-cell: #eee;
 @poll-uncommitted-bg: #ddd; //lighten(@poll-th-bg, 50%);
 @poll-uncommitted-text: black;
@@ -116,29 +118,48 @@ table#cp-app-poll-table {
     display: inline-block;
 }
 #cp-app-poll-description {
+    &~ .CodeMirror {
+        margin: auto;
+        min-width: 80%;
+        width: 80%;
+        min-height: 200px;
+        border: 1px solid black;
+    }
+}
+#cp-app-poll-description-published {
+    display: none;
     padding: 15px;
     margin: auto;
 
     min-width: 80%;
     width: 80%;
     min-height: 7em;
-    font: @colortheme_app-font;
-    //font-size: 20px;
-    /*font-weight: bold;*/
-    border: 1px solid black;
-
-}
-#cp-app-poll-description[disabled] {
-    resize: none;
     color: #000;
     border: 1px solid transparent;
     background-color: #eeeeee;
     font: @colortheme_app-font;
+    text-align: left;
+}
+.cp-app-poll-published {
+    #cp-app-poll-description {
+        display: none;
+        &~ .CodeMirror {
+            display: none;
+        }
+    }
+    #cp-app-poll-description-published {
+        display: block;
+        &:empty {
+            display: none;
+        }
+    }
 }
 
 #cp-app-poll-help {
-    width: 80%;
+    width: 100%;
     margin: auto;
+    padding: 20px 10%;
+    background: @poll-help-bg;
 }
 
 // from cryptpad.less
diff --git a/www/poll/inner.js b/www/poll/inner.js
index d8610ae9e..23b565ac9 100644
--- a/www/poll/inner.js
+++ b/www/poll/inner.js
@@ -12,6 +12,12 @@ define([
     '/common/sframe-chainpad-listmap.js',
     '/customize/pages.js',
     '/poll/render.js',
+    '/common/diffMarked.js',
+    '/common/sframe-common-codemirror.js',
+
+    'cm/lib/codemirror',
+    'cm/mode/markdown/markdown',
+    'css!cm/lib/codemirror.css',
 
     '/bower_components/file-saver/FileSaver.min.js',
 
@@ -31,7 +37,10 @@ define([
     AppConfig,
     Listmap,
     Pages,
-    Renderer)
+    Renderer,
+    DiffMd,
+    SframeCM,
+    CMeditor)
 {
     var Messages = Cryptpad.Messages;
     var saveAs = window.saveAs;
@@ -138,7 +147,7 @@ define([
         Set the user id (user column) in the pad attributes
     */
     var setUserId = function (id, cb) {
-        cb  =cb || $.noop;
+        cb = cb || $.noop;
         APP.userid = id;
         common.setPadAttribute('userid', id, function (e) {
             if (e) {
@@ -213,6 +222,7 @@ define([
 
     var styleUserColumn = function () {
         var userid = APP.userid;
+        if (!userid) { return; }
 
         // Enable input for the userid column
         $('input[disabled="disabled"][data-rt-id^="' + userid + '"]').removeAttr('disabled')
@@ -538,6 +548,7 @@ define([
 
     /*  Called whenever an event is fired on a span */
     var handleSpan = function (span) {
+        if (!span) { return; }
         var id = span.getAttribute('data-rt-id');
         var type = Render.typeofId(id);
         var isRemove = span.className && span.className.split(' ')
@@ -570,6 +581,7 @@ define([
                     if (!res) { return; }
                     Render.removeColumn(APP.proxy, id, function () {
                         change();
+                        if (id === APP.userid) { setUserId(''); }
                     });
                 });
             } else if (isBookmark) {
@@ -674,9 +686,9 @@ define([
             bool = true;
         }
         setTablePublished(bool);
-        ['textarea'].forEach(function (sel) {
+        /*['textarea'].forEach(function (sel) {
             $(sel).attr('disabled', bool);
-        });
+        });*/
         updatePublishButton();
     };
 
@@ -722,23 +734,19 @@ define([
         }
     };
 
+    var updatePublishedDescription = function () {
+        var v = APP.editor.getValue();
+        DiffMd.apply(DiffMd.render(v || Messages.poll_descriptionHint), APP.$descriptionPublished);
+    };
     var updateDescription = function (old, n) {
         var o = APP.$description.val();
-        var op = TextPatcher.diff(o, n || '');
-        var el = APP.$description[0];
-
-        var selects = ['selectionStart', 'selectionEnd'].map(function (attr) {
-            return TextPatcher.transformCursor(el[attr], op);
-        });
-        APP.$description.val(n);
-        if (op) {
-            el.selectionStart = selects[0];
-            el.selectionEnd = selects[1];
-        }
+        SframeCM.setValueAndCursor(APP.editor, o, n, TextPatcher);
+        updatePublishedDescription();
         common.notify();
     };
     var updateLocalDescription = function (n) {
         APP.proxy.description = n;
+        updatePublishedDescription();
     };
 
     var onReady = function (info, userid) {
@@ -847,6 +855,7 @@ define([
         APP.$createCol = $('#cp-app-poll-create-user').click(function () {
             var uncommittedCopy = { content: getUncommitted('col') };
             var id = uncommittedCopy.content.colsOrder[0];
+            if (!APP.userid) { setUserId(id); }
             mergeUncommitted(proxy, uncommittedCopy, true);
             change(null, null, null, null, function() {
                 handleSpan($('.cp-app-poll-table-lock[data-rt-id="' + id + '"]')[0]);
@@ -861,21 +870,11 @@ define([
             });
         });
 
-        if (!APP.readOnly) {
-            setUserId(userid);
-        }
-
         // Description
-        var resize = function () {
-            var lineCount = APP.$description.val().split('\n').length;
-            APP.$description.css('height', lineCount + 'rem');
-        };
-        APP.$description.on('change keyup', function () {
-            var val = APP.$description.val();
+        APP.editor.on('change', function () {
+            var val = APP.editor.getValue();
             updateLocalDescription(val);
-            resize();
         });
-        resize();
 
         $('#cp-app-poll-table-scroll').html('').prepend($table);
         updateDisplayedTable();
@@ -1031,9 +1030,18 @@ define([
             APP.$body = $('body');
             APP.$bar = $('#cp-toolbar');
             APP.$content = $('#cp-app-poll-content');
+            APP.$descriptionPublished = $('#cp-app-poll-description-published');
             APP.$description = $('#cp-app-poll-description')
                 .attr('placeholder', Messages.poll_descriptionHint || 'description');
 
+            APP.editor = CMeditor.fromTextArea(APP.$description[0], {
+                lineNumbers: true,
+                lineWrapping: true,
+                styleActiveLine : true,
+                mode: "markdown",
+            });
+
+
             var listmapConfig = {
                 data: {},
                 common: common,

From 846b1a9fb33f6df139bd2dee2def842fda4073d8 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 4 Oct 2017 15:39:18 +0200
Subject: [PATCH 08/20] Improve description UI in poll. Enable tags and
 mediatag

---
 customize.dist/pages.js                    |  1 +
 customize.dist/translations/messages.fr.js |  4 +-
 customize.dist/translations/messages.js    |  4 +-
 www/poll/app-poll.less                     |  7 +++
 www/poll/inner.js                          | 53 ++++++++++++++++++++--
 5 files changed, 62 insertions(+), 7 deletions(-)

diff --git a/customize.dist/pages.js b/customize.dist/pages.js
index b944e2624..9e249b6db 100644
--- a/customize.dist/pages.js
+++ b/customize.dist/pages.js
@@ -650,6 +650,7 @@ define([
                             h('textarea#cp-app-poll-description', {
                                 rows: "5",
                                 cols: "50",
+                                placeholder: Msg.poll_descriptionHint,
                                 disabled: true
                             }),
                             h('div#cp-app-poll-description-published'),
diff --git a/customize.dist/translations/messages.fr.js b/customize.dist/translations/messages.fr.js
index fb04d7bc0..0c2756d49 100644
--- a/customize.dist/translations/messages.fr.js
+++ b/customize.dist/translations/messages.fr.js
@@ -246,7 +246,9 @@ define(function () {
     out.poll_removeUser = "Êtes-vous sûr de vouloir supprimer cet utilisateur ?";
 
     out.poll_titleHint = "Titre";
-    out.poll_descriptionHint = "Description";
+    out.poll_descriptionHint = "Décrivez votre sondage puis cliquer sur le bouton ✓ (Publier).\n" +
+                               "La description peut contenir de la syntaxe markdown, et vous pouvez y ajouter des images stockées dans votre CryptDrive.\n" +
+                               "Toutes les personnes possédant le lien d'édition de ce sondage peuvent modifier la description, bien que ce soit déconseillé.";
 
     out.poll_remove = "Supprimer";
     out.poll_edit = "Modifier";
diff --git a/customize.dist/translations/messages.js b/customize.dist/translations/messages.js
index 755c52a53..29c969628 100644
--- a/customize.dist/translations/messages.js
+++ b/customize.dist/translations/messages.js
@@ -248,7 +248,9 @@ define(function () {
     out.poll_removeUser = "Are you sure you'd like to remove this user?";
 
     out.poll_titleHint = "Title";
-    out.poll_descriptionHint = "Describe your poll, and use the 'publish' button when you're done. Anyone with the link can change the description, but this is discouraged.";
+    out.poll_descriptionHint = "Describe your poll, and use the ✓ (publish) button when you're done.\n" +
+                               "The description can be written using markdown syntax and you can embed media elements from your CryptDrive.\n" +
+                               "Anyone with the link can change the description, but this is discouraged.";
 
     out.poll_remove = "Remove";
     out.poll_edit = "Edit";
diff --git a/www/poll/app-poll.less b/www/poll/app-poll.less
index 4c2ecadae..b6ed472cb 100644
--- a/www/poll/app-poll.less
+++ b/www/poll/app-poll.less
@@ -124,6 +124,9 @@ table#cp-app-poll-table {
         width: 80%;
         min-height: 200px;
         border: 1px solid black;
+        .CodeMirror-placeholder {
+            color: #777;
+        }
     }
 }
 #cp-app-poll-description-published {
@@ -139,6 +142,10 @@ table#cp-app-poll-table {
     background-color: #eeeeee;
     font: @colortheme_app-font;
     text-align: left;
+    media-tag > * {
+        max-width: 100%;
+        max-height: 20em;
+    }
 }
 .cp-app-poll-published {
     #cp-app-poll-description {
diff --git a/www/poll/inner.js b/www/poll/inner.js
index 23b565ac9..8e7bd8af3 100644
--- a/www/poll/inner.js
+++ b/www/poll/inner.js
@@ -16,6 +16,7 @@ define([
     '/common/sframe-common-codemirror.js',
 
     'cm/lib/codemirror',
+    'cm/addon/display/placeholder',
     'cm/mode/markdown/markdown',
     'css!cm/lib/codemirror.css',
 
@@ -685,11 +686,13 @@ define([
             // If readOnly, always put the app in published mode
             bool = true;
         }
+        $(APP.$mediaTagButton).toggle(!bool);
         setTablePublished(bool);
         /*['textarea'].forEach(function (sel) {
             $(sel).attr('disabled', bool);
         });*/
         updatePublishButton();
+        APP.editor.refresh();
     };
 
     var updateHelpButton = function () {
@@ -736,10 +739,11 @@ define([
 
     var updatePublishedDescription = function () {
         var v = APP.editor.getValue();
-        DiffMd.apply(DiffMd.render(v || Messages.poll_descriptionHint), APP.$descriptionPublished);
+        DiffMd.apply(DiffMd.render(v || ''), APP.$descriptionPublished);
     };
     var updateDescription = function (old, n) {
-        var o = APP.$description.val();
+        var o = APP.editor.getValue();
+        console.error(n);
         SframeCM.setValueAndCursor(APP.editor, o, n, TextPatcher);
         updatePublishedDescription();
         common.notify();
@@ -749,6 +753,18 @@ define([
         updatePublishedDescription();
     };
 
+    var checkDeletedCells = function () {
+        // faster than forEach?
+        var c;
+        for (var k in APP.proxy.content.cells) {
+            c = Render.getCoordinates(k);
+            if (APP.proxy.content.colsOrder.indexOf(c[0]) === -1 ||
+                APP.proxy.content.rowsOrder.indexOf(c[1]) === -1) {
+                console.log('deleting ' + k);
+                delete APP.proxy.content.cells[k];
+            }
+        }
+    };
     var onReady = function (info, userid) {
         var proxy = APP.proxy;
 
@@ -767,6 +783,8 @@ define([
                 proxy.content = proxy.table;
                 delete proxy.table;
             }
+            checkDeletedCells();
+
             if (proxy && proxy.metadata) {
                 metadataMgr.updateMetadata(proxy.metadata);
             }
@@ -878,7 +896,7 @@ define([
 
         $('#cp-app-poll-table-scroll').html('').prepend($table);
         updateDisplayedTable();
-        updateDescription(null, APP.proxy.description);
+        updateDescription(null, APP.proxy.description || '');
 
         $table
             .click(handleClick)
@@ -998,6 +1016,31 @@ define([
             .click(function () { publish(!APP.proxy.published); }).appendTo($rightside);
         APP.$publishButton = $publish;
         updatePublishButton();
+
+        var fileDialogCfg = {
+            onSelect: function (data) {
+                if (data.type === 'file' && APP.editor) {
+                    var mt = '<media-tag src="' + data.src + '" data-crypto-key="cryptpad:' + data.key + '"></media-tag>';
+                    APP.editor.replaceSelection(mt);
+                    return;
+                }
+            }
+        };
+        common.initFilePicker(fileDialogCfg);
+        APP.$mediaTagButton = $('<button>', {
+            title: Messages.filePickerButton,
+            'class': 'cp-toolbar-rightside-button fa fa-picture-o',
+            style: 'font-size: 17px'
+        }).click(function () {
+            var pickerCfg = {
+                types: ['file'],
+                where: ['root']
+            };
+            common.openFilePicker(pickerCfg);
+        }).appendTo($rightside);
+
+        var $tags = common.createButton('hashtag', true);
+        $rightside.append($tags);
     };
 
 
@@ -1031,8 +1074,8 @@ define([
             APP.$bar = $('#cp-toolbar');
             APP.$content = $('#cp-app-poll-content');
             APP.$descriptionPublished = $('#cp-app-poll-description-published');
-            APP.$description = $('#cp-app-poll-description')
-                .attr('placeholder', Messages.poll_descriptionHint || 'description');
+            APP.$description = $('#cp-app-poll-description');
+                //.attr('placeholder', Messages.poll_descriptionHint || 'description');
 
             APP.editor = CMeditor.fromTextArea(APP.$description[0], {
                 lineNumbers: true,

From 26dfc65c25715f1890438534bca353f0730aea49 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 4 Oct 2017 19:06:16 +0200
Subject: [PATCH 09/20] Comments in polls

---
 customize.dist/pages.js |  13 ++++
 www/common/toolbar3.js  |   2 +-
 www/poll/app-poll.less  |  60 ++++++++++++++++++
 www/poll/inner.js       | 132 +++++++++++++++++++++++++++++++++++++++-
 www/poll/render.js      |   3 +-
 5 files changed, 205 insertions(+), 5 deletions(-)

diff --git a/customize.dist/pages.js b/customize.dist/pages.js
index 9e249b6db..1f28dfcb9 100644
--- a/customize.dist/pages.js
+++ b/customize.dist/pages.js
@@ -664,6 +664,19 @@ define([
                             h('button#cp-app-poll-create-option.btn.btn-secondary', {
                                 title: Msg.poll_create_option
                             }, h('span.fa.fa-plus')),
+                        ]),
+                        h('div#cp-app-poll-comments', [
+                            h('h2#cp-app-poll-comments-add-title', "TODO: add comment"),
+                            h('div#cp-app-poll-comments-add', [
+                                h('input.cp-app-poll-comments-add-name', {
+                                    type: 'text'
+                                }),
+                                h('textarea.cp-app-poll-comments-add-msg'),
+                                h('button.cp-app-poll-comments-add-submit', "TODO: SUBMIT"),
+                                h('button.cp-app-poll-comments-add-cancel', "TODO: CANCEL")
+                            ]),
+                            h('h2#cp-app-poll-comments-list-title', "TODO: comments"),
+                            h('div#cp-app-poll-comments-list')
                         ])
                     ])
                 ])
diff --git a/www/common/toolbar3.js b/www/common/toolbar3.js
index 75102b1ad..6433906d6 100644
--- a/www/common/toolbar3.js
+++ b/www/common/toolbar3.js
@@ -228,7 +228,7 @@ define([
                 $span.append($rightCol);
             } else {
                 Common.displayAvatar($span, data.avatar, name, function ($img) {
-                    if (data.avatar && $img) {
+                    if (data.avatar && $img.length) {
                         avatars[data.avatar] = $img[0].outerHTML;
                     }
                     $span.append($rightCol);
diff --git a/www/poll/app-poll.less b/www/poll/app-poll.less
index b6ed472cb..2b109314b 100644
--- a/www/poll/app-poll.less
+++ b/www/poll/app-poll.less
@@ -5,6 +5,7 @@
 @import (once) '../../customize/src/less2/include/alertify.less';
 @import (once) '../../customize/src/less2/include/tokenfield.less';
 @import (once) '../../customize/src/less2/include/tools.less';
+@import (once) '../../customize/src/less2/include/avatar.less';
 
 .toolbar_main();
 .fileupload_main();
@@ -487,6 +488,65 @@ div.cp-app-poll-realtime {
             display: none;
         }
     }
+    #cp-app-poll-comments {
+        width: 50%;
+        margin: 20px auto;
+        min-width: 400px;
+        #cp-app-poll-comments-add {
+            input, textarea {
+                border: 1px solid black;
+                width: 90%;
+                margin: 5px 5%;
+            }
+            input {
+                padding: 5px;
+                height: 26px;
+                &[disabled] {
+                    background: #eee;
+                }
+            }
+            textarea {
+                padding: 5px;
+                height: 8em;
+                line-height: 1.5em;
+            }
+            text-align: center;
+        }
+        #cp-app-poll-comments-list {
+            .cp-app-poll-comments-list-el {
+                width: 90%;
+                margin: 5px 5%;
+            }
+            .cp-app-poll-comments-list-msg {
+                display: flex;
+                background: #eee;
+                padding: 5px 10px;
+                .cp-app-poll-comments-list-msg-text {
+                    flex: 1;
+                    white-space: pre;
+                }
+                .cp-app-poll-comments-list-msg-actions {
+                    button {
+                        border-radius: 0;
+                        width: 25px;
+                        padding: 0;
+                        line-height: 20px;
+                    }
+                }
+            }
+            .cp-app-poll-comments-list-data {
+                background: #ddd;
+                padding: 5px 10px;
+                display: flex;
+                align-items: center;
+                .cp-app-poll-comments-list-data-name {
+                    margin-left: 10px;
+                    flex: 1;
+                }
+                .cp-app-poll-comments-list-data-avatar { .avatar_main(30px); }
+            }
+        }
+    }
 }
 
 .btn {
diff --git a/www/poll/inner.js b/www/poll/inner.js
index 8e7bd8af3..4a2d90ffc 100644
--- a/www/poll/inner.js
+++ b/www/poll/inner.js
@@ -743,7 +743,6 @@ define([
     };
     var updateDescription = function (old, n) {
         var o = APP.editor.getValue();
-        console.error(n);
         SframeCM.setValueAndCursor(APP.editor, o, n, TextPatcher);
         updatePublishedDescription();
         common.notify();
@@ -753,6 +752,119 @@ define([
         updatePublishedDescription();
     };
 
+    var getCommentId = Render.Uid('c');
+    var removeComment = function (uid) {
+        var idx;
+        APP.proxy.comments.some(function (c, i) {
+            if (c.uid === uid) {
+                console.log('found');
+                idx = i;
+                return true;
+            }
+        });
+        if (idx) {
+            APP.proxy.comments.splice(idx, 1);
+        }
+        APP.updateComments();
+    };
+    /*var editComment = function (id) {
+        // TODO
+    };*/
+    var avatars = {};
+    var updateComments = APP.updateComments = function () {
+        if (!APP.proxy.comments) { APP.proxy.comments = []; }
+
+        var profile;
+        if (common.isLoggedIn()) {
+            profile = metadataMgr.getUserData().profile;
+        }
+
+        var $comments = APP.$comments.html('');
+        var comments = APP.proxy.comments;
+        comments.forEach(function (c) {
+            var $c = $('<div>', {
+                'class': 'cp-app-poll-comments-list-el'
+            }).prependTo($comments);
+            // Metadata
+            var $data = $('<div>', { 'class': 'cp-app-poll-comments-list-data' }).appendTo($c);
+            var $avatar = $('<span>', {
+                'class': 'cp-app-poll-comments-list-data-avatar cp-avatar'
+            }).appendTo($data);
+            if (c.avatar && avatars[c.avatar]) {
+                $avatar.append(avatars[c.avatar]);
+            } else {
+                common.displayAvatar($avatar, c.avatar, c.name, function ($img) {
+                    if (c.avatar && $img.length) { avatars[c.avatar] = $img[0].outerHTML; }
+                });
+            }
+            if (c.profile) {
+                $('<a>', {
+                    'href': APP.origin + '/profile/#' + c.profile,
+                    'target': '_blank',
+                    'class': 'cp-app-poll-comments-list-data-name'
+                }).appendTo($data).text(c.name);
+            } else {
+                $('<span>', {
+                    'class': 'cp-app-poll-comments-list-data-name'
+                }).appendTo($data).text(c.name);
+            }
+            $('<span>', {
+                'class': 'cp-app-poll-comments-list-data-time'
+            }).appendTo($data).text(new Date(c.time).toLocaleString());
+
+            // Message
+            var $msg = $('<div>', { 'class': 'cp-app-poll-comments-list-msg' }).appendTo($c);
+            $('<div>', {
+                'class': 'cp-app-poll-comments-list-msg-text'
+            }).appendTo($msg).text(c.msg);
+            var $actions = $('<div>', {
+                'class': 'cp-app-poll-comments-list-msg-actions'
+            }).appendTo($msg);
+
+            // Actions
+            if (!c.profile || c.profile === profile) {
+                $('<button>', {
+                    'class': 'fa fa-times',
+                    'title': 'TODO: remove comment',
+                    'data-rt-id': c.uid
+                }).appendTo($actions).click(function () { removeComment(c.uid); });
+                /*$('<button>', {
+                    'class': 'fa fa-pencil',
+                    'title': 'TODO: edit comment',
+                    'data-rt-id': c.uid
+                }).appendTo($actions).click(editComment);*/
+            }
+        });
+        common.notify();
+    };
+    var resetComment = function () {
+        APP.$addComment.find('.cp-app-poll-comments-add-name').val('');
+        APP.$addComment.find('.cp-app-poll-comments-add-msg').val('');
+    };
+    var addComment = function () {
+        if (!APP.proxy.comments) { APP.proxy.comments = []; }
+        var name = APP.$addComment.find('.cp-app-poll-comments-add-name').val();
+        var msg = APP.$addComment.find('.cp-app-poll-comments-add-msg').val();
+        var time = +new Date();
+
+        var profile, avatar;
+        if (common.isLoggedIn()) {
+            profile = metadataMgr.getUserData().profile;
+            avatar = metadataMgr.getUserData().avatar;
+        }
+
+        APP.proxy.comments.push({
+            msg: msg,
+            name: name,
+            time: time,
+            uid: getCommentId(),
+            profile: profile,
+            avatar: avatar
+        });
+        resetComment();
+        updateComments();
+    };
+
     var checkDeletedCells = function () {
         // faster than forEach?
         var c;
@@ -893,11 +1005,20 @@ define([
             var val = APP.editor.getValue();
             updateLocalDescription(val);
         });
+        APP.$addComment.find('.cp-app-poll-comments-add-submit').click(addComment);
+        APP.$addComment.find('.cp-app-poll-comments-add-cancel').click(resetComment);
 
         $('#cp-app-poll-table-scroll').html('').prepend($table);
         updateDisplayedTable();
         updateDescription(null, APP.proxy.description || '');
 
+        // Initialize author name for comments.
+        // Disable name modification for logged in users
+        var $cName = APP.$addComment.find('.cp-app-poll-comments-add-name')
+            .val(metadataMgr.getUserData().name || '');
+        if (common.isLoggedIn()) { $cName.attr('disabled', 'disabled'); }
+        updateComments();
+
         $table
             .click(handleClick)
             .on('keyup', function (e) { handleClick(e, true); });
@@ -913,6 +1034,7 @@ define([
             })
             .on('change', ['content'], change)
             .on('change', ['description'], updateDescription)
+            .on('change', ['comments'], updateComments)
             .on('remove', [], change);
 
         // If the user's column is not committed, add his username
@@ -1070,12 +1192,15 @@ define([
             APP.loggedIn = common.isLoggedIn();
             APP.SFCommon = common;
 
+            APP.origin = common.getMetadataMgr().getPrivateData().origin;
+
             APP.$body = $('body');
             APP.$bar = $('#cp-toolbar');
             APP.$content = $('#cp-app-poll-content');
             APP.$descriptionPublished = $('#cp-app-poll-description-published');
             APP.$description = $('#cp-app-poll-description');
-                //.attr('placeholder', Messages.poll_descriptionHint || 'description');
+            APP.$comments = $('#cp-app-poll-comments-list');
+            APP.$addComment = $('#cp-app-poll-comments-add');
 
             APP.editor = CMeditor.fromTextArea(APP.$description[0], {
                 lineNumbers: true,
@@ -1092,7 +1217,8 @@ define([
             };
 
             if (APP.readOnly) {
-                $('#cp-app-poll-create-user, #cp-app-poll-create-option').remove();
+                $('#cp-app-poll-create-user, #cp-app-poll-create-option, #cp-app-poll-comments-add')
+                    .remove();
             }
 
             var rt = APP.rt = Listmap.create(listmapConfig);
diff --git a/www/poll/render.js b/www/poll/render.js
index 5428535ac..4307ad458 100644
--- a/www/poll/render.js
+++ b/www/poll/render.js
@@ -9,9 +9,10 @@ define([
     var Example = {
         metadata: {
             title: '',
-            description: '',
             userData: {}
         },
+        description: '',
+        comments: [],
         content: {
 /*  TODO
 

From c936e5ae7319e812e1c0c07da68634d0385153fb Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Thu, 5 Oct 2017 11:14:41 +0200
Subject: [PATCH 10/20] make context menu open correct app on correct port

---
 www/drive/inner.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/drive/inner.js b/www/drive/inner.js
index ed343d724..aba010a2c 100644
--- a/www/drive/inner.js
+++ b/www/drive/inner.js
@@ -2640,7 +2640,7 @@ define([
             else if ($(this).hasClass("cp-app-drive-context-newdoc")) {
                 var type = $(this).data('type') || 'pad';
                 sessionStorage[Cryptpad.newPadPathKey] = filesOp.isPathIn(currentPath, [TRASH]) ? '' : currentPath;
-                window.open('/' + type + '/');
+                window.open(APP.origin + '/' + type + '/');
             }
             APP.hideMenu();
         });

From 1f35798194291472e413caa2d5ba50ec8ce84fd5 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Thu, 5 Oct 2017 15:08:34 +0200
Subject: [PATCH 11/20] stop event propagation from tag prompt

---
 www/common/common-interface.js | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/www/common/common-interface.js b/www/common/common-interface.js
index fee97a837..f519c34da 100644
--- a/www/common/common-interface.js
+++ b/www/common/common-interface.js
@@ -191,6 +191,8 @@ define([
 
         var listener;
         var close = Util.once(function (result, ev) {
+            ev.stopPropagation();
+            ev.preventDefault();
             var $frame = $(tagger).fadeOut(150, function () {
                 stopListening(listener);
                 $frame.remove();
@@ -198,17 +200,21 @@ define([
             });
         });
 
-        var $ok = findOKButton(tagger).click(function () {
+        var $ok = findOKButton(tagger).click(function (e) {
             var tokens = field.getTokens();
-            close(tokens);
+            close(tokens, e);
         });
-        var $cancel = findCancelButton(tagger).click(function () {
-            close(null);
+        var $cancel = findCancelButton(tagger).click(function (e) {
+            close(null, e);
         });
         listenForKeys(function () {
             $ok.click();
         }, function () {
             $cancel.click();
+        }, tagger);
+
+        $(tagger).on('click submit', function (e) {
+            e.stopPropagation();
         });
 
         document.body.appendChild(tagger);

From d85db6493951b72424ea6264c7f0850aefb05290 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Thu, 5 Oct 2017 16:58:34 +0200
Subject: [PATCH 12/20] add tags from drive

---
 www/common/sframe-common-interface.js | 25 +++++++++++++++----------
 www/common/sframe-common-outer.js     |  5 ++---
 www/common/sframe-common.js           |  1 +
 www/drive/app-drive.less              |  2 ++
 www/drive/inner.html                  |  2 ++
 www/drive/inner.js                    | 17 +++++++++++++++++
 6 files changed, 39 insertions(+), 13 deletions(-)

diff --git a/www/common/sframe-common-interface.js b/www/common/sframe-common-interface.js
index 87f507b57..0a128b31d 100644
--- a/www/common/sframe-common-interface.js
+++ b/www/common/sframe-common-interface.js
@@ -28,6 +28,20 @@ define([
      *  - createDropdown
     */
 
+    UI.updateTags = function (common, href) {
+        var sframeChan = common.getSframeChannel();
+        sframeChan.query('Q_TAGS_GET', href || null, function (err, res) {
+            if (err || res.error) { return void console.error(err || res.error); }
+            Cryptpad.dialog.tagPrompt(res.data, function (tags) {
+                if (!Array.isArray(tags)) { return; }
+                sframeChan.event('EV_TAGS_SET', {
+                    tags: tags,
+                    href: href,
+                });
+            });
+        });
+    };
+
     UI.createButton = function (common, type, rightside, data, callback) {
         var AppConfig = common.getAppConfig();
         var button;
@@ -202,16 +216,7 @@ define([
                     title: Messages.tags_title,
                 })
                 .click(common.prepareFeedback(type))
-                .click(function () {
-                    sframeChan.query('Q_TAGS_GET', null, function (err, res) {
-                        if (err || res.error) { return void console.error(err || res.error); }
-                        Cryptpad.dialog.tagPrompt(res.data, function (tags) {
-                            if (!Array.isArray(tags)) { return; }
-                            console.error(tags);
-                            sframeChan.event('EV_TAGS_SET', tags);
-                        });
-                    });
-                });
+                .click(function () { UI.updateTags(null); });
                 break;
             default:
                 button = $('<button>', {
diff --git a/www/common/sframe-common-outer.js b/www/common/sframe-common-outer.js
index 322a1c73a..e145fc4a9 100644
--- a/www/common/sframe-common-outer.js
+++ b/www/common/sframe-common-outer.js
@@ -401,7 +401,7 @@ define([
             });
 
             sframeChan.on('Q_TAGS_GET', function (data, cb) {
-                Cryptpad.getPadTags(null, function (err, data) {
+                Cryptpad.getPadTags(data, function (err, data) {
                     cb({
                         error: err,
                         data: data
@@ -410,8 +410,7 @@ define([
             });
 
             sframeChan.on('EV_TAGS_SET', function (data) {
-                console.log(data);
-                Cryptpad.resetTags(null, data);
+                Cryptpad.resetTags(data.href, data.tags);
             });
 
             sframeChan.on('Q_PIN_GET_USAGE', function (data, cb) {
diff --git a/www/common/sframe-common.js b/www/common/sframe-common.js
index 3ca91d7c0..35865cdd8 100644
--- a/www/common/sframe-common.js
+++ b/www/common/sframe-common.js
@@ -78,6 +78,7 @@ define([
     funcs.displayAvatar = callWithCommon(UI.displayAvatar);
     funcs.createButton = callWithCommon(UI.createButton);
     funcs.createUsageBar = callWithCommon(UI.createUsageBar);
+    funcs.updateTags = callWithCommon(UI.updateTags);
 
     // History
     funcs.getHistory = callWithCommon(History.create);
diff --git a/www/drive/app-drive.less b/www/drive/app-drive.less
index ea027d76e..e7e5e2cda 100644
--- a/www/drive/app-drive.less
+++ b/www/drive/app-drive.less
@@ -6,11 +6,13 @@
 @import (once) '../../customize/src/less2/include/leftside-menu.less';
 @import (once) "../../customize/src/less2/include/tools.less";
 @import (once) "../../customize/src/less2/include/limit-bar.less";
+@import (once) "../../customize/src/less2/include/tokenfield.less";
 
 .toolbar_main();
 .fileupload_main();
 .alertify_main();
 .limit-bar_main();
+.tokenfield_main();
 
 @drive_hover: #eee;
 @drive_hover-light: lighten(@drive_hover, 20%);
diff --git a/www/drive/inner.html b/www/drive/inner.html
index 7ec8fc651..9761de93c 100644
--- a/www/drive/inner.html
+++ b/www/drive/inner.html
@@ -25,6 +25,7 @@
                 <li><a tabindex="-1" data-icon="fa-trash" class="cp-app-drive-context-delete cp-app-drive-context-editable dropdown-item" data-localization="fc_delete">Delete</a></li>
                 <li><a tabindex="-1" data-icon="fa-folder" class="cp-app-drive-context-newfolder cp-app-drive-context-editable dropdown-item" data-localization="fc_newfolder">New folder</a></li>
                 <li><a tabindex="-1" data-icon="fa-database" class="cp-app-drive-context-properties dropdown-item" data-localization="fc_prop">Properties</a></li>
+                <li><a tabindex="-1" data-icon="fa-hashtag" class="cp-app-drive-context-hashtag dropdown-item" data-localization="fc_hashtag">Tags</a></li>
             </ul>
         </div>
         <div id="cp-app-drive-context-content" class="cp-app-drive-context dropdown cp-unselectable">
@@ -43,6 +44,7 @@
                 <li><a tabindex="-1" data-icon="fa-eye" class="cp-app-drive-context-openro dropdown-item" data-localization="fc_open_ro">Open (read-only)</a></li>
                 <li><a tabindex="-1" data-icon="fa-trash" class="cp-app-drive-context-delete dropdown-item" data-localization="fc_delete">Delete</a></li>
                 <li><a tabindex="-1" data-icon="fa-database" class="cp-app-drive-context-properties dropdown-item" data-localization="fc_prop">Properties</a></li>
+                <li><a tabindex="-1" data-icon="fa-hashtag" class="cp-app-drive-context-hashtag dropdown-item" data-localization="fc_hashtag">Tags</a></li>
             </ul>
         </div>
         <div id="cp-app-drive-context-trashtree" class="cp-app-drive-context dropdown cp-unselectable">
diff --git a/www/drive/inner.js b/www/drive/inner.js
index aba010a2c..d3c4777b1 100644
--- a/www/drive/inner.js
+++ b/www/drive/inner.js
@@ -663,6 +663,7 @@ define([
                     hasFolder = true;
                     hide.push($menu.find('a.cp-app-drive-context-openro'));
                     hide.push($menu.find('a.cp-app-drive-context-properties'));
+                    hide.push($menu.find('a.cp-app-drive-context-hashtag'));
                 }
                 // If we're in the trash, hide restore and properties for non-root elements
                 if ($menu.find('a.cp-app-drive-context-restore').length && path && path.length > 4) {
@@ -2567,6 +2568,14 @@ define([
                     Cryptpad.alert($prop[0], undefined, true);
                 });
             }
+            else if ($(this).hasClass("cp-app-drive-context-hashtag")) {
+                if (paths.length !== 1) { return; }
+                var el = filesOp.find(paths[0].path);
+                var data = filesOp.getFileData(el);
+                if (!data) { return void console.error("Expected to find a file"); }
+                var href = data.href;
+                common.updateTags(href);
+            }
             APP.hideMenu();
         });
 
@@ -2618,6 +2627,14 @@ define([
                     Cryptpad.alert($prop[0], undefined, true);
                 });
             }
+            else if ($(this).hasClass("cp-app-drive-context-hashtag")) {
+                if (paths.length !== 1) { return; }
+                var el = filesOp.find(paths[0].path);
+                var data = filesOp.getFileData(el);
+                if (!data) { return void console.error("Expected to find a file"); }
+                var href = data.href;
+                common.updateTags(href);
+            }
             APP.hideMenu();
         });
 

From 427afc3954e600169c62bcc796c71a60b2f1168d Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Thu, 5 Oct 2017 16:59:55 +0200
Subject: [PATCH 13/20] override modified file name in pdfjs

---
 www/common/pdfjs/web/viewer.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/www/common/pdfjs/web/viewer.js b/www/common/pdfjs/web/viewer.js
index 45896a8f9..d7773ccfb 100644
--- a/www/common/pdfjs/web/viewer.js
+++ b/www/common/pdfjs/web/viewer.js
@@ -341,6 +341,7 @@ function isDataSchema(url) {
   return url.substr(i, 5).toLowerCase() === 'data:';
 }
 function getPDFFileNameFromURL(url) {
+  url = document.location.href;
   var query;
   var title;
   if (/\#/.test(url)) {

From 503111d26a1c2220db57535a3d1d89adbb52ce4e Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Thu, 5 Oct 2017 17:00:47 +0200
Subject: [PATCH 14/20] use recompiled media-tag

---
 www/common/media-tag.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/common/media-tag.js b/www/common/media-tag.js
index d49ec0557..acdee91da 100644
--- a/www/common/media-tag.js
+++ b/www/common/media-tag.js
@@ -1 +1 @@
-!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define([],t):"object"==typeof exports?exports.MediaTag=t():e.MediaTag=t()}(this,function(){return function(e){function t(r){if(n[r])return n[r].exports;var o=n[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,t),o.l=!0,o.exports}var n={};return t.m=e,t.c=n,t.d=function(e,n,r){t.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},t.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(n,"a",n),n},t.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},t.p="",t(t.s=63)}([function(e,t,n){"use strict";var r={IMAGE:"image",AUDIO:"audio",VIDEO:"video",PDF:"pdf",DASH:"dash",DOWNLOAD:"download",CRYPTO:"crypto",CLEAR_KEY:"clear-key",MEDIA_OBJECT:"media-object"};e.exports=r},function(e,t,n){"use strict";var r={MATCHER:"matcher",RENDERER:"renderer",FILTER:"filter",SANITIZER:"sanitizer"};e.exports=r},function(e,t,n){"use strict";function r(e){if(e instanceof Array){var t=[];return e.forEach(function(e){if(e.mediaObject)t.push(e.mediaObject);else{new c(e,r.processingEngine).mediaObjects.forEach(function(e){t.push(r.processingEngine.start(e))})}}),t}new c(e,r.processingEngine).mediaObjects.forEach(function(e){r.processingEngine.start(e)})}var o=n(31),i=n(33),u=n(34),a=n(35),c=n(36);r.pluginStore=r.pluginStore||new u,r.uriStore=r.uriStore||new a("../plugins"),r.processingEngine=r.processingEngine||new o(r.pluginStore),r.matchingEngine=r.matchingEngine||new i(r.pluginStore,r.uriStore),r.loadingEngine=null,e.exports=r},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function i(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}var u=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),a=n(1),c=n(5),s=n(6),f=function(e){function t(e,n){r(this,t);var i=o(this,(t.__proto__||Object.getPrototypeOf(t)).call(this,e,a.MATCHER,c.ANY));return i.targetType=n,i}return i(t,e),u(t,[{key:"getTargetType",value:function(){return this.targetType}}]),t}(s);e.exports=f},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function i(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}var u=n(1),a=n(5),c=n(6),s=function(e){function t(e){return r(this,t),o(this,(t.__proto__||Object.getPrototypeOf(t)).call(this,e,u.RENDERER,a.ONCE))}return i(t,e),t}(c);e.exports=s},function(e,t,n){"use strict";var r={EVERY:"every",ANY:"any",ONCE:"once"};e.exports=r},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}var o=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),i=function(){function e(t,n,o){r(this,e),this.identifier=t,this.type=n,this.occurrence=o}return o(e,[{key:"getIdentifier",value:function(){if(this.identifier)return this.identifier;throw new Error("Plugin has not identifier")}},{key:"getType",value:function(){if(this.type)return this.type;throw new Error("Plugin has no type")}},{key:"start",value:function(e){return this.process(e)}}]),e}();e.exports=i},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function i(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}var u=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),a=n(11),c=n(0),s=n(8),f=function(e){function t(){return r(this,t),o(this,(t.__proto__||Object.getPrototypeOf(t)).call(this,c.CRYPTO))}return i(t,e),u(t,[{key:"process",value:function(e){var n=e.getAttribute("data-crypto-key"),r=/\w+:/.exec(n);if(null===r)throw new Error("No algorithm scheme found in data-crypto-key");var o=r[0],i=o.replace(":",""),u=n.replace(o,"");if(e.setAttribute("data-crypto-key",u),!t.functionStore.isStored(i))throw new Error("Algorithm "+i+" is not registered");t.functionStore.get(i)(e)}}]),t}(a);f.functionStore=f.functionStore||new s,f.mediaTypes=[],f.setAllowedMediaTypes=function(e){f.mediaTypes=e},f.getAllowedMediaTypes=function(){return f.mediaTypes},f.addAllowedMediaType=function(e){f.mediaTypes.push(e)},f.addAllAllowedMediaTypes=function(e){e.forEach(function(e){f.addAllowedMediaType(e)})},f.removeAllowedMediaType=function(e){var t=f.mediaTypes.indexOf(e);t>=0&&f.mediaTypes.splice(t,1)},f.removeAllAllowedMediaTypes=function(e){e.forEach(function(e){f.removeAllowedMediaType(e)})},f.isAllowedMediaType=function(e){return f.mediaTypes.some(function(t){return t===e})},e.exports=f},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}var o=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),i=function(){function e(){r(this,e),this.map={}}return o(e,[{key:"isStored",value:function(e){return!!this.get(e)}},{key:"store",value:function(e,t){this.isStored(e)&&console.warn('The key "'+e+'" is already registered, the content will be overwritten.'),this.map[e]=t}},{key:"unstore",value:function(e){if(!1!==this.isStored(e)){var t=this.map[e];return delete this.map[e],t}console.warn('The key "'+e+'" not exists in this manager')}},{key:"get",value:function(e){return this.map[e]}},{key:"keys",value:function(){return Object.keys(this.map)}},{key:"values",value:function(){var e=this;return this.keys().map(function(t){return e.get(t)})}}]),e}();e.exports=i},function(e,t,n){"use strict";var r=n(16),o=n(15);e.exports=function(e,t){t.mediaObjects.forEach(function(e){r(e)}),t.activeMediaObject=e,o(e)}},,function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function i(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}var u=n(1),a=n(5),c=n(6),s=function(e){function t(e){return r(this,t),o(this,(t.__proto__||Object.getPrototypeOf(t)).call(this,e,u.FILTER,a.ANY))}return i(t,e),t}(c);e.exports=s},,function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}var o=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),i=function(){function e(t){r(this,e),this.truth=t}return o(e,[{key:"is",value:function(e){if(this.truth===e)return this;throw new Error("Assertion fail on : "+this.truth+" is "+e)}},{key:"not",value:function(e){if(this.truth!==e)return this;throw new Error("Assertion fail on : "+this.truth+" is not "+e)}}],[{key:"that",value:function(t){return new e(t)}}]),e}();e.exports=i},function(e,t,n){"use strict";var r={ALLOWED:0,REQUIRED:1,FORBIDDEN:2};e.exports=r},function(e,t,n){"use strict";e.exports=function(e){e.element.style.display="block";var t=!0,n=!1,r=void 0;try{for(var o,i=e.hookedFns.children()[Symbol.iterator]();!(t=(o=i.next()).done);t=!0){o.value.style.display="block"}}catch(e){n=!0,r=e}finally{try{!t&&i.return&&i.return()}finally{if(n)throw r}}}},function(e,t,n){"use strict";e.exports=function(e){e.element.style.display="none";var t=!0,n=!1,r=void 0;try{for(var o,i=e.hookedFns.children()[Symbol.iterator]();!(t=(o=i.next()).done);t=!0){o.value.style.display="none"}}catch(e){n=!0,r=e}finally{try{!t&&i.return&&i.return()}finally{if(n)throw r}}}},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}var o=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),i=function(){function e(t){var n=this;r(this,e),Object.keys(t.attributes).forEach(function(e){n[t.attributes[e].name]=t.attributes[e].value})}return o(e,[{key:"getAttribute",value:function(e){return this[e]}},{key:"setAttribute",value:function(e,t){this[e]=t}},{key:"removeAttribute",value:function(e){delete this[e]}},{key:"hasAttributes",value:function(){return Object.keys(this)>0}}]),e}();e.exports=i},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function i(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}var u={PluginExists:function(e){function t(e){return r(this,t),o(this,(t.__proto__||Object.getPrototypeOf(t)).call(this,'Plugin with same "'+e.identifier+'" identifier found.'))}return i(t,e),t}(Error),TypeNotFound:function(e){function t(){return r(this,t),o(this,(t.__proto__||Object.getPrototypeOf(t)).call(this,"Media Tag could not find the content type of an instance.}."))}return i(t,e),t}(Error),FilterExists:function(e){function t(e){return r(this,t),o(this,(t.__proto__||Object.getPrototypeOf(t)).call(this,'Filter with same "'+e.identifier+' identifier found."'))}return i(t,e),t}(Error),FetchFail:function(e){function t(e){return r(this,t),o(this,(t.__proto__||Object.getPrototypeOf(t)).call(this,'Could not fetch "'+e.url+'", received "'+e.status+": "+e.statusText+'".'))}return i(t,e),t}(Error),InvalidCryptoKey:function(e){function t(){return r(this,t),o(this,(t.__proto__||Object.getPrototypeOf(t)).call(this,"Invalid cryptographic key."))}return i(t,e),t}(Error),InvalidCryptoLib:function(e){function t(){return r(this,t),o(this,(t.__proto__||Object.getPrototypeOf(t)).call(this,"Invalid cryptographic algorithm name."))}return i(t,e),t}(Error),FailedCrypto:function(e){function t(e){return r(this,t),o(this,(t.__proto__||Object.getPrototypeOf(t)).call(this,"Failed to decrypt file"+(e&&e.message?" "+e.message:"")+"."))}return i(t,e),t}(Error)};e.exports=u},function(e,t,n){"use strict";var r=n(21),o=n(43),i=n(44),u=n(45),a=n(46),c=n(47),s=n(48),f=n(7),l=n(49),p=n(50);r.pluginStore.store(new o),r.pluginStore.store(new i),r.pluginStore.store(new u),r.pluginStore.store(new a),r.pluginStore.store(new c),r.pluginStore.store(new s),r.pluginStore.store(new f),r.pluginStore.store(new l),r.pluginStore.store(new p);var y=n(51),h=n(52);f.functionStore.store("salsa20poly1305",y),f.functionStore.store("cryptpad",h);var b=new s("<p> MediaTag cannot find a plugin able to renderer your content </p>","Download");r.processingEngine.setDefaultPlugin(b),r.CryptoFilter=f;var d=["image/png","image/jpeg","image/jpg","image/gif","audio/mp3","audio/ogg","audio/wav","audio/webm","video/mp4","video/ogg","video/webm","application/pdf","application/dash+xml","download"];r.CryptoFilter.setAllowedMediaTypes(d);var v=n(53),g=(n(14),n(0),new v);r.PdfPlugin=a,r.PdfPlugin.viewer="/pdfjs/web/viewer.html",r.processingEngine.configure(g),e.exports=r},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function i(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}var u=n(1),a=n(5),c=n(6),s=function(e){function t(e){return r(this,t),o(this,(t.__proto__||Object.getPrototypeOf(t)).call(this,e,u.SANITIZER,a.EVERY))}return i(t,e),t}(c);e.exports=s},function(e,t,n){"use strict";var r=n(22),o=n(23),i=n(24),u=n(25),a=n(26),c=n(27),s=n(28),f=n(29),l=n(30),p=n(2);p.pluginStore.store(new r),p.pluginStore.store(new o),p.pluginStore.store(new i),p.pluginStore.store(new u),p.pluginStore.store(new a),p.pluginStore.store(new c),p.pluginStore.store(new s),p.pluginStore.store(new f),p.pluginStore.store(new l),e.exports=p},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function i(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}var u=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),a=n(0),c=n(1),s=n(3),f=function(e){function t(){return r(this,t),o(this,(t.__proto__||Object.getPrototypeOf(t)).call(this,a.IMAGE,c.RENDERER))}return i(t,e),u(t,[{key:"process",value:function(e){var t=/^png|jpg|jpeg|gif|svg[+]xml$/,n=/^image[\/](png|jpeg|gif|svg[+]xml)$/;return e.hasAttribute("src")&&"image"===e.getType()&&null!==t.exec(e.getExtension())&&null!==n.exec(e.getMimeType())}}]),t}(s);e.exports=f},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function i(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}var u=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),a=n(0),c=n(1),s=n(3),f=function(e){function t(){return r(this,t),o(this,(t.__proto__||Object.getPrototypeOf(t)).call(this,a.AUDIO,c.RENDERER))}return i(t,e),u(t,[{key:"process",value:function(e){var t=/^mp3|ogg|webm|wav|mpeg$/,n=/^audio[\/](mp3|ogg|webm|wav|mpeg)$/;return e.hasAttribute("src")&&"audio"===e.getType()&&null!==t.exec(e.getExtension())&&null!==n.exec(e.getMimeType())}}]),t}(s);e.exports=f},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function i(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}var u=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),a=n(0),c=n(1),s=n(3),f=function(e){function t(){return r(this,t),o(this,(t.__proto__||Object.getPrototypeOf(t)).call(this,a.VIDEO,c.RENDERER))}return i(t,e),u(t,[{key:"process",value:function(e){var t=/^mp4|ogg|webm$/,n=/^video[\/](mp4|ogg|webm)$/;return e.hasAttribute("src")&&"video"===e.getType()&&null!==t.exec(e.getExtension())&&null!==n.exec(e.getMimeType())}}]),t}(s);e.exports=f},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function i(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}var u=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),a=n(0),c=n(1),s=n(3),f=function(e){function t(){return r(this,t),o(this,(t.__proto__||Object.getPrototypeOf(t)).call(this,a.PDF,c.RENDERER))}return i(t,e),u(t,[{key:"process",value:function(e){var t=/^pdf$/,n=/^application[\/]pdf$/;return e.hasAttribute("src")&&"application"===e.getType()&&null!==t.exec(e.getExtension())&&null!==n.exec(e.getMimeType())}}]),t}(s);e.exports=f},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function i(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}var u=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),a=n(0),c=n(1),s=n(3),f=function(e){function t(){return r(this,t),o(this,(t.__proto__||Object.getPrototypeOf(t)).call(this,a.DASH,c.RENDERER))}return i(t,e),u(t,[{key:"process",value:function(e){var t=/^dash[+]xml$/,n=/^application[\/]dash[+]xml$/;return e.hasAttribute("src")&&"application"===e.getType()&&null!==t.exec(e.getExtension())&&null!==n.exec(e.getMimeType())}}]),t}(s);e.exports=f},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function i(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}var u=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),a=n(0),c=n(1),s=n(3),f=function(e){function t(){return r(this,t),o(this,(t.__proto__||Object.getPrototypeOf(t)).call(this,a.DOWNLOAD,c.RENDERER))}return i(t,e),u(t,[{key:"process",value:function(e){return e.hasAttribute("src")&&"download"===e.getType()}}]),t}(s);e.exports=f},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function i(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}var u=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),a=n(0),c=n(1),s=n(3),f=function(e){function t(){return r(this,t),o(this,(t.__proto__||Object.getPrototypeOf(t)).call(this,a.CRYPTO,c.FILTER))}return i(t,e),u(t,[{key:"process",value:function(e){return e.hasAttribute("data-crypto-key")}}]),t}(s);e.exports=f},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function i(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}var u=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),a=n(0),c=n(1),s=n(3),f=function(e){function t(){return r(this,t),o(this,(t.__proto__||Object.getPrototypeOf(t)).call(this,a.CLEAR_KEY,c.FILTER))}return i(t,e),u(t,[{key:"process",value:function(e){return e.hasAttribute("data-clear-key")}}]),t}(s);e.exports=f},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function i(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}var u=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),a=n(0),c=n(1),s=n(3),f=function(e){function t(){return r(this,t),o(this,(t.__proto__||Object.getPrototypeOf(t)).call(this,a.MEDIA_OBJECT,c.SANITIZER))}return i(t,e),u(t,[{key:"process",value:function(e){return e.hasAttribute("src")&&e.hasAttribute("data-type")}}]),t}(s);e.exports=f},function(e,t,n){"use strict";function r(e){if(Array.isArray(e)){for(var t=0,n=Array(e.length);t<e.length;t++)n[t]=e[t];return n}return Array.from(e)}function o(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}var i=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),u=n(13),a=n(1),c=n(32),s=n(14),f=function(){function e(t){o(this,e),u.that(t).not(void 0),this.pluginStore=t,this.stacks={},this.snapshots={},this.stats=[],this.defaultPlugin=null}return i(e,[{key:"configure",value:function(e){this.configuration=e}},{key:"start",value:function(e){e.state="processing",this.routine(e),this.run(e)}},{key:"run",value:function(e){var t=this.stackTop(e);if(!t)return e.state="processed",e;if(this.configuration)if(this.configuration.getPermission(t.identifier)===s.FORBIDDEN){var n=this.stats[e.getId()];n.skipped||(n.skipped=[]),n.skipped.push(t.identifier),this.return(e)}else t.process(e);else t.process(e)}},{key:"routine",value:function(e){this.fill(e),this.snapshot(e),this.check(e)}},{key:"snapshot",value:function(e){var t=e.getId();if(this.stacks[t]){var n=[];this.stacks[t].forEach(function(e){var t={};t.identifier=e.getIdentifier(),t.type=e.getType(),n.push(t)}),this.snapshots[t]?this.snapshots[t].push({stack:n}):this.snapshots[t]=[{stack:n}]}else this.snapshots[t]=[]}},{key:"fill",value:function(e){var t=e.getId(),n=this.pluginStore.getPlugins(a.MATCHER),o=n.filter(function(t){return t.process(e)}),i=o.map(function(e){return e.getIdentifier()}),u=this.pluginStore.values(),s=u.filter(function(e){return e.type!==a.MATCHER&&i.includes(e.identifier)}),f=c.filterByOccurrencies(s),l=this.substack(e,f);if(this.stacks[t]){var p;(p=this.stacks[t]).push.apply(p,r(l))}else this.stacks[t]=l}},{key:"substack",value:function(e,t){var n=this,r=[];return t.once.forEach(function(t){n.configuration&&n.configuration.getPermission(t.identifier)===s.FORBIDDEN?n.skip(e,t):n.isStacked(e,t)||r.push(t)}),t.any.forEach(function(t){n.configuration&&n.configuration.getPermission(t.identifier)===s.FORBIDDEN?n.skip(e,t):n.isStacked(e,t)||r.push(t)}),t.every.forEach(function(t){n.configuration&&n.configuration.getPermission(t.identifier)===s.FORBIDDEN?n.skip(e,t):r.push(t)}),r}},{key:"skip",value:function(e,t){var n=this.stats[e.getId()];n?n.skipped||(n.skipped=[]):n={skipped:[]},n.skipped.push(t.identifier)}},{key:"unstack",value:function(e){var t=e.getId();return this.stacks[t]?this.stacks[t].pop():null}},{key:"stackTop",value:function(e){var t=e.getId();return this.stacks[t]?this.stacks[t][this.stacks[t].length-1]:null}},{key:"check",value:function(t){var n=t.getId();if(this.stacks[n].length>=e.STACK_LIMIT)throw console.error(this.snapshots[n]),new Error("Plugin stack size exceed");if(this.snapshots[n].length>=e.SNAPSHOT_LIMIT)throw console.error(this.snapshots[n]),new Error("Plugin snapshots size exceed");var r=0;if(this.stacks[n].forEach(function(e){e.type===a.RENDERER&&r++}),r>1)throw console.error(this.snapshots[n]),new Error("More of one renderer in the stack");if(0===this.stacks[n].length&&!this.stats[n][a.RENDERER]){if(!this.defaultPlugin)throw new Error("No default plugin assignated");this.stacks[n].unshift(this.defaultPlugin)}}},{key:"return",value:function(e){var t=e.getId(),n=this.unstack(e);if(n){try{this.stats[t]||(this.stats[t]={}),this.stats[t][n.type]?this.stats[t][n.type]+=1:this.stats[t][n.type]=1}catch(e){console.error(e,this.snapshots[t])}0===this.stacks[t].length&&n.type===a.RENDERER?this.run(e):n.type!==a.SANITIZER&&this.fill(e),this.snapshot(e),this.check(e),this.run(e)}}},{key:"process",value:function(e){var t=e.getId(),n=this.stacks[t].length,r=this.stacks[t][n-1];if(!r)throw console.log(this.stacks),new Error("Impossible to run a undefined plugin");r.process(e)}},{key:"isStacked",value:function(e,t){var n=e.getId();return!(!this.stacks[n]||!this.stacks[n].includes(t))}},{key:"setDefaultPlugin",value:function(e){this.defaultPlugin=e}}]),e}();f.STACK_LIMIT=100,f.SNAPSHOT_LIMIT=100,e.exports=f},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}var o=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),i=function(){function e(){r(this,e)}return o(e,null,[{key:"filterByOccurrence",value:function(e,t){return e.filter(function(e){return e.occurrence===t})}},{key:"filterByOccurrencies",value:function(e){var t={once:[],any:[],every:[]},n=!0,r=!1,o=void 0;try{for(var i,u=e[Symbol.iterator]();!(n=(i=u.next()).done);n=!0){var a=i.value;t[a.occurrence]?t[a.occurrence].push(a):t[a.occurrence]=Array.of(a)}}catch(e){r=!0,o=e}finally{try{!n&&u.return&&u.return()}finally{if(r)throw o}}return t}}]),e}();e.exports=i},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}var o=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),i=n(13),u=n(1),a=function(){function e(t,n){r(this,e),i.that(t).not(void 0),i.that(n).not(void 0),this.pluginStore=t,this.uriStore=n}return o(e,[{key:"start",value:function(e){var t=this,n=this.pluginStore.getPlugins(u.MATCHER),r=n.filter(function(t){return t.process(e)}),o=r.map(function(e){return e.getIdentifier()}),i={};return o.forEach(function(e){if(!t.uriStore)throw new Error("No map registrated for the matching engine");var n=t.uriStore.get(e);if(void 0===n)throw new Error("No uri related to identifier : "+e);i[e]=n}),i}}]),e}();e.exports=a},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function i(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}var u=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),a=function e(t,n,r){null===t&&(t=Function.prototype);var o=Object.getOwnPropertyDescriptor(t,n);if(void 0===o){var i=Object.getPrototypeOf(t);return null===i?void 0:e(i,n,r)}if("value"in o)return o.value;var u=o.get;if(void 0!==u)return u.call(r)},c=n(8),s=function(e){function t(){return r(this,t),o(this,(t.__proto__||Object.getPrototypeOf(t)).apply(this,arguments))}return i(t,e),u(t,[{key:"getPlugins",value:function(e){return this.values().filter(function(t){return t.type===e})}},{key:"store",value:function(e){a(t.prototype.__proto__||Object.getPrototypeOf(t.prototype),"store",this).call(this,[e.identifier,e.type],e)}},{key:"unstore",value:function(e){if(!1!==t.isStored([e.identifier,e.type]))return a(t.prototype.__proto__||Object.getPrototypeOf(t.prototype),"unstore",this).call(this,[e.identifier,e.type]);console.warn('The key "'+[e.identifier,e.type]+'" not exists in this manager')}}]),t}(c);e.exports=s},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function i(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}var u=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),a=function e(t,n,r){null===t&&(t=Function.prototype);var o=Object.getOwnPropertyDescriptor(t,n);if(void 0===o){var i=Object.getPrototypeOf(t);return null===i?void 0:e(i,n,r)}if("value"in o)return o.value;var u=o.get;if(void 0!==u)return u.call(r)},c=n(8),s=function(e){function t(e){r(this,t);var n=o(this,(t.__proto__||Object.getPrototypeOf(t)).call(this));return n.targetDirectory=e,n}return i(t,e),u(t,[{key:"store",value:function(e,n){var r=this.targetDirectory+"/"+n+"s/"+e;a(t.prototype.__proto__||Object.getPrototypeOf(t.prototype),"store",this).call(this,e,r)}},{key:"unstore",value:function(e){return a(t.prototype.__proto__||Object.getPrototypeOf(t.prototype),"unstore",this).call(this,e)}}]),t}(c);e.exports=s},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}var o=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),i=n(37),u=n(17),a=n(41),c=function(){function e(t,n){var o=this;r(this,e),this.mediaTagElement=t,this.processingEngine=n;var c=new u(t),s=c.getAttribute("sources")||c.getAttribute("srcs");if(s){var f=this.extractSourceObjects(s),l=this.extractMediaElements(f);this.mediaElements=l,this.mediaElements.forEach(function(e){o.mediaTagElement.appendChild(e)}),this.mediaObjects=this.createMediaObjects(l),i.activate(this.mediaObjects[0],this)}else{var p=new a(t);this.mediaObjects=[p],this.activeMediaObject=this.mediaObjects[0]}}return o(e,[{key:"extractSourceObjects",value:function(e){return JSON.parse(e)}},{key:"extractMediaElements",value:function(e){var t=this,n=[];return e.forEach(function(e){n.push(t.extractMediaElement(e))}),n}},{key:"extractMediaElement",value:function(e){var t=document.createElement("media");return Object.keys(e).forEach(function(n){t.setAttribute(n,e[n])}),t}},{key:"createMediaObjects",value:function(e){var t=[];return e.forEach(function(e){var n=new a(e);t.push(n)}),t}}]),e}();e.exports=c},function(e,t,n){"use strict";var r={clear:n(38),show:n(15),hide:n(16),upgrade:n(39),downgrade:n(40),activate:n(9)};e.exports=r},function(e,t,n){"use strict";e.exports=function(e){e.clearContents()}},function(e,t,n){"use strict";var r=n(9);e.exports=function(e){var t=e.mediaObjects.indexOf(e.activeMediaObject);t<e.mediaObjects.length&&r(e.mediaObjects[t+1],e)}},function(e,t,n){"use strict";var r=n(9);e.exports=function(e){var t=e.mediaObjects.indexOf(e.activeMediaObject);t>0&&r(e.mediaObjects[t-1],e)}},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}var o=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),i=n(17),u=n(42),a=function(){function e(t){r(this,e),this.id=e.uid(),this.element=t,this.state="idle",this.attributesObject=new i(t);var n=u.parse(this.attributesObject),o=!0,a=!1,c=void 0;try{for(var s,f=Object.keys(n)[Symbol.iterator]();!(o=(s=f.next()).done);o=!0){var l=s.value;this[l]=n[l]}}catch(e){a=!0,c=e}finally{try{!o&&f.return&&f.return()}finally{if(a)throw c}}this.hookedFns={hasChildNodes:t.hasChildNodes.bind(t),removeChild:t.removeChild.bind(t),getLastChild:function(){return t.lastChild},appendChild:t.appendChild.bind(t),children:function(){return t.children}}}return o(e,[{key:"setProperties",value:function(e){for(var t in e){if(this[t])throw new Error("The property "+t+" already exists in this MediaObject !");this[t]=e[t]}}},{key:"getId",value:function(){return this.id}},{key:"getAttribute",value:function(e){return this.attributesObject[e]}},{key:"setAttribute",value:function(e,t){this.attributesObject[e]=t}},{key:"removeAttribute",value:function(e){delete this.attributesObject[e]}},{key:"getAllDataAttrKeys",value:function(){return Object.keys(this.attributesObject).filter(function(e){return e.startsWith("data-attr")})}},{key:"getExtension",value:function(){return this.extension}},{key:"getMimeType",value:function(){return this.mime}},{key:"hasAttribute",value:function(e){return e in this.attributesObject}},{key:"getType",value:function(){return this.type}},{key:"getSource",value:function(){return this.src}},{key:"getSources",value:function(){return this.sources}},{key:"clearContents",value:function(){for(;this.hookedFns.hasChildNodes();)this.hookedFns.removeChild(this.hookedFns.getLastChild())}},{key:"replaceContents",value:function(e){var t=this;this.clearContents(),e.forEach(function(e){return t.hookedFns.appendChild(e)})}},{key:"utilsSetAllDataAttributes",value:function(e){var t=this;this.getAllDataAttrKeys().forEach(function(n){return e.setAttribute(n.substr(10),t.getAttribute(n))})}},{key:"utilsPassAllDataAttributes",value:function(e){var t=this;this.getAllDataAttrKeys().forEach(function(n){return e.setAttribute(n,t.getAttribute(n))})}}]),e}();a.uid=function(e){return function(){return e++}}(0),a.attributesObject=function(e){var t={};if(e.hasAttributes()){var n=e.attributes;Object.keys(n).forEach(function(e){var r=n[e];t[r.name]=r.value})}return t.hasAttribute=function(e){return t[e]},t},e.exports=a},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}var o=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),i=function(){function e(){r(this,e)}return o(e,null,[{key:"extension",value:function(e){var t=e.getAttribute("data-type");if(t)return t.split("/")[1]}},{key:"type",value:function(e){var t=e.getAttribute("data-type");if(t)return t.split("/")[0]}},{key:"mime",value:function(e){return e.getAttribute("data-type")}},{key:"protocol",value:function(e){var t=e.getAttribute("src").split("://");return t.length>1?t[0]:window.location.protocol}},{key:"hostname",value:function(e){var t=e.getAttribute("src").split("://");return t.length>1?t[1].split("/")[0]:window.location.hostname}},{key:"source",value:function(e){return e.getAttribute("src")}},{key:"schemes",value:function(e){return/\w+:/.exec(e.getAttribute("src"))}},{key:"sources",value:function(e){var t=e.getAttribute("sources")||e.getAttribute("srcs");return t?JSON.parse(t):null}},{key:"actions",value:function(e){var t=e.getAttribute("actions");return t?JSON.parse(t):null}},{key:"parse",value:function(t){return{protocol:e.protocol(t),hostname:e.hostname(t),src:e.source(t),type:e.type(t),extension:e.extension(t),mime:e.mime(t),sources:e.sources(t),actions:e.actions(t)}}}]),e}();e.exports=i},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function i(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}var u=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),a=n(4),c=n(0),s=n(2),f=function(e){function t(){return r(this,t),o(this,(t.__proto__||Object.getPrototypeOf(t)).call(this,c.IMAGE))}return i(t,e),u(t,[{key:"process",value:function(e){var t=document.createElement("img");t.setAttribute("src",e.getAttribute("src")),e.utilsSetAllDataAttributes(t),e.replaceContents([t]),s.processingEngine.return(e)}}]),t}(a);e.exports=f},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function i(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}var u=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),a=n(4),c=n(0),s=n(2),f=function(e){function t(){return r(this,t),o(this,(t.__proto__||Object.getPrototypeOf(t)).call(this,c.AUDIO))}return i(t,e),u(t,[{key:"process",value:function(e){var t=document.createElement("audio");t.setAttribute("src",e.getAttribute("src")),t.setAttribute("controls",!0),e.utilsSetAllDataAttributes(t),e.replaceContents([t]),s.processingEngine.return(e)}}]),t}(a);e.exports=f},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function i(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}var u=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),a=n(4),c=n(0),s=n(2),f=function(e){function t(){return r(this,t),o(this,(t.__proto__||Object.getPrototypeOf(t)).call(this,c.VIDEO))}return i(t,e),u(t,[{key:"process",value:function(e){var t=document.createElement("video");t.setAttribute("src",e.getAttribute("src")),t.setAttribute("controls",!0),e.utilsSetAllDataAttributes(t),e.replaceContents([t]),s.processingEngine.return(e)}}]),t}(a);e.exports=f},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function i(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}var u=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),a=n(4),c=n(0),s=n(2),f={PDFJS:"pdfjs",DEFAULT:"default"},l=function(e){function t(){return r(this,t),o(this,(t.__proto__||Object.getPrototypeOf(t)).call(this,c.PDF))}return i(t,e),u(t,[{key:"process",value:function(e){var n=e.getAttribute("src")+"#"+window.encodeURIComponent(e.name),r=document.createElement("iframe");switch(e.getAttribute("data-attr-width")||r.setAttribute("width","100%"),e.getAttribute("data-attr-height")||r.setAttribute("height",document.body.scrollHeight),t.viewer||(t.mode=f.DEFAULT),t.mode){case f.PDFJS:var o=t.viewer+"?file="+n,i=new XMLHttpRequest;i.onload=function(){i.status<400?r.src=o:(console.warn("The pdfjs viewer has not been found ...\n\t\t\t\t\t\t\tThe browser viewer will be used by default"),r.src=""+n)},i.open("HEAD",o,!0),i.send();break;default:r.src=""+n}e.utilsSetAllDataAttributes(r),e.replaceContents([r]),r.onload=function(){s.processingEngine.return(e)}}}]),t}(a);l.viewer=null,l.mode=f.PDFJS,e.exports=l},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function i(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}var u=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),a=n(4),c=n(0),s=n(2),f=function(e){function t(){return r(this,t),o(this,(t.__proto__||Object.getPrototypeOf(t)).call(this,c.DASH))}return i(t,e),u(t,[{key:"process",value:function(e){var t=document.createElement("video"),n=new shaka.Player(t),r=e.getAttribute("id"),o=e.getAttribute("key");if(r&&o){var i='{"'+r+'": "'+o+'"}',u=JSON.parse(i);n.configure({drm:{clearKeys:u}})}t.setAttribute("controls",!0),e.utilsSetAllDataAttributes(t),e.replaceContents([t]),n.load(e.getAttribute("src")).then(function(){}),s.processingEngine.return(e)}}]),t}(a);e.exports=f},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function i(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}var u=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),a=n(4),c=n(0),s=n(2),f=function(e){function t(e,n){r(this,t);var i=o(this,(t.__proto__||Object.getPrototypeOf(t)).call(this,c.DOWNLOAD));return i.message=e,i.buttonMessage=n||"Download",i}return i(t,e),u(t,[{key:"process",value:function(e){var t=document.createElement("button");t.innerHTML=this.buttonMessage,t.onclick=function(){var t=new XMLHttpRequest,n=e.getAttribute("src");t.open("GET",n,!0),t.responseType="blob",t.onload=function(){var n=t.response;if(n)if(e.name)saveAs(n,e.name);else if(e.getAttribute("data-attr-type")){var r=e.getAttribute("data-attr-type"),o=r.split("/"),i=new File([n],"download."+(o[1]||"txt"),{type:r});saveAs(i)}else saveAs(n)},t.send()},e.utilsSetAllDataAttributes(t),e.replaceContents([t]),s.processingEngine.return(e)}}]),t}(a);e.exports=f},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function i(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}var u=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),a=n(11),c=n(0),s=n(2),f=function(e){function t(){return r(this,t),o(this,(t.__proto__||Object.getPrototypeOf(t)).call(this,c.CLEAR_KEY))}return i(t,e),u(t,[{key:"process",value:function(e){var t=e.getAttribute("data-clear-key"),n=t.substring(0,32),r=t.substring(33,65);e.setAttribute("id",n),e.setAttribute("key",r),e.removeAttribute("data-clear-key"),s.processingEngine.return(e)}}]),t}(a);e.exports=f},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function i(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}var u=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),a=n(20),c=n(0),s=n(2),f=function(e){function t(){return r(this,t),o(this,(t.__proto__||Object.getPrototypeOf(t)).call(this,c.MEDIA_OBJECT))}return i(t,e),u(t,[{key:"process",value:function(e){s.processingEngine.return(e)}}]),t}(a);e.exports=f},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){s.isAllowedMediaType(t.type)&&(e.setAttribute("data-type",t.type),e.type=t.type,e.extension=t.extension,e.mime=t.mime)}function i(e){var t=e.getAttribute("src"),n=e.getAttribute("data-crypto-key"),r=f.getKeyFromStr(n),i=new XMLHttpRequest;i.open("GET",t,!0),i.responseType="arraybuffer",i.onload=function(){var t=i.response;if(t){var n=new Uint8Array(t),u=f.decrypt(n,r),a=l.getBlobUrl(u,e.getMimeType()),s=new Event("decryption");s.blob=new Blob([u],{type:e.getMimeType()}),window.document.dispatchEvent(s),e.setAttribute("src",a),e.removeAttribute("data-crypto-key"),e.hasAttribute("data-type")||o(e,{type:"image",extension:"png",mime:"image/png"}),c.processingEngine.return(e)}},i.send(null)}var u=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),a=n(18),c=n(2),s=n(7),f=function(){function e(){r(this,e)}return u(e,null,[{key:"slice",value:function(e){return Array.prototype.slice.call(e)}},{key:"getRandomKeyStr",value:function(){var t=e.Nacl,n=t.randomBytes(18);return t.util.encodeBase64(n)}},{key:"getKeyFromStr",value:function(t){var n=e.Nacl;return n.hash(n.util.decodeBase64(t)).subarray(32,64)}},{key:"encrypt",value:function(t,n){var r=t,o=e.Nacl.randomBytes(24),i=e.Nacl.secretbox(r,o,n);if(i)return new Uint8Array(e.slice(o).concat(e.slice(i)));throw new Error}},{key:"decrypt",value:function(t,n){if(t.length<24)throw new Error;var r=e.slice,o=e.Nacl,i=new Uint8Array(r(t).slice(0,24)),u=new Uint8Array(r(t).slice(24)),a=o.secretbox.open(u,i,n);if(a)return a;throw new Error("Decrypted file in undefined")}}]),e}();f.Nacl=window.nacl;var l=function(){function e(){r(this,e)}return u(e,null,[{key:"getArrayBuffer",value:function(e){return fetch(e).then(function(e){if(e.ok)return e.arrayBuffer();throw new a.FetchFails}).then(function(e){return e})}},{key:"createUrl",value:function(e){return window.URL.createObjectURL(e)}},{key:"getBlobUrl",value:function(e,t){return window.URL.createObjectURL(new Blob([e],{type:t}))}},{key:"getDataUrl",value:function(e,t){return"data:"+t+";base64,"+f.Nacl.util.encodeBase64(e)}}]),e}();e.exports=i},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){var n=t.type.split("/"),r=t.type,o=n[0],i=n[1];s.isAllowedMediaType(r)?(e.setAttribute("data-type",t.type),e.type=o,e.extension=i,e.mime=r):console.log("Not allowed metadata, allowed ones are : ",s.getAllowedMediaTypes()),e.name=t.name,e.setAttribute("data-attr-type",t.type)}function i(e){var t=e.getAttribute("src"),n=e.getAttribute("data-crypto-key"),r=f.getKeyFromStr(n),i=new XMLHttpRequest,u=[t,n].join(""),a=function(t){var n=new Event("decryption");n.metadata=t.metadata,o(e,t.metadata);var r=t.content,i=l.getBlobUrl(r,e.getMimeType());n.blob=new Blob([r],{type:e.getMimeType()}),n.metadata=t.metadata,s.addAllowedMediaType("audio/mpeg"),e.setAttribute("src",i),e.removeAttribute("data-crypto-key"),/audio\/(mp3|ogg|wav|webm|mpeg)/.test(t.metadata.type)||/application\/pdf/.test(t.metadata.type)||/video\//.test(t.metadata.type)||/image\/(png|jpeg|jpg|gif)/.test(t.metadata.type)||(t.metadata.type="download"),o(e,t.metadata),n.callback=function(t){c.processingEngine.return(e),"function"==typeof t&&t(e)},window.document.dispatchEvent(n)},p=c.__Cryptpad_Cache=c.__Cryptpad_Cache||{};if(p[u])return setTimeout(function(){a(p[u])});i.open("GET",t,!0),i.responseType="arraybuffer";var y=function(e){var t=new Event("decryptionError");t.message="string"==typeof e?e:e.message,window.document.dispatchEvent(t)};i.onload=function(){if(/^4/.test(""+this.status))return y("XHR_ERROR",this.status);var e=i.response;if(e){var t=new Uint8Array(e);f.decrypt(t,r,function(e,t){if(e)return y(e);p[u]=t,a(t)})}},i.send(null)}var u=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),a=n(18),c=n(2),s=n(7),f=function(){function e(){r(this,e)}return u(e,null,[{key:"createNonce",value:function(){return new Uint8Array(new Array(24).fill(0))}},{key:"increment",value:function(e){for(var t=e.length;t-- >1;){if("number"!=typeof e[t])throw new Error("E_UNSAFE_TYPE");if(e[t]>255)throw new Error("E_OUT_OF_BOUNDS");if(255!==e[t])return void e[t]++;if(e[t]=0,0===t)throw new Error("E_NONCE_TOO_LARGE")}}},{key:"encodePrefix",value:function(e){return[65280,255].map(function(t,n){return(e&t)>>8*(1-n)})}},{key:"decodePrefix",value:function(e){return e[0]<<8|e[1]}},{key:"joinChunks",value:function(e){return new Blob(e)}},{key:"slice",value:function(e){return Array.prototype.slice.call(e)}},{key:"getRandomKeyStr",value:function(){var e=window.nacl,t=e.randomBytes(18);return e.util.encodeBase64(t)}},{key:"getKeyFromStr",value:function(e){return window.nacl.util.decodeBase64(e)}},{key:"encrypt",value:function(){}},{key:"decrypt",value:function(t,n,r){var o=window.nacl,i=function(e){var n=new Event("decryptionProgress");n.percent=e/t.length*100,console.log(n.percent),window.document.dispatchEvent(n)},u=e.createNonce(),a=0,c=t.subarray(0,2),s=e.decodePrefix(c),f={metadata:void 0},l=new Uint8Array(t.subarray(2,2+s)),p=o.secretbox.open(l,u,n);e.increment(u);try{f.metadata=JSON.parse(o.util.encodeUTF8(p))}catch(e){return r("E_METADATA_DECRYPTION")}if(!f.metadata)return r("NO_METADATA");var y=function(r){setTimeout(function(){var c=131088*a+2+s,f=c+131088;a++;var l=new Uint8Array(t.subarray(c,f)),p=o.secretbox.open(l,u,n);if(e.increment(u),!p)return void r("DECRYPTION_FAILURE");i(Math.min(f,t.length)),r(void 0,p)})},h=[];!function n(){y(function(o,i){return o?setTimeout(function(){r(o)}):i?2+s+131088*a<=t.length?(h.push(i),n()):(h.push(i),f.content=e.joinChunks(h),r(void 0,f)):void r("UNEXPECTED_ENDING")})}()}}]),e}(),l=function(){function e(){r(this,e)}return u(e,null,[{key:"getArrayBuffer",value:function(e){return fetch(e).then(function(e){if(e.ok)return e.arrayBuffer();throw new a.FetchFails}).then(function(e){return e})}},{key:"createUrl",value:function(e){return window.URL.createObjectURL(e)}},{key:"getBlobUrl",value:function(e,t){return window.URL.createObjectURL(new Blob([e],{type:t}))}},{key:"getDataUrl",value:function(e,t){return"data:"+t+";base64,"+window.nacl.util.encodeBase64(e)}}]),e}();e.exports=i},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}var o=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),i=function(){function e(t){r(this,e),this.data=t||{}}return o(e,[{key:"getPermission",value:function(e){return this.data[e]}},{key:"setPermission",value:function(e,t){this.data[e]=t}},{key:"getData",value:function(){return this.data}}]),e}();e.exports=i},,,,,,,,,,function(e,t,n){e.exports=n(19)}])});
\ No newline at end of file
+!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define([],t):"object"==typeof exports?exports.MediaTag=t():e.MediaTag=t()}(this,function(){return function(e){function t(r){if(n[r])return n[r].exports;var o=n[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,t),o.l=!0,o.exports}var n={};return t.m=e,t.c=n,t.d=function(e,n,r){t.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},t.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(n,"a",n),n},t.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},t.p="",t(t.s=63)}([function(e,t,n){"use strict";var r={IMAGE:"image",AUDIO:"audio",VIDEO:"video",PDF:"pdf",DASH:"dash",DOWNLOAD:"download",CRYPTO:"crypto",CLEAR_KEY:"clear-key",MEDIA_OBJECT:"media-object"};e.exports=r},function(e,t,n){"use strict";var r={MATCHER:"matcher",RENDERER:"renderer",FILTER:"filter",SANITIZER:"sanitizer"};e.exports=r},function(e,t,n){"use strict";function r(e){if(e instanceof Array){var t=[];return e.forEach(function(e){if(e.mediaObject)t.push(e.mediaObject);else{new c(e,r.processingEngine).mediaObjects.forEach(function(e){t.push(r.processingEngine.start(e))})}}),t}new c(e,r.processingEngine).mediaObjects.forEach(function(e){r.processingEngine.start(e)})}var o=n(31),i=n(33),u=n(34),a=n(35),c=n(36);r.pluginStore=r.pluginStore||new u,r.uriStore=r.uriStore||new a("../plugins"),r.processingEngine=r.processingEngine||new o(r.pluginStore),r.matchingEngine=r.matchingEngine||new i(r.pluginStore,r.uriStore),r.loadingEngine=null,e.exports=r},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function i(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}var u=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),a=n(1),c=n(5),s=n(6),f=function(e){function t(e,n){r(this,t);var i=o(this,(t.__proto__||Object.getPrototypeOf(t)).call(this,e,a.MATCHER,c.ANY));return i.targetType=n,i}return i(t,e),u(t,[{key:"getTargetType",value:function(){return this.targetType}}]),t}(s);e.exports=f},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function i(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}var u=n(1),a=n(5),c=n(6),s=function(e){function t(e){return r(this,t),o(this,(t.__proto__||Object.getPrototypeOf(t)).call(this,e,u.RENDERER,a.ONCE))}return i(t,e),t}(c);e.exports=s},function(e,t,n){"use strict";var r={EVERY:"every",ANY:"any",ONCE:"once"};e.exports=r},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}var o=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),i=function(){function e(t,n,o){r(this,e),this.identifier=t,this.type=n,this.occurrence=o}return o(e,[{key:"getIdentifier",value:function(){if(this.identifier)return this.identifier;throw new Error("Plugin has not identifier")}},{key:"getType",value:function(){if(this.type)return this.type;throw new Error("Plugin has no type")}},{key:"start",value:function(e){return this.process(e)}}]),e}();e.exports=i},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function i(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}var u=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),a=n(11),c=n(0),s=n(8),f=function(e){function t(){return r(this,t),o(this,(t.__proto__||Object.getPrototypeOf(t)).call(this,c.CRYPTO))}return i(t,e),u(t,[{key:"process",value:function(e){var n=e.getAttribute("data-crypto-key"),r=/\w+:/.exec(n);if(null===r)throw new Error("No algorithm scheme found in data-crypto-key");var o=r[0],i=o.replace(":",""),u=n.replace(o,"");if(e.setAttribute("data-crypto-key",u),!t.functionStore.isStored(i))throw new Error("Algorithm "+i+" is not registered");t.functionStore.get(i)(e)}}]),t}(a);f.functionStore=f.functionStore||new s,f.mediaTypes=[],f.setAllowedMediaTypes=function(e){f.mediaTypes=e},f.getAllowedMediaTypes=function(){return f.mediaTypes},f.addAllowedMediaType=function(e){f.mediaTypes.push(e)},f.addAllAllowedMediaTypes=function(e){e.forEach(function(e){f.addAllowedMediaType(e)})},f.removeAllowedMediaType=function(e){var t=f.mediaTypes.indexOf(e);t>=0&&f.mediaTypes.splice(t,1)},f.removeAllAllowedMediaTypes=function(e){e.forEach(function(e){f.removeAllowedMediaType(e)})},f.isAllowedMediaType=function(e){return f.mediaTypes.some(function(t){return t===e})},e.exports=f},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}var o=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),i=function(){function e(){r(this,e),this.map={}}return o(e,[{key:"isStored",value:function(e){return!!this.get(e)}},{key:"store",value:function(e,t){this.isStored(e)&&console.warn('The key "'+e+'" is already registered, the content will be overwritten.'),this.map[e]=t}},{key:"unstore",value:function(e){if(!1!==this.isStored(e)){var t=this.map[e];return delete this.map[e],t}console.warn('The key "'+e+'" not exists in this manager')}},{key:"get",value:function(e){return this.map[e]}},{key:"keys",value:function(){return Object.keys(this.map)}},{key:"values",value:function(){var e=this;return this.keys().map(function(t){return e.get(t)})}}]),e}();e.exports=i},function(e,t,n){"use strict";var r=n(16),o=n(15);e.exports=function(e,t){t.mediaObjects.forEach(function(e){r(e)}),t.activeMediaObject=e,o(e)}},,function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function i(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}var u=n(1),a=n(5),c=n(6),s=function(e){function t(e){return r(this,t),o(this,(t.__proto__||Object.getPrototypeOf(t)).call(this,e,u.FILTER,a.ANY))}return i(t,e),t}(c);e.exports=s},,function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}var o=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),i=function(){function e(t){r(this,e),this.truth=t}return o(e,[{key:"is",value:function(e){if(this.truth===e)return this;throw new Error("Assertion fail on : "+this.truth+" is "+e)}},{key:"not",value:function(e){if(this.truth!==e)return this;throw new Error("Assertion fail on : "+this.truth+" is not "+e)}}],[{key:"that",value:function(t){return new e(t)}}]),e}();e.exports=i},function(e,t,n){"use strict";var r={ALLOWED:0,REQUIRED:1,FORBIDDEN:2};e.exports=r},function(e,t,n){"use strict";e.exports=function(e){e.element.style.display="block";var t=!0,n=!1,r=void 0;try{for(var o,i=e.hookedFns.children()[Symbol.iterator]();!(t=(o=i.next()).done);t=!0){o.value.style.display="block"}}catch(e){n=!0,r=e}finally{try{!t&&i.return&&i.return()}finally{if(n)throw r}}}},function(e,t,n){"use strict";e.exports=function(e){e.element.style.display="none";var t=!0,n=!1,r=void 0;try{for(var o,i=e.hookedFns.children()[Symbol.iterator]();!(t=(o=i.next()).done);t=!0){o.value.style.display="none"}}catch(e){n=!0,r=e}finally{try{!t&&i.return&&i.return()}finally{if(n)throw r}}}},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}var o=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),i=function(){function e(t){var n=this;r(this,e),Object.keys(t.attributes).forEach(function(e){n[t.attributes[e].name]=t.attributes[e].value})}return o(e,[{key:"getAttribute",value:function(e){return this[e]}},{key:"setAttribute",value:function(e,t){this[e]=t}},{key:"removeAttribute",value:function(e){delete this[e]}},{key:"hasAttributes",value:function(){return Object.keys(this)>0}}]),e}();e.exports=i},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function i(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}var u={PluginExists:function(e){function t(e){return r(this,t),o(this,(t.__proto__||Object.getPrototypeOf(t)).call(this,'Plugin with same "'+e.identifier+'" identifier found.'))}return i(t,e),t}(Error),TypeNotFound:function(e){function t(){return r(this,t),o(this,(t.__proto__||Object.getPrototypeOf(t)).call(this,"Media Tag could not find the content type of an instance.}."))}return i(t,e),t}(Error),FilterExists:function(e){function t(e){return r(this,t),o(this,(t.__proto__||Object.getPrototypeOf(t)).call(this,'Filter with same "'+e.identifier+' identifier found."'))}return i(t,e),t}(Error),FetchFail:function(e){function t(e){return r(this,t),o(this,(t.__proto__||Object.getPrototypeOf(t)).call(this,'Could not fetch "'+e.url+'", received "'+e.status+": "+e.statusText+'".'))}return i(t,e),t}(Error),InvalidCryptoKey:function(e){function t(){return r(this,t),o(this,(t.__proto__||Object.getPrototypeOf(t)).call(this,"Invalid cryptographic key."))}return i(t,e),t}(Error),InvalidCryptoLib:function(e){function t(){return r(this,t),o(this,(t.__proto__||Object.getPrototypeOf(t)).call(this,"Invalid cryptographic algorithm name."))}return i(t,e),t}(Error),FailedCrypto:function(e){function t(e){return r(this,t),o(this,(t.__proto__||Object.getPrototypeOf(t)).call(this,"Failed to decrypt file"+(e&&e.message?" "+e.message:"")+"."))}return i(t,e),t}(Error)};e.exports=u},function(e,t,n){"use strict";var r=n(21),o=n(43),i=n(44),u=n(45),a=n(46),c=n(47),s=n(48),f=n(7),l=n(49),p=n(50);r.pluginStore.store(new o),r.pluginStore.store(new i),r.pluginStore.store(new u),r.pluginStore.store(new a),r.pluginStore.store(new c),r.pluginStore.store(new s),r.pluginStore.store(new f),r.pluginStore.store(new l),r.pluginStore.store(new p);var y=n(51),h=n(52);f.functionStore.store("salsa20poly1305",y),f.functionStore.store("cryptpad",h);var b=new s("<p> MediaTag cannot find a plugin able to renderer your content </p>","Download");r.processingEngine.setDefaultPlugin(b),r.CryptoFilter=f;var d=["image/png","image/jpeg","image/jpg","image/gif","audio/mp3","audio/ogg","audio/wav","audio/webm","video/mp4","video/ogg","video/webm","application/pdf","application/dash+xml","download"];r.CryptoFilter.setAllowedMediaTypes(d);var v=n(53),g=(n(14),n(0),new v);r.PdfPlugin=a,r.PdfPlugin.viewer="/pdfjs/web/viewer.html",r.processingEngine.configure(g),e.exports=r},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function i(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}var u=n(1),a=n(5),c=n(6),s=function(e){function t(e){return r(this,t),o(this,(t.__proto__||Object.getPrototypeOf(t)).call(this,e,u.SANITIZER,a.EVERY))}return i(t,e),t}(c);e.exports=s},function(e,t,n){"use strict";var r=n(22),o=n(23),i=n(24),u=n(25),a=n(26),c=n(27),s=n(28),f=n(29),l=n(30),p=n(2);p.pluginStore.store(new r),p.pluginStore.store(new o),p.pluginStore.store(new i),p.pluginStore.store(new u),p.pluginStore.store(new a),p.pluginStore.store(new c),p.pluginStore.store(new s),p.pluginStore.store(new f),p.pluginStore.store(new l),e.exports=p},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function i(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}var u=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),a=n(0),c=n(1),s=n(3),f=function(e){function t(){return r(this,t),o(this,(t.__proto__||Object.getPrototypeOf(t)).call(this,a.IMAGE,c.RENDERER))}return i(t,e),u(t,[{key:"process",value:function(e){var t=/^png|jpg|jpeg|gif|svg[+]xml$/,n=/^image[\/](png|jpeg|gif|svg[+]xml)$/;return e.hasAttribute("src")&&"image"===e.getType()&&null!==t.exec(e.getExtension())&&null!==n.exec(e.getMimeType())}}]),t}(s);e.exports=f},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function i(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}var u=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),a=n(0),c=n(1),s=n(3),f=function(e){function t(){return r(this,t),o(this,(t.__proto__||Object.getPrototypeOf(t)).call(this,a.AUDIO,c.RENDERER))}return i(t,e),u(t,[{key:"process",value:function(e){var t=/^mp3|ogg|webm|wav|mpeg$/,n=/^audio[\/](mp3|ogg|webm|wav|mpeg)$/;return e.hasAttribute("src")&&"audio"===e.getType()&&null!==t.exec(e.getExtension())&&null!==n.exec(e.getMimeType())}}]),t}(s);e.exports=f},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function i(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}var u=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),a=n(0),c=n(1),s=n(3),f=function(e){function t(){return r(this,t),o(this,(t.__proto__||Object.getPrototypeOf(t)).call(this,a.VIDEO,c.RENDERER))}return i(t,e),u(t,[{key:"process",value:function(e){var t=/^mp4|ogg|webm$/,n=/^video[\/](mp4|ogg|webm)$/;return e.hasAttribute("src")&&"video"===e.getType()&&null!==t.exec(e.getExtension())&&null!==n.exec(e.getMimeType())}}]),t}(s);e.exports=f},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function i(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}var u=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),a=n(0),c=n(1),s=n(3),f=function(e){function t(){return r(this,t),o(this,(t.__proto__||Object.getPrototypeOf(t)).call(this,a.PDF,c.RENDERER))}return i(t,e),u(t,[{key:"process",value:function(e){var t=/^pdf$/,n=/^application[\/]pdf$/;return e.hasAttribute("src")&&"application"===e.getType()&&null!==t.exec(e.getExtension())&&null!==n.exec(e.getMimeType())}}]),t}(s);e.exports=f},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function i(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}var u=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),a=n(0),c=n(1),s=n(3),f=function(e){function t(){return r(this,t),o(this,(t.__proto__||Object.getPrototypeOf(t)).call(this,a.DASH,c.RENDERER))}return i(t,e),u(t,[{key:"process",value:function(e){var t=/^dash[+]xml$/,n=/^application[\/]dash[+]xml$/;return e.hasAttribute("src")&&"application"===e.getType()&&null!==t.exec(e.getExtension())&&null!==n.exec(e.getMimeType())}}]),t}(s);e.exports=f},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function i(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}var u=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),a=n(0),c=n(1),s=n(3),f=function(e){function t(){return r(this,t),o(this,(t.__proto__||Object.getPrototypeOf(t)).call(this,a.DOWNLOAD,c.RENDERER))}return i(t,e),u(t,[{key:"process",value:function(e){return e.hasAttribute("src")&&"download"===e.getType()}}]),t}(s);e.exports=f},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function i(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}var u=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),a=n(0),c=n(1),s=n(3),f=function(e){function t(){return r(this,t),o(this,(t.__proto__||Object.getPrototypeOf(t)).call(this,a.CRYPTO,c.FILTER))}return i(t,e),u(t,[{key:"process",value:function(e){return e.hasAttribute("data-crypto-key")}}]),t}(s);e.exports=f},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function i(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}var u=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),a=n(0),c=n(1),s=n(3),f=function(e){function t(){return r(this,t),o(this,(t.__proto__||Object.getPrototypeOf(t)).call(this,a.CLEAR_KEY,c.FILTER))}return i(t,e),u(t,[{key:"process",value:function(e){return e.hasAttribute("data-clear-key")}}]),t}(s);e.exports=f},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function i(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}var u=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),a=n(0),c=n(1),s=n(3),f=function(e){function t(){return r(this,t),o(this,(t.__proto__||Object.getPrototypeOf(t)).call(this,a.MEDIA_OBJECT,c.SANITIZER))}return i(t,e),u(t,[{key:"process",value:function(e){return e.hasAttribute("src")&&e.hasAttribute("data-type")}}]),t}(s);e.exports=f},function(e,t,n){"use strict";function r(e){if(Array.isArray(e)){for(var t=0,n=Array(e.length);t<e.length;t++)n[t]=e[t];return n}return Array.from(e)}function o(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}var i=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),u=n(13),a=n(1),c=n(32),s=n(14),f=function(){function e(t){o(this,e),u.that(t).not(void 0),this.pluginStore=t,this.stacks={},this.snapshots={},this.stats=[],this.defaultPlugin=null}return i(e,[{key:"configure",value:function(e){this.configuration=e}},{key:"start",value:function(e){e.state="processing",this.routine(e),this.run(e)}},{key:"run",value:function(e){var t=this.stackTop(e);if(!t)return e.state="processed",e;if(this.configuration)if(this.configuration.getPermission(t.identifier)===s.FORBIDDEN){var n=this.stats[e.getId()];n.skipped||(n.skipped=[]),n.skipped.push(t.identifier),this.return(e)}else t.process(e);else t.process(e)}},{key:"routine",value:function(e){this.fill(e),this.snapshot(e),this.check(e)}},{key:"snapshot",value:function(e){var t=e.getId();if(this.stacks[t]){var n=[];this.stacks[t].forEach(function(e){var t={};t.identifier=e.getIdentifier(),t.type=e.getType(),n.push(t)}),this.snapshots[t]?this.snapshots[t].push({stack:n}):this.snapshots[t]=[{stack:n}]}else this.snapshots[t]=[]}},{key:"fill",value:function(e){var t=e.getId(),n=this.pluginStore.getPlugins(a.MATCHER),o=n.filter(function(t){return t.process(e)}),i=o.map(function(e){return e.getIdentifier()}),u=this.pluginStore.values(),s=u.filter(function(e){return e.type!==a.MATCHER&&i.includes(e.identifier)}),f=c.filterByOccurrencies(s),l=this.substack(e,f);if(this.stacks[t]){var p;(p=this.stacks[t]).push.apply(p,r(l))}else this.stacks[t]=l}},{key:"substack",value:function(e,t){var n=this,r=[];return t.once.forEach(function(t){n.configuration&&n.configuration.getPermission(t.identifier)===s.FORBIDDEN?n.skip(e,t):n.isStacked(e,t)||r.push(t)}),t.any.forEach(function(t){n.configuration&&n.configuration.getPermission(t.identifier)===s.FORBIDDEN?n.skip(e,t):n.isStacked(e,t)||r.push(t)}),t.every.forEach(function(t){n.configuration&&n.configuration.getPermission(t.identifier)===s.FORBIDDEN?n.skip(e,t):r.push(t)}),r}},{key:"skip",value:function(e,t){var n=this.stats[e.getId()];n?n.skipped||(n.skipped=[]):n={skipped:[]},n.skipped.push(t.identifier)}},{key:"unstack",value:function(e){var t=e.getId();return this.stacks[t]?this.stacks[t].pop():null}},{key:"stackTop",value:function(e){var t=e.getId();return this.stacks[t]?this.stacks[t][this.stacks[t].length-1]:null}},{key:"check",value:function(t){var n=t.getId();if(this.stacks[n].length>=e.STACK_LIMIT)throw console.error(this.snapshots[n]),new Error("Plugin stack size exceed");if(this.snapshots[n].length>=e.SNAPSHOT_LIMIT)throw console.error(this.snapshots[n]),new Error("Plugin snapshots size exceed");var r=0;if(this.stacks[n].forEach(function(e){e.type===a.RENDERER&&r++}),r>1)throw console.error(this.snapshots[n]),new Error("More of one renderer in the stack");if(0===this.stacks[n].length&&!this.stats[n][a.RENDERER]){if(!this.defaultPlugin)throw new Error("No default plugin assignated");this.stacks[n].unshift(this.defaultPlugin)}}},{key:"return",value:function(e){var t=e.getId(),n=this.unstack(e);if(n){try{this.stats[t]||(this.stats[t]={}),this.stats[t][n.type]?this.stats[t][n.type]+=1:this.stats[t][n.type]=1}catch(e){console.error(e,this.snapshots[t])}0===this.stacks[t].length&&n.type===a.RENDERER?this.run(e):n.type!==a.SANITIZER&&this.fill(e),this.snapshot(e),this.check(e),this.run(e)}}},{key:"process",value:function(e){var t=e.getId(),n=this.stacks[t].length,r=this.stacks[t][n-1];if(!r)throw console.log(this.stacks),new Error("Impossible to run a undefined plugin");r.process(e)}},{key:"isStacked",value:function(e,t){var n=e.getId();return!(!this.stacks[n]||!this.stacks[n].includes(t))}},{key:"setDefaultPlugin",value:function(e){this.defaultPlugin=e}}]),e}();f.STACK_LIMIT=100,f.SNAPSHOT_LIMIT=100,e.exports=f},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}var o=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),i=function(){function e(){r(this,e)}return o(e,null,[{key:"filterByOccurrence",value:function(e,t){return e.filter(function(e){return e.occurrence===t})}},{key:"filterByOccurrencies",value:function(e){var t={once:[],any:[],every:[]},n=!0,r=!1,o=void 0;try{for(var i,u=e[Symbol.iterator]();!(n=(i=u.next()).done);n=!0){var a=i.value;t[a.occurrence]?t[a.occurrence].push(a):t[a.occurrence]=Array.of(a)}}catch(e){r=!0,o=e}finally{try{!n&&u.return&&u.return()}finally{if(r)throw o}}return t}}]),e}();e.exports=i},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}var o=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),i=n(13),u=n(1),a=function(){function e(t,n){r(this,e),i.that(t).not(void 0),i.that(n).not(void 0),this.pluginStore=t,this.uriStore=n}return o(e,[{key:"start",value:function(e){var t=this,n=this.pluginStore.getPlugins(u.MATCHER),r=n.filter(function(t){return t.process(e)}),o=r.map(function(e){return e.getIdentifier()}),i={};return o.forEach(function(e){if(!t.uriStore)throw new Error("No map registrated for the matching engine");var n=t.uriStore.get(e);if(void 0===n)throw new Error("No uri related to identifier : "+e);i[e]=n}),i}}]),e}();e.exports=a},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function i(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}var u=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),a=function e(t,n,r){null===t&&(t=Function.prototype);var o=Object.getOwnPropertyDescriptor(t,n);if(void 0===o){var i=Object.getPrototypeOf(t);return null===i?void 0:e(i,n,r)}if("value"in o)return o.value;var u=o.get;if(void 0!==u)return u.call(r)},c=n(8),s=function(e){function t(){return r(this,t),o(this,(t.__proto__||Object.getPrototypeOf(t)).apply(this,arguments))}return i(t,e),u(t,[{key:"getPlugins",value:function(e){return this.values().filter(function(t){return t.type===e})}},{key:"store",value:function(e){a(t.prototype.__proto__||Object.getPrototypeOf(t.prototype),"store",this).call(this,[e.identifier,e.type],e)}},{key:"unstore",value:function(e){if(!1!==t.isStored([e.identifier,e.type]))return a(t.prototype.__proto__||Object.getPrototypeOf(t.prototype),"unstore",this).call(this,[e.identifier,e.type]);console.warn('The key "'+[e.identifier,e.type]+'" not exists in this manager')}}]),t}(c);e.exports=s},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function i(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}var u=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),a=function e(t,n,r){null===t&&(t=Function.prototype);var o=Object.getOwnPropertyDescriptor(t,n);if(void 0===o){var i=Object.getPrototypeOf(t);return null===i?void 0:e(i,n,r)}if("value"in o)return o.value;var u=o.get;if(void 0!==u)return u.call(r)},c=n(8),s=function(e){function t(e){r(this,t);var n=o(this,(t.__proto__||Object.getPrototypeOf(t)).call(this));return n.targetDirectory=e,n}return i(t,e),u(t,[{key:"store",value:function(e,n){var r=this.targetDirectory+"/"+n+"s/"+e;a(t.prototype.__proto__||Object.getPrototypeOf(t.prototype),"store",this).call(this,e,r)}},{key:"unstore",value:function(e){return a(t.prototype.__proto__||Object.getPrototypeOf(t.prototype),"unstore",this).call(this,e)}}]),t}(c);e.exports=s},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}var o=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),i=n(37),u=n(17),a=n(41),c=function(){function e(t,n){var o=this;r(this,e),this.mediaTagElement=t,this.processingEngine=n;var c=new u(t),s=c.getAttribute("sources")||c.getAttribute("srcs");if(s){var f=this.extractSourceObjects(s),l=this.extractMediaElements(f);this.mediaElements=l,this.mediaElements.forEach(function(e){o.mediaTagElement.appendChild(e)}),this.mediaObjects=this.createMediaObjects(l),i.activate(this.mediaObjects[0],this)}else{var p=new a(t);this.mediaObjects=[p],this.activeMediaObject=this.mediaObjects[0]}}return o(e,[{key:"extractSourceObjects",value:function(e){return JSON.parse(e)}},{key:"extractMediaElements",value:function(e){var t=this,n=[];return e.forEach(function(e){n.push(t.extractMediaElement(e))}),n}},{key:"extractMediaElement",value:function(e){var t=document.createElement("media");return Object.keys(e).forEach(function(n){t.setAttribute(n,e[n])}),t}},{key:"createMediaObjects",value:function(e){var t=[];return e.forEach(function(e){var n=new a(e);t.push(n)}),t}}]),e}();e.exports=c},function(e,t,n){"use strict";var r={clear:n(38),show:n(15),hide:n(16),upgrade:n(39),downgrade:n(40),activate:n(9)};e.exports=r},function(e,t,n){"use strict";e.exports=function(e){e.clearContents()}},function(e,t,n){"use strict";var r=n(9);e.exports=function(e){var t=e.mediaObjects.indexOf(e.activeMediaObject);t<e.mediaObjects.length&&r(e.mediaObjects[t+1],e)}},function(e,t,n){"use strict";var r=n(9);e.exports=function(e){var t=e.mediaObjects.indexOf(e.activeMediaObject);t>0&&r(e.mediaObjects[t-1],e)}},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}var o=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),i=n(17),u=n(42),a=function(){function e(t){r(this,e),this.id=e.uid(),this.element=t,this.state="idle",this.attributesObject=new i(t);var n=u.parse(this.attributesObject),o=!0,a=!1,c=void 0;try{for(var s,f=Object.keys(n)[Symbol.iterator]();!(o=(s=f.next()).done);o=!0){var l=s.value;this[l]=n[l]}}catch(e){a=!0,c=e}finally{try{!o&&f.return&&f.return()}finally{if(a)throw c}}this.hookedFns={hasChildNodes:t.hasChildNodes.bind(t),removeChild:t.removeChild.bind(t),getLastChild:function(){return t.lastChild},appendChild:t.appendChild.bind(t),children:function(){return t.children}}}return o(e,[{key:"setProperties",value:function(e){for(var t in e){if(this[t])throw new Error("The property "+t+" already exists in this MediaObject !");this[t]=e[t]}}},{key:"getId",value:function(){return this.id}},{key:"getAttribute",value:function(e){return this.attributesObject[e]}},{key:"setAttribute",value:function(e,t){this.attributesObject[e]=t}},{key:"removeAttribute",value:function(e){delete this.attributesObject[e]}},{key:"getAllDataAttrKeys",value:function(){return Object.keys(this.attributesObject).filter(function(e){return e.startsWith("data-attr")})}},{key:"getExtension",value:function(){return this.extension}},{key:"getMimeType",value:function(){return this.mime}},{key:"hasAttribute",value:function(e){return e in this.attributesObject}},{key:"getType",value:function(){return this.type}},{key:"getSource",value:function(){return this.src}},{key:"getSources",value:function(){return this.sources}},{key:"clearContents",value:function(){for(;this.hookedFns.hasChildNodes();)this.hookedFns.removeChild(this.hookedFns.getLastChild())}},{key:"replaceContents",value:function(e){var t=this;this.clearContents(),e.forEach(function(e){return t.hookedFns.appendChild(e)})}},{key:"utilsSetAllDataAttributes",value:function(e){var t=this;this.getAllDataAttrKeys().forEach(function(n){return e.setAttribute(n.substr(10),t.getAttribute(n))})}},{key:"utilsPassAllDataAttributes",value:function(e){var t=this;this.getAllDataAttrKeys().forEach(function(n){return e.setAttribute(n,t.getAttribute(n))})}}]),e}();a.uid=function(e){return function(){return e++}}(0),a.attributesObject=function(e){var t={};if(e.hasAttributes()){var n=e.attributes;Object.keys(n).forEach(function(e){var r=n[e];t[r.name]=r.value})}return t.hasAttribute=function(e){return t[e]},t},e.exports=a},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}var o=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),i=function(){function e(){r(this,e)}return o(e,null,[{key:"extension",value:function(e){var t=e.getAttribute("data-type");if(t)return t.split("/")[1]}},{key:"type",value:function(e){var t=e.getAttribute("data-type");if(t)return t.split("/")[0]}},{key:"mime",value:function(e){return e.getAttribute("data-type")}},{key:"protocol",value:function(e){var t=e.getAttribute("src").split("://");return t.length>1?t[0]:window.location.protocol}},{key:"hostname",value:function(e){var t=e.getAttribute("src").split("://");return t.length>1?t[1].split("/")[0]:window.location.hostname}},{key:"source",value:function(e){return e.getAttribute("src")}},{key:"schemes",value:function(e){return/\w+:/.exec(e.getAttribute("src"))}},{key:"sources",value:function(e){var t=e.getAttribute("sources")||e.getAttribute("srcs");return t?JSON.parse(t):null}},{key:"actions",value:function(e){var t=e.getAttribute("actions");return t?JSON.parse(t):null}},{key:"parse",value:function(t){return{protocol:e.protocol(t),hostname:e.hostname(t),src:e.source(t),type:e.type(t),extension:e.extension(t),mime:e.mime(t),sources:e.sources(t),actions:e.actions(t)}}}]),e}();e.exports=i},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function i(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}var u=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),a=n(4),c=n(0),s=n(2),f=function(e){function t(){return r(this,t),o(this,(t.__proto__||Object.getPrototypeOf(t)).call(this,c.IMAGE))}return i(t,e),u(t,[{key:"process",value:function(e){var t=document.createElement("img");t.setAttribute("src",e.getAttribute("src")),e.utilsSetAllDataAttributes(t),e.replaceContents([t]),s.processingEngine.return(e)}}]),t}(a);e.exports=f},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function i(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}var u=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),a=n(4),c=n(0),s=n(2),f=function(e){function t(){return r(this,t),o(this,(t.__proto__||Object.getPrototypeOf(t)).call(this,c.AUDIO))}return i(t,e),u(t,[{key:"process",value:function(e){var t=document.createElement("audio");t.setAttribute("src",e.getAttribute("src")),t.setAttribute("controls",!0),e.utilsSetAllDataAttributes(t),e.replaceContents([t]),s.processingEngine.return(e)}}]),t}(a);e.exports=f},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function i(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}var u=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),a=n(4),c=n(0),s=n(2),f=function(e){function t(){return r(this,t),o(this,(t.__proto__||Object.getPrototypeOf(t)).call(this,c.VIDEO))}return i(t,e),u(t,[{key:"process",value:function(e){var t=document.createElement("video");t.setAttribute("src",e.getAttribute("src")),t.setAttribute("controls",!0),e.utilsSetAllDataAttributes(t),e.replaceContents([t]),s.processingEngine.return(e)}}]),t}(a);e.exports=f},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function i(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}var u=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),a=n(4),c=n(0),s=n(2),f={PDFJS:"pdfjs",DEFAULT:"default"},l=function(e){function t(){return r(this,t),o(this,(t.__proto__||Object.getPrototypeOf(t)).call(this,c.PDF))}return i(t,e),u(t,[{key:"process",value:function(e){var n=e.name||e.metadata&&e.metadata.name,r=e.getAttribute("src")+"#"+window.encodeURIComponent(n),o=document.createElement("iframe");switch(e.getAttribute("data-attr-width")||o.setAttribute("width","100%"),e.getAttribute("data-attr-height")||o.setAttribute("height",document.body.scrollHeight),t.viewer||(t.mode=f.DEFAULT),t.mode){case f.PDFJS:var i=t.viewer+"?file="+r,u=new XMLHttpRequest;u.onload=function(){u.status<400?o.src=i:(console.warn("The pdfjs viewer has not been found ...\n\t\t\t\t\t\t\tThe browser viewer will be used by default"),o.src=""+r)},u.open("HEAD",i,!0),u.send();break;default:o.src=""+r}e.utilsSetAllDataAttributes(o),e.replaceContents([o]),o.onload=function(){s.processingEngine.return(e)}}}]),t}(a);l.viewer=null,l.mode=f.PDFJS,e.exports=l},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function i(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}var u=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),a=n(4),c=n(0),s=n(2),f=function(e){function t(){return r(this,t),o(this,(t.__proto__||Object.getPrototypeOf(t)).call(this,c.DASH))}return i(t,e),u(t,[{key:"process",value:function(e){var t=document.createElement("video"),n=new shaka.Player(t),r=e.getAttribute("id"),o=e.getAttribute("key");if(r&&o){var i='{"'+r+'": "'+o+'"}',u=JSON.parse(i);n.configure({drm:{clearKeys:u}})}t.setAttribute("controls",!0),e.utilsSetAllDataAttributes(t),e.replaceContents([t]),n.load(e.getAttribute("src")).then(function(){}),s.processingEngine.return(e)}}]),t}(a);e.exports=f},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function i(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}var u=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),a=n(4),c=n(0),s=n(2),f=function(e){function t(e,n){r(this,t);var i=o(this,(t.__proto__||Object.getPrototypeOf(t)).call(this,c.DOWNLOAD));return i.message=e,i.buttonMessage=n||"Download",i}return i(t,e),u(t,[{key:"process",value:function(e){var t=document.createElement("button");t.innerHTML=this.buttonMessage,t.onclick=function(){var t=new XMLHttpRequest,n=e.getAttribute("src");t.open("GET",n,!0),t.responseType="blob",t.onload=function(){var n=t.response;if(n)if(e.name)saveAs(n,e.name);else if(e.getAttribute("data-attr-type")){var r=e.getAttribute("data-attr-type"),o=r.split("/"),i=new File([n],"download."+(o[1]||"txt"),{type:r});saveAs(i)}else saveAs(n)},t.send()},e.utilsSetAllDataAttributes(t),e.replaceContents([t]),s.processingEngine.return(e)}}]),t}(a);e.exports=f},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function i(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}var u=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),a=n(11),c=n(0),s=n(2),f=function(e){function t(){return r(this,t),o(this,(t.__proto__||Object.getPrototypeOf(t)).call(this,c.CLEAR_KEY))}return i(t,e),u(t,[{key:"process",value:function(e){var t=e.getAttribute("data-clear-key"),n=t.substring(0,32),r=t.substring(33,65);e.setAttribute("id",n),e.setAttribute("key",r),e.removeAttribute("data-clear-key"),s.processingEngine.return(e)}}]),t}(a);e.exports=f},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function i(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}var u=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),a=n(20),c=n(0),s=n(2),f=function(e){function t(){return r(this,t),o(this,(t.__proto__||Object.getPrototypeOf(t)).call(this,c.MEDIA_OBJECT))}return i(t,e),u(t,[{key:"process",value:function(e){s.processingEngine.return(e)}}]),t}(a);e.exports=f},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){s.isAllowedMediaType(t.type)&&(e.setAttribute("data-type",t.type),e.type=t.type,e.extension=t.extension,e.mime=t.mime)}function i(e){var t=e.getAttribute("src"),n=e.getAttribute("data-crypto-key"),r=f.getKeyFromStr(n),i=new XMLHttpRequest;i.open("GET",t,!0),i.responseType="arraybuffer",i.onload=function(){var t=i.response;if(t){var n=new Uint8Array(t),u=f.decrypt(n,r),a=l.getBlobUrl(u,e.getMimeType()),s=new Event("decryption");s.blob=new Blob([u],{type:e.getMimeType()}),window.document.dispatchEvent(s),e.setAttribute("src",a),e.removeAttribute("data-crypto-key"),e.hasAttribute("data-type")||o(e,{type:"image",extension:"png",mime:"image/png"}),c.processingEngine.return(e)}},i.send(null)}var u=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),a=n(18),c=n(2),s=n(7),f=function(){function e(){r(this,e)}return u(e,null,[{key:"slice",value:function(e){return Array.prototype.slice.call(e)}},{key:"getRandomKeyStr",value:function(){var t=e.Nacl,n=t.randomBytes(18);return t.util.encodeBase64(n)}},{key:"getKeyFromStr",value:function(t){var n=e.Nacl;return n.hash(n.util.decodeBase64(t)).subarray(32,64)}},{key:"encrypt",value:function(t,n){var r=t,o=e.Nacl.randomBytes(24),i=e.Nacl.secretbox(r,o,n);if(i)return new Uint8Array(e.slice(o).concat(e.slice(i)));throw new Error}},{key:"decrypt",value:function(t,n){if(t.length<24)throw new Error;var r=e.slice,o=e.Nacl,i=new Uint8Array(r(t).slice(0,24)),u=new Uint8Array(r(t).slice(24)),a=o.secretbox.open(u,i,n);if(a)return a;throw new Error("Decrypted file in undefined")}}]),e}();f.Nacl=window.nacl;var l=function(){function e(){r(this,e)}return u(e,null,[{key:"getArrayBuffer",value:function(e){return fetch(e).then(function(e){if(e.ok)return e.arrayBuffer();throw new a.FetchFails}).then(function(e){return e})}},{key:"createUrl",value:function(e){return window.URL.createObjectURL(e)}},{key:"getBlobUrl",value:function(e,t){return window.URL.createObjectURL(new Blob([e],{type:t}))}},{key:"getDataUrl",value:function(e,t){return"data:"+t+";base64,"+f.Nacl.util.encodeBase64(e)}}]),e}();e.exports=i},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){var n=t.type.split("/"),r=t.type,o=n[0],i=n[1];s.isAllowedMediaType(r)?(e.setAttribute("data-type",t.type),e.type=o,e.extension=i,e.mime=r):console.log("Not allowed metadata, allowed ones are : ",s.getAllowedMediaTypes()),e.name=t.name,e.setAttribute("data-attr-type",t.type)}function i(e){var t=e.getAttribute("src"),n=e.getAttribute("data-crypto-key"),r=f.getKeyFromStr(n),i=new XMLHttpRequest,u=[t,n].join(""),a=function(t){var n=new Event("decryption");n.metadata=t.metadata,o(e,t.metadata);var r=t.content,i=l.getBlobUrl(r,e.getMimeType());n.blob=new Blob([r],{type:e.getMimeType()}),n.metadata=t.metadata,s.addAllowedMediaType("audio/mpeg"),e.setAttribute("src",i),e.removeAttribute("data-crypto-key"),/audio\/(mp3|ogg|wav|webm|mpeg)/.test(t.metadata.type)||/application\/pdf/.test(t.metadata.type)||/video\//.test(t.metadata.type)||/image\/(png|jpeg|jpg|gif)/.test(t.metadata.type)||(t.metadata.type="download"),o(e,t.metadata),n.callback=function(t){c.processingEngine.return(e),"function"==typeof t&&t(e)},window.document.dispatchEvent(n)},p=c.__Cryptpad_Cache=c.__Cryptpad_Cache||{};if(p[u])return setTimeout(function(){a(p[u])});i.open("GET",t,!0),i.responseType="arraybuffer";var y=function(e){var t=new Event("decryptionError");t.message="string"==typeof e?e:e.message,window.document.dispatchEvent(t)};i.onload=function(){if(/^4/.test(""+this.status))return y("XHR_ERROR",this.status);var e=i.response;if(e){var t=new Uint8Array(e);f.decrypt(t,r,function(e,t){if(e)return y(e);p[u]=t,a(t)})}},i.send(null)}var u=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),a=n(18),c=n(2),s=n(7),f=function(){function e(){r(this,e)}return u(e,null,[{key:"createNonce",value:function(){return new Uint8Array(new Array(24).fill(0))}},{key:"increment",value:function(e){for(var t=e.length;t-- >1;){if("number"!=typeof e[t])throw new Error("E_UNSAFE_TYPE");if(e[t]>255)throw new Error("E_OUT_OF_BOUNDS");if(255!==e[t])return void e[t]++;if(e[t]=0,0===t)throw new Error("E_NONCE_TOO_LARGE")}}},{key:"encodePrefix",value:function(e){return[65280,255].map(function(t,n){return(e&t)>>8*(1-n)})}},{key:"decodePrefix",value:function(e){return e[0]<<8|e[1]}},{key:"joinChunks",value:function(e){return new Blob(e)}},{key:"slice",value:function(e){return Array.prototype.slice.call(e)}},{key:"getRandomKeyStr",value:function(){var e=window.nacl,t=e.randomBytes(18);return e.util.encodeBase64(t)}},{key:"getKeyFromStr",value:function(e){return window.nacl.util.decodeBase64(e)}},{key:"encrypt",value:function(){}},{key:"decrypt",value:function(t,n,r){var o=window.nacl,i=function(e){var n=new Event("decryptionProgress");n.percent=e/t.length*100,window.document.dispatchEvent(n)},u=e.createNonce(),a=0,c=t.subarray(0,2),s=e.decodePrefix(c),f={metadata:void 0},l=new Uint8Array(t.subarray(2,2+s)),p=o.secretbox.open(l,u,n);e.increment(u);try{f.metadata=JSON.parse(o.util.encodeUTF8(p))}catch(e){return r("E_METADATA_DECRYPTION")}if(!f.metadata)return r("NO_METADATA");var y=function(r){setTimeout(function(){var c=131088*a+2+s,f=c+131088;a++;var l=new Uint8Array(t.subarray(c,f)),p=o.secretbox.open(l,u,n);if(e.increment(u),!p)return void r("DECRYPTION_FAILURE");i(Math.min(f,t.length)),r(void 0,p)})},h=[];!function n(){y(function(o,i){return o?setTimeout(function(){r(o)}):i?2+s+131088*a<=t.length?(h.push(i),n()):(h.push(i),f.content=e.joinChunks(h),r(void 0,f)):void r("UNEXPECTED_ENDING")})}()}}]),e}(),l=function(){function e(){r(this,e)}return u(e,null,[{key:"getArrayBuffer",value:function(e){return fetch(e).then(function(e){if(e.ok)return e.arrayBuffer();throw new a.FetchFails}).then(function(e){return e})}},{key:"createUrl",value:function(e){return window.URL.createObjectURL(e)}},{key:"getBlobUrl",value:function(e,t){return window.URL.createObjectURL(new Blob([e],{type:t}))}},{key:"getDataUrl",value:function(e,t){return"data:"+t+";base64,"+window.nacl.util.encodeBase64(e)}}]),e}();e.exports=i},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}var o=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),i=function(){function e(t){r(this,e),this.data=t||{}}return o(e,[{key:"getPermission",value:function(e){return this.data[e]}},{key:"setPermission",value:function(e,t){this.data[e]=t}},{key:"getData",value:function(){return this.data}}]),e}();e.exports=i},,,,,,,,,,function(e,t,n){e.exports=n(19)}])});
\ No newline at end of file

From 080511efcd40e644402868a5eb2b037fcea6cda0 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Thu, 5 Oct 2017 17:01:39 +0200
Subject: [PATCH 15/20] add missing translation for hashtags

---
 customize.dist/translations/messages.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/customize.dist/translations/messages.js b/customize.dist/translations/messages.js
index a5a72066b..b4aadd799 100644
--- a/customize.dist/translations/messages.js
+++ b/customize.dist/translations/messages.js
@@ -385,6 +385,7 @@ define(function () {
     out.fc_remove = "Delete permanently";
     out.fc_empty = "Empty the trash";
     out.fc_prop = "Properties";
+    out.fc_hashtag = "Tags";
     out.fc_sizeInKilobytes = "Size in Kilobytes";
     // fileObject.js (logs)
     out.fo_moveUnsortedError = "You can't move a folder to the list of unsorted pads";

From 7559bc062e62db26710c215a89d76356a74f9ad3 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Thu, 5 Oct 2017 17:06:02 +0200
Subject: [PATCH 16/20] lint compliance

---
 www/drive/inner.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/www/drive/inner.js b/www/drive/inner.js
index d3c4777b1..a16c0d8f2 100644
--- a/www/drive/inner.js
+++ b/www/drive/inner.js
@@ -2522,6 +2522,8 @@ define([
             var paths = $(this).data('paths');
             //var path = $(this).data('path');
             //var $element = $(this).data('element');
+
+            var el;
             if (paths.length === 0) {
                 log(Messages.fm_forbidden);
                 debug("Directory context menu on a forbidden or unexisting element. ", paths);
@@ -2562,7 +2564,7 @@ define([
             }
             else if ($(this).hasClass("cp-app-drive-context-properties")) {
                 if (paths.length !== 1) { return; }
-                var el = filesOp.find(paths[0].path);
+                el = filesOp.find(paths[0].path);
                 getProperties(el, function (e, $prop) {
                     if (e) { return void logError(e); }
                     Cryptpad.alert($prop[0], undefined, true);
@@ -2570,7 +2572,7 @@ define([
             }
             else if ($(this).hasClass("cp-app-drive-context-hashtag")) {
                 if (paths.length !== 1) { return; }
-                var el = filesOp.find(paths[0].path);
+                el = filesOp.find(paths[0].path);
                 var data = filesOp.getFileData(el);
                 if (!data) { return void console.error("Expected to find a file"); }
                 var href = data.href;
@@ -2582,6 +2584,7 @@ define([
         $defaultContextMenu.on("click", "a", function(e) {
             e.stopPropagation();
             var paths = $(this).data('paths');
+            var el;
             if (paths.length === 0) {
                 log(Messages.fm_forbidden);
                 debug("Context menu on a forbidden or unexisting element. ", paths);
@@ -2621,7 +2624,7 @@ define([
             }
             else if ($(this).hasClass("cp-app-drive-context-properties")) {
                 if (paths.length !== 1) { return; }
-                var el = filesOp.find(paths[0].path);
+                el = filesOp.find(paths[0].path);
                 getProperties(el, function (e, $prop) {
                     if (e) { return void logError(e); }
                     Cryptpad.alert($prop[0], undefined, true);
@@ -2629,7 +2632,7 @@ define([
             }
             else if ($(this).hasClass("cp-app-drive-context-hashtag")) {
                 if (paths.length !== 1) { return; }
-                var el = filesOp.find(paths[0].path);
+                el = filesOp.find(paths[0].path);
                 var data = filesOp.getFileData(el);
                 if (!data) { return void console.error("Expected to find a file"); }
                 var href = data.href;

From 1c4f1c785d235c1af2ac509d8bb4a10d7bd6d7d8 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Thu, 5 Oct 2017 17:54:07 +0200
Subject: [PATCH 17/20] Improve stability and UI in poll and its comments

---
 customize.dist/pages.js                    |  10 +-
 customize.dist/translations/messages.fr.js |   5 +
 customize.dist/translations/messages.js    |   5 +
 www/poll/app-poll.less                     |  12 +-
 www/poll/inner.html                        |   2 +-
 www/poll/inner.js                          | 202 +++++++++++----------
 www/poll/render.js                         |   2 +-
 7 files changed, 136 insertions(+), 102 deletions(-)

diff --git a/customize.dist/pages.js b/customize.dist/pages.js
index 1f28dfcb9..5fac0939b 100644
--- a/customize.dist/pages.js
+++ b/customize.dist/pages.js
@@ -666,16 +666,18 @@ define([
                             }, h('span.fa.fa-plus')),
                         ]),
                         h('div#cp-app-poll-comments', [
-                            h('h2#cp-app-poll-comments-add-title', "TODO: add comment"),
+                            h('h2#cp-app-poll-comments-add-title', Msg.poll_comment_add),
                             h('div#cp-app-poll-comments-add', [
                                 h('input.cp-app-poll-comments-add-name', {
                                     type: 'text'
                                 }),
                                 h('textarea.cp-app-poll-comments-add-msg'),
-                                h('button.cp-app-poll-comments-add-submit', "TODO: SUBMIT"),
-                                h('button.cp-app-poll-comments-add-cancel', "TODO: CANCEL")
+                                h('button.cp-app-poll-comments-add-submit.btn.btn-secondary',
+                                    Msg.poll_comment_submit),
+                                h('button.cp-app-poll-comments-add-cancel.btn.btn-secondary',
+                                    Msg.cancel)
                             ]),
-                            h('h2#cp-app-poll-comments-list-title', "TODO: comments"),
+                            h('h2#cp-app-poll-comments-list-title', Msg.poll_comment_list),
                             h('div#cp-app-poll-comments-list')
                         ])
                     ])
diff --git a/customize.dist/translations/messages.fr.js b/customize.dist/translations/messages.fr.js
index 0c2756d49..91bba1fbf 100644
--- a/customize.dist/translations/messages.fr.js
+++ b/customize.dist/translations/messages.fr.js
@@ -262,6 +262,11 @@ define(function () {
     out.poll_bookmarked_col = "Voici votre colonne favorite; elle sera toujours dévérouillée et affichée en première position.";
     out.poll_total = 'TOTAL';
 
+    out.poll_comment_list = "Commentaires";
+    out.poll_comment_add = "Ajouter un commentaire";
+    out.poll_comment_submit = "Envoyer";
+    out.poll_comment_remove = "Supprimer ce commentaire";
+
     // Canvas
     out.canvas_clear = "Nettoyer";
     out.canvas_delete = "Supprimer la sélection";
diff --git a/customize.dist/translations/messages.js b/customize.dist/translations/messages.js
index 29c969628..e04872bc8 100644
--- a/customize.dist/translations/messages.js
+++ b/customize.dist/translations/messages.js
@@ -264,6 +264,11 @@ define(function () {
     out.poll_bookmarked_col = 'This is your bookmarked column. It will always be unlocked and displayed at the beginning for you.';
     out.poll_total = 'TOTAL';
 
+    out.poll_comment_list = "Comments";
+    out.poll_comment_add = "Add a comment";
+    out.poll_comment_submit = "Send";
+    out.poll_comment_remove = "Delete this comment";
+
     // Canvas
     out.canvas_clear = "Clear";
     out.canvas_delete = "Delete selection";
diff --git a/www/poll/app-poll.less b/www/poll/app-poll.less
index 2b109314b..1b58841e3 100644
--- a/www/poll/app-poll.less
+++ b/www/poll/app-poll.less
@@ -45,6 +45,7 @@ overflow-x: hidden;
 #cp-app-poll-content {
     display: flex;
     flex: 1;
+    min-height: 0;
     #cp-app-poll-form {
         flex: 1;
         overflow-y: auto;
@@ -373,6 +374,7 @@ div.cp-app-poll-realtime {
             .tools_unselectable();
         }
         thead {
+            height: 52px;
             td {
                 padding: 0px 5px;
                 background: @poll-th-bg;
@@ -492,6 +494,10 @@ div.cp-app-poll-realtime {
         width: 50%;
         margin: 20px auto;
         min-width: 400px;
+        padding-bottom: 5px;
+        button {
+            border-radius: 0;
+        }
         #cp-app-poll-comments-add {
             input, textarea {
                 border: 1px solid black;
@@ -510,6 +516,9 @@ div.cp-app-poll-realtime {
                 height: 8em;
                 line-height: 1.5em;
             }
+            button {
+                padding: 10px;
+            }
             text-align: center;
         }
         #cp-app-poll-comments-list {
@@ -527,9 +536,8 @@ div.cp-app-poll-realtime {
                 }
                 .cp-app-poll-comments-list-msg-actions {
                     button {
-                        border-radius: 0;
-                        width: 25px;
                         padding: 0;
+                        width: 25px;
                         line-height: 20px;
                     }
                 }
diff --git a/www/poll/inner.html b/www/poll/inner.html
index b3d27a828..e073ab539 100644
--- a/www/poll/inner.html
+++ b/www/poll/inner.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html class="cp-app-noscroll">
 <head>
     <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
     <meta content="text/html; charset=utf-8" http-equiv="content-type"/>
diff --git a/www/poll/inner.js b/www/poll/inner.js
index 4a2d90ffc..7d0f059f6 100644
--- a/www/poll/inner.js
+++ b/www/poll/inner.js
@@ -183,7 +183,7 @@ define([
         if (commit) {
             newObj = proxy;
         } else {
-            newObj = $.extend(true, {}, proxy);
+            newObj = copyObject(proxy);
         }
 
         // Merge uncommitted into the proxy
@@ -221,14 +221,40 @@ define([
         return newObj;
     };
 
+    var enableColumn = function (id) {
+        var $input = $('input[disabled="disabled"][data-rt-id^="' + id + '"]')
+            .removeAttr('disabled');
+        $input.closest('td').addClass('cp-app-poll-table-editing');
+        $('.cp-app-poll-table-lock[data-rt-id="' + id + '"]').addClass('fa-unlock')
+            .removeClass('fa-lock').attr('title', Messages.poll_unlocked);
+    };
+    var disableColumn = function (id) {
+        var $input = $('input[data-rt-id^="' + id + '"]')
+            .attr('disabled', 'disabled');
+        $input.closest('td').removeClass('cp-app-poll-table-editing');
+        $('.cp-app-poll-table-lock[data-rt-id="' + id + '"]').addClass('fa-lock')
+            .removeClass('fa-unlock').attr('title', Messages.poll_locked);
+    };
+    var enableRow = function (id) {
+        var $input = $('input[type="text"][disabled="disabled"][data-rt-id="' + id + '"]').removeAttr('disabled');
+        $input.closest('td').addClass('cp-app-poll-table-editing');
+        $('span.cp-app-poll-table-edit[data-rt-id="' + id + '"]').css('visibility', 'hidden');
+    };
+    var disableRow = function (id) {
+        var $input = $('input[type="text"][data-rt-id="' + id + '"]')
+            .attr('disabled', 'disabled');
+        $input.closest('td').removeClass('cp-app-poll-table-editing');
+        $('span.cp-app-poll-table-edit[data-rt-id="' + id + '"]').css('visibility', 'visible');
+    };
+
     var styleUserColumn = function () {
         var userid = APP.userid;
         if (!userid) { return; }
 
         // Enable input for the userid column
-        $('input[disabled="disabled"][data-rt-id^="' + userid + '"]').removeAttr('disabled')
+        enableColumn(userid);
+        $('input[disabled="disabled"][data-rt-id^="' + userid + '"]')
             .attr('placeholder', Messages.poll_userPlaceholder);
-        $('input[type="number"][data-rt-id^="' + userid + '"]').addClass('enabled');
         $('.cp-app-poll-table-lock[data-rt-id="' + userid + '"]').remove();
         $('[data-rt-id^="' + userid + '"]').closest('td')
             .addClass("cp-app-poll-table-own");
@@ -241,10 +267,8 @@ define([
         var hasScroll = $scroll.width() < $scroll[0].scrollWidth;
         APP.uncommitted.content.colsOrder.forEach(function(id) {
             // Enable the checkboxes for the uncommitted column
-            $('input[disabled="disabled"][data-rt-id^="' + id + '"]').removeAttr('disabled');
-            $('input[type="number"][data-rt-id^="' + id + '"]').addClass('enabled');
+            enableColumn(id);
             $('.cp-app-poll-table-lock[data-rt-id="' + id + '"]').remove();
-            //.addClass('fa-unlock').removeClass('fa-lock').attr('title', Messages.poll_unlocked);
             $('.cp-app-poll-table-remove[data-rt-id="' + id + '"]').remove();
             $('.cp-app-poll-table-bookmark[data-rt-id="' + id + '"]').remove();
 
@@ -258,29 +282,16 @@ define([
         });
         APP.uncommitted.content.rowsOrder.forEach(function(id) {
             // Enable the checkboxes for the uncommitted column
-            $('input[disabled="disabled"][data-rt-id="' + id + '"]').removeAttr('disabled');
+            enableRow(id);
             $('.cp-app-poll-table-edit[data-rt-id="' + id + '"]').remove();
             $('.cp-app-poll-table-remove[data-rt-id="' + id + '"]').remove();
 
             $('[data-rt-id="' + id + '"]').closest('tr').addClass("cp-app-poll-table-uncommitted");
-            //$('td.uncommitted .cover').addClass("uncommitted");
-            //$('.uncommitted input[type="text"]').attr("placeholder", Messages.poll_userPlaceholder);
         });
     };
     var unlockElements = function () {
-        APP.unlocked.row.forEach(function (id) {
-            var $input = $('input[type="text"][disabled="disabled"][data-rt-id="' + id + '"]').removeAttr('disabled');
-            $input.parent().parent().addClass('cp-app-poll-table-editing');
-            $('span.cp-app-poll-table-edit[data-rt-id="' + id + '"]').css('visibility', 'hidden');
-        });
-        APP.unlocked.col.forEach(function (id) {
-            var $input = $('input[disabled="disabled"][data-rt-id^="' + id + '"]')
-                .removeAttr('disabled');
-            $input.parent().addClass('cp-app-poll-table-editing');
-            $('input[type="number"][data-rt-id^="' + id + '"]').addClass('enabled');
-            $('.cp-app-poll-table-lock[data-rt-id="' + id + '"]').addClass('fa-unlock')
-                .removeClass('fa-lock').attr('title', Messages.poll_unlocked);
-        });
+        APP.unlocked.row.forEach(enableRow);
+        APP.unlocked.col.forEach(enableColumn);
     };
     var updateTableButtons = function () {
         var uncomColId = APP.uncommitted.content.colsOrder[0];
@@ -377,35 +388,31 @@ define([
         if (APP.unlocked.col.indexOf(id) === -1) {
             APP.unlocked.col.push(id);
         }
-        if (typeof(cb) === "function") {
-            cb();
-        }
+        enableColumn(id);
+        if (typeof(cb) === "function") { cb(); }
     };
     var unlockRow = function (id, cb) {
         if (APP.unlocked.row.indexOf(id) === -1) {
             APP.unlocked.row.push(id);
         }
-        if (typeof(cb) === "function") {
-            cb();
-        }
+        enableRow(id);
+        if (typeof(cb) === "function") { cb(); }
     };
     var lockColumn = function (id, cb) {
         var idx = APP.unlocked.col.indexOf(id);
         if (idx !== -1) {
             APP.unlocked.col.splice(idx, 1);
         }
-        if (typeof(cb) === "function") {
-            cb();
-        }
+        disableColumn(id);
+        if (typeof(cb) === "function") { cb(); }
     };
     var lockRow = function (id, cb) {
         var idx = APP.unlocked.row.indexOf(id);
         if (idx !== -1) {
             APP.unlocked.row.splice(idx, 1);
         }
-        if (typeof(cb) === "function") {
-            cb();
-        }
+        disableRow(id);
+        if (typeof(cb) === "function") { cb(); }
     };
 
     /*  Any time the realtime object changes, call this function */
@@ -420,14 +427,6 @@ define([
 
         var table = APP.$table[0];
 
-        var displayedObj = mergeUncommitted(APP.proxy, APP.uncommitted);
-
-        var colsOrder = sortColumns(displayedObj.content.colsOrder, APP.userid);
-        var conf = {
-            cols: colsOrder,
-            readOnly: APP.readOnly
-        };
-
         common.notify();
 
         var getFocus = function () {
@@ -453,18 +452,23 @@ define([
         };
 
         var updateTable = function () {
-            var displayedObj2 = mergeUncommitted(APP.proxy, APP.uncommitted);
+            var displayedObj = mergeUncommitted(APP.proxy, APP.uncommitted);
+            var colsOrder = sortColumns(displayedObj.content.colsOrder, APP.userid);
+            var conf = {
+                cols: colsOrder,
+                readOnly: APP.readOnly
+            };
             var f = getFocus();
             APP.$createRow.detach();
             APP.$createCol.detach();
-            Render.updateTable(table, displayedObj2, conf);
+            Render.updateTable(table, displayedObj, conf);
             // Fix autocomplete bug:
-            displayedObj2.content.rowsOrder.forEach(function (rowId) {
-                $('input[data-rt-id="' + rowId +'"]').val(displayedObj2.content.rows[rowId] || '');
+            displayedObj.content.rowsOrder.forEach(function (rowId) {
+                $('input[data-rt-id="' + rowId +'"]').val(displayedObj.content.rows[rowId] || '');
             });
-            displayedObj2.content.colsOrder.forEach(function (rowId) {
+            displayedObj.content.colsOrder.forEach(function (rowId) {
                 $('input[data-rt-id="' + rowId +'"]')
-                    .val(displayedObj2.content.cols[rowId] || '');
+                    .val(displayedObj.content.cols[rowId] || '');
             });
             updateDisplayedTable();
             setFocus(f);
@@ -475,9 +479,8 @@ define([
 
         if (throttle) {
             if (APP.throttled) { window.clearTimeout(APP.throttled); }
-            updateTable();
             APP.throttled = window.setTimeout(function () {
-                updateDisplayedTable();
+                updateTable();
             }, throttle);
             return;
         }
@@ -509,7 +512,7 @@ define([
             case 'text':
                 debug("text[rt-id='%s'] [%s]", id, input.value);
                 Render.setValue(object, id, input.value);
-                change(null, null, null, 50);
+                change(null, null, null, 250);
                 break;
             case 'number':
                 debug("checkbox[tr-id='%s'] %s", id, input.value);
@@ -537,14 +540,29 @@ define([
         if (APP.readOnly) { return; }
         if (id) {
             var type = Render.typeofId(id);
-            console.log(type);
-            if (type === 'col') { return void lockColumn(id, change); }
-            if (type === 'row') { return void lockRow(id, change); }
+            if (type === 'col') { return void lockColumn(id); }
+            if (type === 'row') { return void lockRow(id); }
             return;
         }
-        APP.unlocked.col = Cryptpad.deduplicateString([APP.userid].concat(APP.uncommitted.content.colsOrder).slice());
+        var keepColUnlocked = [APP.userid, APP.uncommitted.content.colsOrder[0]];
+        var keepRowUnlocked = APP.uncommitted.content.rowsOrder.slice();
+
+        var toLock = [];
+        APP.unlocked.col.forEach(function (id) {
+            if (keepColUnlocked.indexOf(id) !== -1) { return; }
+            toLock.push(id);
+        });
+        toLock.forEach(lockColumn);
+
+        toLockR = [];
+        APP.unlocked.row.forEach(function (id) {
+            if (keepRowUnlocked.indexOf(id) !== -1) { return; }
+            toLockR.push(id);
+        });
+        toLockR.forEach(lockRow);
+        /*APP.unlocked.col = Cryptpad.deduplicateString([APP.userid].concat(APP.uncommitted.content.colsOrder).slice());
         APP.unlocked.row = APP.uncommitted.content.rowsOrder.slice();
-        change();
+        change();*/
     };
 
     /*  Called whenever an event is fired on a span */
@@ -571,9 +589,7 @@ define([
                 });
             } else if (isEdit) {
                 unlockRow(id, function () {
-                    change(null, null, null, null, function() {
-                        $('input[data-rt-id="' + id + '"]').focus();
-                    });
+                    $('input[data-rt-id="' + id + '"]').focus();
                 });
             }
         } else if (type === 'col') {
@@ -589,15 +605,10 @@ define([
                 handleBookmark(id);
             } else if (isLock && isLocked) {
                 unlockColumn(id, function () {
-                    change(null, null, null, null, function() {
-                        $('input[data-rt-id="' + id + '"]').focus();
-                    });
+                    $('input[data-rt-id="' + id + '"]').focus();
                 });
             } else if (isLock) {
-                lockColumn(id, function () {
-                    change(null, null, null, null, function() {
-                    });
-                });
+                lockColumn(id);
             }
         } else if (type === 'cell') {
             change();
@@ -754,17 +765,7 @@ define([
 
     var getCommentId = Render.Uid('c');
     var removeComment = function (uid) {
-        var idx;
-        APP.proxy.comments.some(function (c, i) {
-            if (c.uid === uid) {
-                console.log('found');
-                idx = i;
-                return true;
-            }
-        });
-        if (idx) {
-            APP.proxy.comments.splice(idx, 1);
-        }
+        delete APP.proxy.comments[uid];
         APP.updateComments();
     };
     /*var editComment = function (id) {
@@ -772,7 +773,7 @@ define([
     };*/
     var avatars = {};
     var updateComments = APP.updateComments = function () {
-        if (!APP.proxy.comments) { APP.proxy.comments = []; }
+        if (!APP.proxy.comments) { APP.proxy.comments = {}; }
 
         var profile;
         if (common.isLoggedIn()) {
@@ -781,7 +782,10 @@ define([
 
         var $comments = APP.$comments.html('');
         var comments = APP.proxy.comments;
-        comments.forEach(function (c) {
+        Object.keys(copyObject(comments)).sort(function (a, b) {
+            return comments[a].time > comments[b].time;
+        }).forEach(function (k) {
+            var c = comments[k];
             var $c = $('<div>', {
                 'class': 'cp-app-poll-comments-list-el'
             }).prependTo($comments);
@@ -824,10 +828,10 @@ define([
             // Actions
             if (!c.profile || c.profile === profile) {
                 $('<button>', {
-                    'class': 'fa fa-times',
-                    'title': 'TODO: remove comment',
-                    'data-rt-id': c.uid
-                }).appendTo($actions).click(function () { removeComment(c.uid); });
+                    'class': 'btn btn-secondary fa fa-times',
+                    'title': Messages.poll_comment_remove,
+                    'data-rt-id': k
+                }).appendTo($actions).click(function () { removeComment(k); });
                 /*$('<button>', {
                     'class': 'fa fa-pencil',
                     'title': 'TODO: edit comment',
@@ -838,11 +842,12 @@ define([
         common.notify();
     };
     var resetComment = function () {
-        APP.$addComment.find('.cp-app-poll-comments-add-name').val('');
+        APP.$addComment.find('.cp-app-poll-comments-add-name')
+            .val(metadataMgr.getUserData().name || '');
         APP.$addComment.find('.cp-app-poll-comments-add-msg').val('');
     };
     var addComment = function () {
-        if (!APP.proxy.comments) { APP.proxy.comments = []; }
+        if (!APP.proxy.comments) { APP.proxy.comments = {}; }
         var name = APP.$addComment.find('.cp-app-poll-comments-add-name').val();
         var msg = APP.$addComment.find('.cp-app-poll-comments-add-msg').val();
         var time = +new Date();
@@ -853,14 +858,14 @@ define([
             avatar = metadataMgr.getUserData().avatar;
         }
 
-        APP.proxy.comments.push({
+        var uid = getCommentId();
+        APP.proxy.comments[uid] = {
             msg: msg,
             name: name,
             time: time,
-            uid: getCommentId(),
             profile: profile,
             avatar: avatar
-        });
+        };
         resetComment();
         updateComments();
     };
@@ -872,7 +877,6 @@ define([
             c = Render.getCoordinates(k);
             if (APP.proxy.content.colsOrder.indexOf(c[0]) === -1 ||
                 APP.proxy.content.rowsOrder.indexOf(c[1]) === -1) {
-                console.log('deleting ' + k);
                 delete APP.proxy.content.cells[k];
             }
         }
@@ -934,7 +938,7 @@ define([
 
             var rowuid = Render.rowuid();
             uncommitted.content.rowsOrder.push(rowuid);
-            unlockRow(coluid);
+            unlockRow(rowuid);
         }
 
         var displayedObj = mergeUncommitted(proxy, uncommitted, false);
@@ -943,6 +947,9 @@ define([
 
         var $table = APP.$table = $(Render.asHTML(displayedObj, null, colsOrder, APP.readOnly));
 
+        /*
+            Extract uncommitted data (row or column) and create a new uncommitted row or column
+        */
         var getUncommitted = function (type) {
             var ret = {}, toRemove;
             var uncommitted = APP.uncommitted.content;
@@ -979,7 +986,6 @@ define([
             });
             uncommitted.rowsOrder = [Render.rowuid()];
             uncommitted.rows = {};
-            console.log(JSON.stringify(ret, 0, 2));
             return ret;
         };
         APP.$createCol = $('#cp-app-poll-create-user').click(function () {
@@ -988,7 +994,8 @@ define([
             if (!APP.userid) { setUserId(id); }
             mergeUncommitted(proxy, uncommittedCopy, true);
             change(null, null, null, null, function() {
-                handleSpan($('.cp-app-poll-table-lock[data-rt-id="' + id + '"]')[0]);
+                unlockColumn(id);
+                unlockColumn(APP.uncommitted.content.colsOrder[0]);
             });
         });
         APP.$createRow = $('#cp-app-poll-create-option').click(function () {
@@ -1032,10 +1039,17 @@ define([
             .on('change', ['metadata'], function () {
                 metadataMgr.updateMetadata(proxy.metadata);
             })
-            .on('change', ['content'], change)
+            .on('change', ['content'], function () {
+                change(null, null, null, 100);
+            })
             .on('change', ['description'], updateDescription)
             .on('change', ['comments'], updateComments)
-            .on('remove', [], change);
+            .on('change', ['published'], function () {
+                publish(proxy.published);
+            })
+            .on('remove', [], function () {
+                change(null, null, null, 100);
+            });
 
         // If the user's column is not committed, add his username
         var $userInput = $('.cp-app-poll-table-uncommitted > input[data-rt-id^='+ APP.userid +']');
diff --git a/www/poll/render.js b/www/poll/render.js
index 4307ad458..6ca527292 100644
--- a/www/poll/render.js
+++ b/www/poll/render.js
@@ -12,7 +12,7 @@ define([
             userData: {}
         },
         description: '',
-        comments: [],
+        comments: {},
         content: {
 /*  TODO
 

From 1c7c37c121983171611e8381a345725f2cf9fbe9 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Thu, 5 Oct 2017 18:07:05 +0200
Subject: [PATCH 18/20] Add the file class to pads in 'template' and 'recent'
 categories in the drive

---
 www/common/common-interface.js | 2 +-
 www/drive/app-drive.less       | 2 +-
 www/drive/inner.js             | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/www/common/common-interface.js b/www/common/common-interface.js
index f519c34da..badfa4e57 100644
--- a/www/common/common-interface.js
+++ b/www/common/common-interface.js
@@ -509,7 +509,7 @@ define([
         var $icon = $defaultIcon.clone();
 
         if (AppConfig.applicationsIcon && AppConfig.applicationsIcon[type]) {
-            var appClass = ' cp-icon-color-'+type;
+            var appClass = ' cp-icon cp-icon-color-'+type;
             $icon = $('<span>', {'class': 'fa ' + AppConfig.applicationsIcon[type] + appClass});
         }
 
diff --git a/www/drive/app-drive.less b/www/drive/app-drive.less
index e7e5e2cda..7b3adf77e 100644
--- a/www/drive/app-drive.less
+++ b/www/drive/app-drive.less
@@ -592,7 +592,7 @@ span {
                         margin-right: 5px;
                     }
                 }
-                &.cp-app-drive-content-icon, &.cp-app-drive-element-state {
+                &.cp-app-drive-content-icon, &.cp-app-drive-element-state, &.cp-icon {
                     width: 30px;
                 }
                 &.cp-app-drive-element-type, &.cp-app-drive-element-atime, &.cp-app-drive-element-ctime {
diff --git a/www/drive/inner.js b/www/drive/inner.js
index 4b673a997..7f6bf1529 100644
--- a/www/drive/inner.js
+++ b/www/drive/inner.js
@@ -1835,7 +1835,7 @@ define([
                 var roClass = typeof(ro) === 'undefined' ? ' cp-app-drive-element-noreadonly' :
                                 ro ? ' cp-app-drive-element-readonly' : '';
                 var $element = $('<li>', {
-                    'class': 'cp-app-drive-element cp-app-drive-element-row' + roClass,
+                    'class': 'cp-app-drive-element cp-app-drive-element-file cp-app-drive-element-row' + roClass,
                     draggable: draggable
                 });
                 if (Array.isArray(APP.selectedFiles)) {
@@ -2011,7 +2011,7 @@ define([
                 var roClass = typeof(ro) === 'undefined' ? ' cp-app-drive-element-noreadonly' :
                                 ro ? ' cp-app-drive-element-readonly' : '';
                 var $element = $('<li>', {
-                    'class': 'cp-app-drive-element cp-app-drive-element-row' + roClass,
+                    'class': 'cp-app-drive-element cp-app-drive-element-file cp-app-drive-element-row' + roClass,
                 });
                 addFileData(id, $element);
                 $element.prepend($icon).dblclick(function () {

From e5a54b5978037d5b814b7f159aea93d54bd0412a Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Thu, 5 Oct 2017 18:12:23 +0200
Subject: [PATCH 19/20] Fix folder highlighting with drag&drop in the drive

---
 www/drive/inner.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/www/drive/inner.js b/www/drive/inner.js
index 7f6bf1529..617a706ac 100644
--- a/www/drive/inner.js
+++ b/www/drive/inner.js
@@ -1118,7 +1118,7 @@ define([
                 e.preventDefault();
                 e.stopPropagation();
                 counter++;
-                $element.addClass('droppable');
+                $element.addClass('cp-app-drive-element-droppable');
             });
             $element.on('dragleave', function (e) {
                 e.preventDefault();
@@ -1126,7 +1126,7 @@ define([
                 counter--;
                 if (counter <= 0) {
                     counter = 0;
-                    $element.removeClass('droppable');
+                    $element.removeClass('cp-app-drive-element-droppable');
                 }
             });
         };

From 888028c542cb7d04263a5307a3a48aa253457562 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Thu, 5 Oct 2017 18:13:28 +0200
Subject: [PATCH 20/20] Lint

---
 www/poll/inner.js | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/www/poll/inner.js b/www/poll/inner.js
index 7d0f059f6..5586beb04 100644
--- a/www/poll/inner.js
+++ b/www/poll/inner.js
@@ -554,15 +554,12 @@ define([
         });
         toLock.forEach(lockColumn);
 
-        toLockR = [];
+        toLock = [];
         APP.unlocked.row.forEach(function (id) {
             if (keepRowUnlocked.indexOf(id) !== -1) { return; }
-            toLockR.push(id);
+            toLock.push(id);
         });
-        toLockR.forEach(lockRow);
-        /*APP.unlocked.col = Cryptpad.deduplicateString([APP.userid].concat(APP.uncommitted.content.colsOrder).slice());
-        APP.unlocked.row = APP.uncommitted.content.rowsOrder.slice();
-        change();*/
+        toLock.forEach(lockRow);
     };
 
     /*  Called whenever an event is fired on a span */