fuwafuwa
/
etherpad-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
John McLear 2015-04-28 23:42:11 +01:00
parent 1f471b0f81 799b086216
commit ac41d150c0
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -71,8 +71,9 @@ function makeContentCollector(collectStyles, abrowser, apool, domInterface, clas
}, },
nodeAttr: function(n, a) nodeAttr: function(n, a)
{ {
if(n.getAttribute == null) return null; if(n.getAttribute != null) return n.getAttribute(a);
return n.getAttribute(a); if(n.attribs != null) return n.attribs[a];
return null;
}, },
optNodeInnerHTML: function(n) optNodeInnerHTML: function(n)
{ {
@ -516,7 +517,7 @@ function makeContentCollector(collectStyles, abrowser, apool, domInterface, clas
else if (!isEmpty) else if (!isEmpty)
{ {
var styl = dom.nodeAttr(node, "style"); var styl = dom.nodeAttr(node, "style");
var cls = dom.nodeProp(node, "className"); var cls = dom.nodeAttr(node, "class");
var isPre = (tname == "pre"); var isPre = (tname == "pre");
if ((!isPre) && abrowser.safari) if ((!isPre) && abrowser.safari)
{ {