diff options
author | John McLear <john@mclear.co.uk> | 2014-11-13 13:00:32 +0000 |
---|---|---|
committer | John McLear <john@mclear.co.uk> | 2014-11-13 13:00:32 +0000 |
commit | a52743d8f15e9f5667f138ccee3a2547b959fc1b (patch) | |
tree | 950c257b8592da9db803077c68e373f7c8450450 /src | |
parent | 07d29a5d7a45d32fa9ea25991880729f8ff6a715 (diff) | |
parent | ac2e949c3ef1e73b19f3a8bdcd1575ed563311f0 (diff) | |
download | etherpad-lite-a52743d8f15e9f5667f138ccee3a2547b959fc1b.zip |
Merge pull request #2282 from ether/chrome-paste
Chrome browser change wrapping type
Diffstat (limited to 'src')
-rw-r--r-- | src/static/js/ace2_inner.js | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/static/js/ace2_inner.js b/src/static/js/ace2_inner.js index ad5dd905..59c58b19 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) |