diff options
author | John McLear <john@mclear.co.uk> | 2015-10-22 16:18:29 +0100 |
---|---|---|
committer | John McLear <john@mclear.co.uk> | 2015-10-22 16:18:29 +0100 |
commit | 08c6e3e29f264d0900767ad27fc0d41420af4a26 (patch) | |
tree | 6cdec6112077c07b16597697f8ba12fc06827401 /src/static/js/contentcollector.js | |
parent | 0d769632df42c5f15d7125fd448059f004c68459 (diff) | |
parent | 275a7d31e0949aeccc40e4412db5f76da0f06f30 (diff) | |
download | etherpad-lite-08c6e3e29f264d0900767ad27fc0d41420af4a26.zip |
Merge pull request #2739 from otetard/bugfix/fix_space_removal
Avoid space removal when pasting text from word processor.
Diffstat (limited to 'src/static/js/contentcollector.js')
-rw-r--r-- | src/static/js/contentcollector.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/static/js/contentcollector.js b/src/static/js/contentcollector.js index 5c1e8efb..6820da07 100644 --- a/src/static/js/contentcollector.js +++ b/src/static/js/contentcollector.js @@ -100,7 +100,7 @@ function makeContentCollector(collectStyles, abrowser, apool, domInterface, clas function textify(str) { return sanitizeUnicode( - str.replace(/\n/g, '').replace(/[\n\r ]/g, ' ').replace(/\xa0/g, ' ').replace(/\t/g, ' ')); + str.replace(/(\n | \n)/g, ' ').replace(/[\n\r ]/g, ' ').replace(/\xa0/g, ' ').replace(/\t/g, ' ')); } function getAssoc(node, name) |