libre-service.eu/pad.libre-service.eu-etherpad
libre-service.eu/pad.libre-service.eu-etherpad
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-01-20 06:29:53 +01:00
Code Issues Projects Releases Wiki Activity

better fix for #2625

Browse source
This commit is contained in:
John McLear 2015-05-01 20:44:36 +01:00
parent 4938c7be38
commit 0a9c631410
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/static/css/iframe_editor.css
View file

@ -113,7 +113,11 @@ body.doesWrap {
word-wrap: break-word; /* fix for issue #1648 - firefox not wrapping long lines (without spaces) correctly */ word-wrap: break-word; /* fix for issue #1648 - firefox not wrapping long lines (without spaces) correctly */
} }
body.doesWrap > div{ .noprewrap{
white-space: normal;
}
body.doesWrap:not(.noprewrap) > div{
/* Related to #1766 */ /* Related to #1766 */
white-space: pre-wrap; white-space: pre-wrap;
} }

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

@ -612,7 +612,7 @@ function Ace2Inner(){
// So this has to be set to pre-wrap ;( // So this has to be set to pre-wrap ;(
// We need to file a bug w/ the Chromium team. // We need to file a bug w/ the Chromium team.
if(browser.chrome){ if(browser.chrome){
$("#innerdocbody, body.doesWrap > div").css({"white-space":"pre-wrap"}); $("#innerdocbody").addClass("noprewrap");
} }
} }