From 644536b27b5abdc7dac1c36e489bbc328701772f Mon Sep 17 00:00:00 2001 From: John McLear Date: Thu, 2 Apr 2015 13:16:49 +0100 Subject: [PATCH 1/5] fix for #2574 --- src/static/css/iframe_editor.css | 13 ++++++++++++- src/static/js/ace2_inner.js | 5 ++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/static/css/iframe_editor.css b/src/static/css/iframe_editor.css index eb69364bd..c32ae3f06 100644 --- a/src/static/css/iframe_editor.css +++ b/src/static/css/iframe_editor.css @@ -98,7 +98,18 @@ body.grayedout { background-color: #eee !important } } body.doesWrap { - white-space: pre-wrap; /*Must be pre-wrap to keep trailing spaces. Otherwise you get a zombie caret, walking around your screen (see #1766), WARNING: Enabling this causes Paste as plain text in Chrome to remove line breaks, this is probably undesirable */ + /* white-space: pre-wrap; */ + + /* + Must be pre-wrap to keep trailing spaces. Otherwise you get a zombie caret, + walking around your screen (see #1766). + WARNING: Enabling this causes Paste as plain text in Chrome to remove line breaks + this is probably undesirable + WARNING: This causes copy & paste events to lose bold etc. attributes + NOTE: The walking-zombie caret issue seems to have been fixed in FF upstream + so let's try diabling pre-wrap and see how we get on now. + For more details see: https://github.com/ether/etherpad-lite/issues/2574 + */ word-wrap: break-word; /* fix for issue #1648 - firefox not wrapping long lines (without spaces) correctly */ } diff --git a/src/static/js/ace2_inner.js b/src/static/js/ace2_inner.js index 44bf2bed3..14ebc404d 100644 --- a/src/static/js/ace2_inner.js +++ b/src/static/js/ace2_inner.js @@ -608,8 +608,11 @@ function Ace2Inner(){ // Chrome can't handle the truth.. If CSS rule white-space:pre-wrap // is true then any paste event will insert two lines.. + // Sadly this will mean you get a walking Caret in Chrome when clicking on a URL + // So this has to be set to pre-wrap ;( + // We need to file a bug w/ the Chromium team. if(browser.chrome){ - $("#innerdocbody").css({"white-space":"normal"}); + $("#innerdocbody").css({"white-space":"pre-wrap"}); } } From dfd17d1aba8e3e803e6cb951f7b0e8625ce39143 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Dubigny?= Date: Sat, 4 Apr 2015 17:14:59 +0200 Subject: [PATCH 2/5] Update installDeps.sh --- bin/installDeps.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/installDeps.sh b/bin/installDeps.sh index 04c4a02a9..914e45a45 100755 --- a/bin/installDeps.sh +++ b/bin/installDeps.sh @@ -103,7 +103,7 @@ if [ $DOWNLOAD_JQUERY = "true" ]; then fi #Remove all minified data to force node creating it new -echo "Clear minfified cache..." +echo "Clear minified cache..." rm -f var/minified* echo "Ensure custom css/js files are created..." From 119fc82387695a5bddd1ab441d9022ff50594684 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Dubigny?= Date: Sat, 4 Apr 2015 17:30:41 +0200 Subject: [PATCH 3/5] Update installDeps.sh --- bin/installDeps.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/installDeps.sh b/bin/installDeps.sh index 914e45a45..a5e4d5abd 100755 --- a/bin/installDeps.sh +++ b/bin/installDeps.sh @@ -103,7 +103,7 @@ if [ $DOWNLOAD_JQUERY = "true" ]; then fi #Remove all minified data to force node creating it new -echo "Clear minified cache..." +echo "Clearing minified cache..." rm -f var/minified* echo "Ensure custom css/js files are created..." From e0270d0ba8dd9f4fff62fbd44fd6c4f8cb57b825 Mon Sep 17 00:00:00 2001 From: John McLear Date: Mon, 6 Apr 2015 13:16:21 +0100 Subject: [PATCH 4/5] bump vs --- src/package.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/package.json b/src/package.json index d7b71a8c4..f2b147d54 100644 --- a/src/package.json +++ b/src/package.json @@ -13,25 +13,25 @@ ], "dependencies" : { "etherpad-yajsml" : "0.0.2", - "request" : "2.53.0", + "request" : "2.55.0", "etherpad-require-kernel" : "1.0.8", - "resolve" : "1.1.0", - "socket.io" : "1.3.3", + "resolve" : "1.1.6", + "socket.io" : "1.3.5", "ueberDB" : "0.2.14", "express" : "3.8.1", "async" : "0.9.0", "connect" : "2.7.11", - "clean-css" : "3.0.8", - "uglify-js" : "2.4.16", - "formidable" : "1.0.16", + "clean-css" : "3.1.9", + "uglify-js" : "2.4.19", + "formidable" : "1.0.17", "log4js" : "0.6.22", - "cheerio" : "0.18.0", + "cheerio" : "0.19.0", "async-stacktrace" : "0.0.2", - "npm" : "2.4.1", + "npm" : "2.7.5", "ejs" : "1.0.0", - "graceful-fs" : "3.0.5", + "graceful-fs" : "3.0.6", "slide" : "1.1.6", - "semver" : "4.2.0", + "semver" : "4.3.3", "security" : "1.0.0", "tinycon" : "0.0.1", "underscore" : "1.5.1", @@ -41,7 +41,7 @@ "channels" : "0.0.4", "jsonminify" : "0.2.3", "measured" : "1.0.0", - "mocha" : "2.1.0", + "mocha" : "2.2.1", "supertest" : "0.15.0" }, "bin": { "etherpad-lite": "./node/server.js" }, From a5aa58e28bb9fcd5d645898077a77086a13145eb Mon Sep 17 00:00:00 2001 From: John McLear Date: Mon, 6 Apr 2015 13:18:44 +0100 Subject: [PATCH 5/5] bump ueber --- src/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/package.json b/src/package.json index f2b147d54..4070431e4 100644 --- a/src/package.json +++ b/src/package.json @@ -17,7 +17,7 @@ "etherpad-require-kernel" : "1.0.8", "resolve" : "1.1.6", "socket.io" : "1.3.5", - "ueberDB" : "0.2.14", + "ueberDB" : "0.2.15", "express" : "3.8.1", "async" : "0.9.0", "connect" : "2.7.11",