mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-22 08:26:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

Merge pull request #2282 from ether/chrome-paste

Browse source 
Chrome browser change wrapping type
This commit is contained in:
John McLear 2014-11-13 13:00:32 +00:00
commit a52743d8f1
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/static/js/ace2_inner.js
View file

@ -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)