diff options
| author | John McLear <john@mclear.co.uk> | 2015-01-28 19:09:47 +0000 |
|---|---|---|
| committer | John McLear <john@mclear.co.uk> | 2015-01-28 19:09:47 +0000 |
| commit | 35da64be5c5438f098ca14acf56ca601b224bb5a (patch) | |
| tree | 898bf12aa6379ffa844ff57d56a9b8df70687121 /src | |
| parent | 0216a10a129210abbc36fdbbcd29acf445e75ff5 (diff) | |
| download | etherpad-lite-35da64be5c5438f098ca14acf56ca601b224bb5a.zip | |
hrm bit of a hack, anyone any ideas on better way?
Diffstat (limited to 'src')
| -rw-r--r-- | src/static/js/contentcollector.js | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/static/js/contentcollector.js b/src/static/js/contentcollector.js index fcb29981..e428c63f 100644 --- a/src/static/js/contentcollector.js +++ b/src/static/js/contentcollector.js @@ -324,7 +324,6 @@ function makeContentCollector(collectStyles, abrowser, apool, domInterface, clas return [key, value]; }) ); - lines.appendText('*', Changeset.makeAttribsString('+', attributes , apool)); } cc.startNewLine = function(state) @@ -472,9 +471,13 @@ function makeContentCollector(collectStyles, abrowser, apool, domInterface, clas cls: cls, 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; var tvalue = dom.nodeAttr(node, 'value'); var induceLineBreak = hooks.callAll('collectContentLineBreak', { @@ -498,7 +501,6 @@ function makeContentCollector(collectStyles, abrowser, apool, domInterface, clas { var styl = dom.nodeAttr(node, "style"); var cls = dom.nodeProp(node, "className"); - var isPre = (tname == "pre"); if ((!isPre) && abrowser.safari) { |