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

2017-05-29 12:59:49 +02:00
parent 1092285a68 b910915d47
commit b6bb576a34
18 changed files with 259 additions and 98 deletions
--- a/www/code/code.css
+++ b/www/code/code.css
@@ -0,0 +1,73 @@
+html,
+body {
+  height: 100%;
+  width: 100%;
+  padding: 0px;
+  margin: 0px;
+  overflow: hidden;
+  box-sizing: border-box;
+  position: relative;
+}
+body {
+  display: flex;
+  flex-flow: column;
+  max-height: 100%;
+  min-height: auto;
+}
+.CodeMirror {
+  display: inline-block;
+  height: 100%;
+  width: 50%;
+  min-width: 20%;
+  max-width: 80%;
+  resize: horizontal;
+}
+.CodeMirror.fullPage {
+  min-width: 100%;
+  max-width: 100%;
+  resize: none;
+}
+.CodeMirror-focused .cm-matchhighlight {
+  background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAACCAYAAABytg0kAAAAFklEQVQI12NgYGBgkKzc8x9CMDAwAAAmhwSbidEoSQAAAABJRU5ErkJggg==);
+  background-position: bottom;
+  background-repeat: repeat-x;
+}
+#editorContainer {
+  flex: 1;
+  display: flex;
+  flex-flow: row;
+  height: 100%;
+  overflow: hidden;
+}
+#previewContainer {
+  flex: 1;
+  padding: 5px 20px;
+  overflow: auto;
+  display: inline-block;
+  height: 100%;
+  border-left: 1px solid black;
+  box-sizing: border-box;
+  font-family: Calibri, Ubuntu, sans-serif;
+  word-wrap: break-word;
+}
+#preview {
+  max-width: 40vw;
+  margin: auto;
+}
+#preview table {
+  border-collapse: collapse;
+}
+#preview table tr th {
+  border: 3px solid black;
+  padding: 15px;
+}
+@media (max-width: 600px) {
+  .CodeMirror {
+    flex: 1;
+    max-width: 100%;
+    resize: none;
+  }
+  #previewContainer {
+    display: none !important;
+  }
+}
--- a/www/code/code.less
+++ b/www/code/code.less
@@ -0,0 +1,81 @@
+@import "../../customize.dist/src/less/variables.less";
+@import "../../customize.dist/src/less/mixins.less";
+
+html, body{
+    height: 100%;
+    width: 100%;
+    padding: 0px;
+    margin: 0px;
+    overflow: hidden;
+    box-sizing: border-box;
+    position: relative;
+}
+body {
+    display: flex;
+    flex-flow: column;
+    max-height: 100%;
+    min-height: auto;
+}
+.CodeMirror {
+    display: inline-block;
+    height: 100%;
+    width: 50%;
+    min-width: 20%;
+    max-width: 80%;
+    resize: horizontal;
+}
+.CodeMirror.fullPage {
+    min-width: 100%;
+    max-width: 100%;
+    resize: none;
+}
+.CodeMirror-focused .cm-matchhighlight {
+    background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAACCAYAAABytg0kAAAAFklEQVQI12NgYGBgkKzc8x9CMDAwAAAmhwSbidEoSQAAAABJRU5ErkJggg==);
+    background-position: bottom;
+    background-repeat: repeat-x;
+}
+#editorContainer {
+    flex: 1;
+    display: flex;
+    flex-flow: row;
+    height: 100%;
+    overflow: hidden;
+}
+#previewContainer {
+    flex: 1;
+    padding: 5px 20px;
+    overflow: auto;
+    display: inline-block;
+    height: 100%;
+    border-left: 1px solid black;
+    box-sizing: border-box;
+    font-family: Calibri,Ubuntu,sans-serif;
+    word-wrap: break-word;
+}
+
+#preview {
+    max-width: 40vw;
+    margin: auto;
+
+    table {
+        border-collapse: collapse;
+        tr {
+            th {
+                border: 3px solid black;
+                padding: 15px;
+            }
+        }
+    }
+}
+
+@media (max-width: @media-medium-screen) {
+    .CodeMirror {
+        flex: 1;
+        max-width: 100%;
+        resize: none;
+    }
+    #previewContainer {
+        display: none !important;
+    }
+}
+
--- a/www/code/inner.html
+++ b/www/code/inner.html
@@ -8,6 +8,7 @@
    <link rel="stylesheet" href="/bower_components/codemirror/lib/codemirror.css">
    <link rel="stylesheet" href="/bower_components/codemirror/addon/dialog/dialog.css">
    <link rel="stylesheet" href="/bower_components/codemirror/addon/fold/foldgutter.css" />
+    <link rel="stylesheet" href="/code/code.css" />
    <script src="/bower_components/codemirror/mode/javascript/javascript.js"></script>
    <script src="/bower_components/codemirror/addon/mode/loadmode.js"></script>
    <script src="/bower_components/codemirror/mode/meta.js"></script>
