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

hrm bit of a hack, anyone any ideas on better way?

Browse source
This commit is contained in:
John McLear 2015-01-28 19:09:47 +00:00
parent 0216a10a12
commit 35da64be5c
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -324,7 +324,6 @@ function makeContentCollector(collectStyles, abrowser, apool, domInterface, clas
return [key, value]; return [key, value];
}) })
); );
lines.appendText('*', Changeset.makeAttribsString('+', attributes , apool)); lines.appendText('*', Changeset.makeAttribsString('+', attributes , apool));
} }
cc.startNewLine = function(state) cc.startNewLine = function(state)
@ -472,8 +471,12 @@ function makeContentCollector(collectStyles, abrowser, apool, domInterface, clas
cls: cls, cls: cls,
node: node node: node
}); });
}else{
// THIS SEEMS VERY HACKY! -- Please submit a better fix!
delete state.lineAttributes.img
} }
else if (tname == "br")
if (tname == "br")
{ {
this.breakLine = true; this.breakLine = true;
var tvalue = dom.nodeAttr(node, 'value'); var tvalue = dom.nodeAttr(node, 'value');
@ -498,7 +501,6 @@ function makeContentCollector(collectStyles, abrowser, apool, domInterface, clas
{ {
var styl = dom.nodeAttr(node, "style"); var styl = dom.nodeAttr(node, "style");
var cls = dom.nodeProp(node, "className"); var cls = dom.nodeProp(node, "className");
var isPre = (tname == "pre"); var isPre = (tname == "pre");
if ((!isPre) && abrowser.safari) if ((!isPre) && abrowser.safari)
{ {