diff options
| author | odony <odo@openerp.com> | 2012-07-25 14:30:33 +0300 |
|---|---|---|
| committer | Matthias Bartelmeß <mba@fourplusone.de> | 2012-07-25 13:45:53 +0200 |
| commit | a2bf577393116557b02df978f55d9b44d1e8f715 (patch) | |
| tree | fa751c55767d1fe83594371deb87f457b35c4c74 /src/static/js/contentcollector.js | |
| parent | c9e8f7e7af76f7a372241f07231e5302429e7822 (diff) | |
| download | etherpad-lite-a2bf577393116557b02df978f55d9b44d1e8f715.zip | |
Fix #769 - wonky bug with pasted lists
After 6507614e459dac868d3c76355ca013d13132bc79 the contentcollector does not properly "exit" lists back to the `none` listType anymore.
The repro steps on #769 seem to pass correctly after this change.
Diffstat (limited to 'src/static/js/contentcollector.js')
| -rw-r--r-- | src/static/js/contentcollector.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/static/js/contentcollector.js b/src/static/js/contentcollector.js index 219976d3..2e848f97 100644 --- a/src/static/js/contentcollector.js +++ b/src/static/js/contentcollector.js @@ -258,7 +258,8 @@ function makeContentCollector(collectStyles, browser, apool, domInterface, class { state.listNesting--; } - if(oldListType) state.lineAttributes['list'] = oldListType; + if (oldListType && oldListType != 'none') { state.lineAttributes['list'] = oldListType; } + else { delete state.lineAttributes['list']; } _recalcAttribString(state); } |