Merge pull request #2482 from ether/chrome-list-handling

chrome list handling fix for #2412

src/static/js/contentcollector.js

@@ -587,7 +587,9 @@ function makeContentCollector(collectStyles, abrowser, apool, domInterface, clas
           }
           else if ((tname == "div" || tname == "p") && cls && cls.match(/(?:^| )ace-line\b/))
           {
-            oldListTypeOrNull = (_enterList(state, type) || 'none');
+            // This has undesirable behavior in Chrome but is right in other browsers.
+            // See https://github.com/ether/etherpad-lite/issues/2412 for reasoning
+            if(!abrowser.chrome) oldListTypeOrNull = (_enterList(state, type) || 'none');
           }
           if (className2Author && cls)
           {