mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-21 07:56:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

working with a big hack

Browse source
This commit is contained in:
John McLear 2015-01-21 14:25:24 +00:00
parent 34d6b31c98
commit 990e14c904
5 changed files with 25 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/static/js/contentcollector.js
View file

@ -35,9 +35,9 @@ function sanitizeUnicode(s)
return UNorm.nfc(s);
}
function makeContentCollector(collectStyles, browser, apool, domInterface, className2Author)
function makeContentCollector(collectStyles, abrowser, apool, domInterface, className2Author)
{
// browser = browser || {};
abrowser = abrowser || {};
// I don't like the above.
var dom = domInterface || {
@ -485,7 +485,7 @@ function makeContentCollector(collectStyles, browser, apool, domInterface, class
var cls = dom.nodeProp(node, "className");
var isPre = (tname == "pre");
if ((!isPre) && browser.safari)
if ((!isPre) && abrowser.safari)
{
isPre = (styl && /\bwhite-space:\s*pre\b/i.exec(styl));
}
@ -611,7 +611,7 @@ function makeContentCollector(collectStyles, browser, apool, domInterface, class
}
}
}
if (!browser.msie)
if (!abrowser.msie)
{
_reachBlockPoint(node, 1, state);
}
@ -627,7 +627,7 @@ function makeContentCollector(collectStyles, browser, apool, domInterface, class
}
}
if (browser.msie)
if (abrowser.msie)
{
// in IE, a point immediately after a DIV appears on the next line
_reachBlockPoint(node, 1, state);