mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-20 23:46:14 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'develop' of github.com:ether/etherpad-lite into editbar-accessibility

Browse source
This commit is contained in:
John McLear 2015-04-06 13:19:42 +01:00
commit 7e99724fec
4 changed files with 29 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -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"});
}
}