Merge branch 'staging' into pad2

customize.dist/translations/messages.js

@@ -611,6 +611,7 @@ define(function () {
     out.header_support = '<a href="http://ng.open-paas.org/" title="OpenPaaS::ng" target="_blank" rel="noopener noreferrer"> <img src="/customize/openpaasng.png" alt="OpenPaaS-ng" class="bottom-bar-openpaas" /></a>';
     out.updated_0_header_logoTitle = 'Go to your CryptDrive';
     out.header_logoTitle = out.updated_0_header_logoTitle;
+    out.header_homeTitle = 'Go to CryptPad homepage';
 
     // Initial states
 

www/code/main.js

@@ -388,24 +388,32 @@ define([
                 });
 
                 // add the splitter
-                var splitter = $('<div>', {
-                    'class': 'cp-splitter'
-                }).appendTo($iframe.find('#previewContainer'));
+                if (!$iframe.has('.cp-splitter').length) {
+                    var $preview = $iframe.find('#previewContainer');
+                    var splitter = $('<div>', {
+                        'class': 'cp-splitter'
+                    }).appendTo($preview);
+
+                    $preview.on('scroll', function() {
+                        splitter.css('top', $preview.scrollTop() + 'px');
+                    });
 
-                var $target = $iframe.find('.CodeMirror');
-                splitter.on('mousedown', function (e) {
-                    e.preventDefault();
-                    var x = e.pageX;
-                    var w = $target.width();
+                    var $target = $iframe.find('.CodeMirror');
 
-                    $iframe.on('mouseup mousemove', function handler(evt) {
-                        if (evt.type === 'mouseup') {
-                            $iframe.off('mouseup mousemove', handler);
-                            return;
-                        }
-                        $target.css('width', (w - x + evt.pageX) + 'px');
+                    splitter.on('mousedown', function (e) {
+                        e.preventDefault();
+                        var x = e.pageX;
+                        var w = $target.width();
+
+                        $iframe.on('mouseup mousemove', function handler(evt) {
+                            if (evt.type === 'mouseup') {
+                                $iframe.off('mouseup mousemove', handler);
+                                return;
+                            }
+                            $target.css('width', (w - x + evt.pageX) + 'px');
+                        });
                     });
-                });
+                }
 
                 Cryptpad.removeLoadingScreen();
                 setEditable(true);

www/common/toolbar2.js

@@ -624,9 +624,14 @@ define([
         }).appendTo(toolbar.$top);
 
         // We need to override the "a" tag action here because it is inside the iframe!
+        var inDrive = /^\/drive/;
+
+        var href = inDrive ? '/index.html' : '/drive/';
+        var buttonTitle = inDrive ? Messages.header_homeTitle : Messages.header_logoTitle;
+
         var $aTag = $('<a>', {
-            href: "/drive/",
-            title: Messages.header_logoTitle,
+            href: href,
+            title: buttonTitle,
             'class': "cryptpad-logo"
         }).append($('<img>', {
             src: '/customize/images/logo_white.png'
@@ -634,10 +639,10 @@ define([
         var onClick = function (e) {
             e.preventDefault();
             if (e.ctrlKey) {
-                window.open('/drive/');
+                window.open(href);
                 return;
             }
-            window.location = "/drive/";
+            window.location = href;
         };
 
         var onContext = function (e) { e.stopPropagation(); };