@@ -31,69 +32,6 @@
    <script src="/bower_components/codemirror/addon/fold/markdown-fold.js"></script>
    <script src="/bower_components/codemirror/addon/fold/comment-fold.js"></script>
    <script src="/bower_components/codemirror/addon/display/placeholder.js"></script>
-    <style>
-        html, body{
-            height: 100%;
-            width: 100%;
-            padding: 0px;
-            margin: 0px;
-            overflow: hidden;
-            box-sizing: border-box;
-            position: relative;
-        }
-        body {
-            display: flex;
-            flex-flow: column;
-            max-height: 100%;
-            min-height: auto;
-        }
-        .CodeMirror {
-            display: inline-block;
-            height: 100%;
-            width: 50%;
-            min-width: 20%;
-            max-width: 80%;
-            resize: horizontal;
-        }
-        .CodeMirror.fullPage {
-            min-width: 100%;
-            max-width: 100%;
-            resize: none;
-        }
-        .CodeMirror-focused .cm-matchhighlight {
-            background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAACCAYAAABytg0kAAAAFklEQVQI12NgYGBgkKzc8x9CMDAwAAAmhwSbidEoSQAAAABJRU5ErkJggg==);
-            background-position: bottom;
-            background-repeat: repeat-x;
-        }
-        #editorContainer {
-            flex: 1;
-            display: flex;
-            flex-flow: row;
-            height: 100%;
-            overflow: hidden;
-        }
-        #previewContainer {
-            flex: 1;
-            padding: 5px 20px;
-            overflow: auto;
-            display: inline-block;
-            height: 100%;
-            border-left: 1px solid black;
-            box-sizing: border-box;
-            font-family: Calibri,Ubuntu,sans-serif;
-        }
-        #preview {
-            max-width: 40vw;
-            margin: auto;
-        }
-        #preview table tr td, #preview table tr th {
-            border: 1px solid black;
-            padding: 15px;
-        }
-        #preview table tr th {
-            border: 3px solid black;
-        }
-    </style>
 </head>
 <body>
  <div id="cme_toolbox" class="toolbar-container"></div>
--- a/www/code/main.js
+++ b/www/code/main.js
@@ -243,9 +243,16 @@ define([
                    }
                    $previewContainer.toggle();
                    if ($previewContainer.is(':visible')) {
+                        forceDrawPreview();
                        $codeMirror.removeClass('fullPage');
+                        Cryptpad.setPadAttribute('previewMode', true, function (e) {
+                            if (e) { return console.log(e); }
+                        });
                    } else {
                        $codeMirror.addClass('fullPage');
+                        Cryptpad.setPadAttribute('previewMode', false, function (e) {
+                            if (e) { return console.log(e); }
+                        });
                    }
                });
                $rightside.append($previewButton);
@@ -259,6 +266,7 @@ define([
                    CodeMirror.configureTheme();
                }

+
                // set the hash
                if (!readOnly) { Cryptpad.replaceHash(editHash); }
            };
@@ -310,6 +318,13 @@ define([
                    Title.updateTitle(Cryptpad.initialName);
                }

+                Cryptpad.getPadAttribute('previewMode', function (e, data) {
+                    if (e) { return void console.error(e); }
+                    if (data === false && APP.$previewButton) {
+                        APP.$previewButton.click();
+                    }
+                });
+
                Cryptpad.removeLoadingScreen();
                setEditable(true);
                initializing = false;
--- a/www/common/common-util.js
+++ b/www/common/common-util.js
@@ -131,5 +131,9 @@ define([], function () {
        return g;
    };

+    Util.createRandomInteger = function () {
+        return Math.floor(Math.random() * Number.MAX_SAFE_INTEGER);
+    };
+
    return Util;
 });
