summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn McLear <john@mclear.co.uk>2014-10-24 00:13:34 +0100
committerJohn McLear <john@mclear.co.uk>2014-10-24 00:13:34 +0100
commitac2e949c3ef1e73b19f3a8bdcd1575ed563311f0 (patch)
tree536405847fa42fbad6ab27983a4a4c6f28f421a4
parent3fce9f83092b693e9b3ed5e4e7bb0b243f7e2b0c (diff)
downloadetherpad-lite-ac2e949c3ef1e73b19f3a8bdcd1575ed563311f0.zip
chrome browser change wrapping type
-rw-r--r--src/static/js/ace2_inner.js8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/static/js/ace2_inner.js b/src/static/js/ace2_inner.js
index fb6dd080..6a37ac7a 100644
--- a/src/static/js/ace2_inner.js
+++ b/src/static/js/ace2_inner.js
@@ -152,7 +152,6 @@ function Ace2Inner(){
var dmesg = noop;
window.dmesg = noop;
-
var scheduler = parent; // hack for opera required
var textFace = 'monospace';
@@ -597,6 +596,13 @@ function Ace2Inner(){
fixView();
});
}, 0);
+
+ // Chrome can't handle the truth.. If CSS rule white-space:pre-wrap
+ // is true then any paste event will insert two lines..
+ if(browser.chrome){
+ $("#innerdocbody").css({"white-space":"normal"});
+ }
+
}
function setStyled(newVal)