public-offering
/
pad.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2482 from ether/chrome-list-handling 

chrome list handling fix for #2412
pull/2509/merge
John McLear 2015-03-31 23:19:47 +01:00
parent b404af7c17 5dce72d419
commit b6ff1807da
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/static/js/contentcollector.js
View File

@ -587,7 +587,9 @@ function makeContentCollector(collectStyles, abrowser, apool, domInterface, clas
} }
else if ((tname == "div" || tname == "p") && cls && cls.match(/(?:^| )ace-line\b/)) else if ((tname == "div" || tname == "p") && cls && cls.match(/(?:^| )ace-line\b/))
{ {
oldListTypeOrNull = (_enterList(state, type) || 'none'); // This has undesirable behavior in Chrome but is right in other browsers.
// See https://github.com/ether/etherpad-lite/issues/2412 for reasoning
if(!abrowser.chrome) oldListTypeOrNull = (_enterList(state, type) || 'none');
} }
if (className2Author && cls) if (className2Author && cls)
{ {