--- a/www/common/cryptpad-common.js
+++ b/www/common/cryptpad-common.js
@@ -72,6 +72,7 @@ define([
    common.bytesToKilobytes = Util.bytesToKilobytes;
    common.fetch = Util.fetch;
    common.throttle = Util.throttle;
+    common.createRandomInteger = Util.createRandomInteger;

    // import hash utilities for export
    var createRandomHash = common.createRandomHash = Hash.createRandomHash;
@@ -598,7 +599,7 @@ define([
                var data = makePad(href, name);
                getStore().pushData(data, function (e) {
                    if (e) {
-                        if (e === 'E_OVER_LIMIT' && AppConfig.enablePinLimit) {
+                        if (e === 'E_OVER_LIMIT') {
                            common.alert(Messages.pinLimitNotPinned, null, true);
                            return;
                        }
@@ -760,7 +761,7 @@ define([
    };

    common.isOverPinLimit = function (cb) {
-        if (!common.isLoggedIn() || !AppConfig.enablePinLimit) { return void cb(null, false); }
+        if (!common.isLoggedIn()) { return void cb(null, false); }
        var usage;
        var andThen = function (e, limit, plan) {
            if (e) { return void cb(e); }
@@ -816,7 +817,10 @@ define([
            var width = Math.floor(Math.min(quota, 1)*200); // the bar is 200px width
            var $usage = $('<span>', {'class': 'usage'}).css('width', width+'px');

-            if ((quota >= 0.8 || alwaysDisplayUpgrade) && data.plan !== "power") {
+            if (Config.noSubscriptionButton !== true &&
+                (quota >= 0.8 || alwaysDisplayUpgrade) &&
+                data.plan !== "power")
+            {
                var origin = encodeURIComponent(window.location.hostname);
                var $upgradeLink = $('<a>', {
                    href: "https://accounts.cryptpad.fr/#!on=" + origin,
@@ -844,7 +848,7 @@ define([
            else if (quota < 1) { $usage.addClass('warning'); }
            else {
                $usage.addClass('above');
-                if (!limitReachedDisplayed) {
+                if (!limitReachedDisplayed && Config.noSubscriptionButton === true) {
                    limitReachedDisplayed = true;
                    common.alert(Messages._getKey('pinAboveLimitAlert', [prettyUsage, encodeURIComponent(window.location.hostname)]), null, true);
                }
--- a/www/common/fsStore.js
+++ b/www/common/fsStore.js
@@ -172,7 +172,11 @@ define([
            if (typeof(proxy.loginToken) !== 'number') {
                proxy[tokenKey] = Math.floor(Math.random()*Number.MAX_SAFE_INTEGER);
            }
+
+            // copy User_hash into sessionStorage because cross-domain iframes
+            // on safari replaces localStorage with sessionStorage or something
            if (sessionStorage) { sessionStorage.setItem('User_hash', localStorage.getItem('User_hash')); }
+
            var localToken = tryParsing(localStorage.getItem(tokenKey));
            if (localToken === null) {
                // if that number hasn't been set to localStorage, do so.
--- a/www/common/toolbar.js
+++ b/www/common/toolbar.js
@@ -500,8 +500,12 @@ define([
            var todo = function (e, overLimit) {
                if (e) { return void console.error("Unable to get the pinned usage"); }
                if (overLimit) {
+                    var message = Messages.pinLimitReachedAlert;
+                    if (ApiConfig.noSubscriptionButton === true) {
+                        message = Messages.pinLimitReachedAlertNoAccounts;
+                    }
                    $limit.show().click(function () {
-                        Cryptpad.alert(Messages.pinLimitReachedAlert, null, true);
+                        Cryptpad.alert(message, null, true);
                    });
                }
            };
--- a/www/common/toolbar2.js
+++ b/www/common/toolbar2.js
@@ -616,8 +616,12 @@ define([
        var todo = function (e, overLimit) {
            if (e) { return void console.error("Unable to get the pinned usage"); }
            if (overLimit) {
+                var key = 'pinLimitReachedAlert';
+                if (ApiConfig.noSubscriptionButton === true) {
+                    key = 'pinLimitReachedAlertNoAccounts';
+                }
                $limit.show().click(function () {
-                    Cryptpad.alert(Messages._getKey('pinLimitReachedAlert', [encodeURIComponent(window.location.hostname)]), null, true);
+                    Cryptpad.alert(Messages._getKey(key, [encodeURIComponent(window.location.hostname)]), null, true);
                });
            }
        };
--- a/www/drive/main.js
+++ b/www/drive/main.js
@@ -1771,7 +1771,8 @@ define([
                    if (parentPath) {
                        $a = $('<a>').text(Messages.fm_openParent).click(function (e) {
                            e.preventDefault();
-                            parentPath.pop();
+                            if (filesOp.isInTrashRoot(parentPath)) { parentPath = [TRASH]; }
+                            else { parentPath.pop(); }
                            module.displayDirectory(parentPath);
                        });
                    }
@@ -1823,6 +1824,7 @@ define([
                displayDirectory(parentPath, true);
                return;
            }
+            if (!isSearch) { delete APP.Search.oldLocation; }

            module.resetTree();

@@ -2710,13 +2712,11 @@ define([
            }

            /* add the usage */
-            if (AppConfig.enablePinLimit) {
-                Cryptpad.createUsageBar(function (err, $limitContainer) {
-                    if (err) { return void logError(err); }
-                    $leftside.html('');
-                    $leftside.append($limitContainer);
-                });
-            }
+            Cryptpad.createUsageBar(function (err, $limitContainer) {
+                if (err) { return void logError(err); }
+                $leftside.html('');
+                $leftside.append($limitContainer);
+            });

            /* add a history button */
            var histConfig = {