summaryrefslogtreecommitdiff
path: root/src/static/js/contentcollector.js
AgeCommit message (Collapse)Author
2015-03-31Merge pull request #2482 from ether/chrome-list-handlingJohn McLear
chrome list handling fix for #2412
2015-03-26Feature #2567 Added workaround to enable contentcollector to write key-value ↵Thomas Muehlichen
attributes
2015-01-28hrm bit of a hack, anyone any ideas on better way?John McLear
2015-01-27better variable nameJohn McLear
2015-01-27change to cc..John McLear
2015-01-27content collector should also register the blocks, no idea why this wasnt in ↵John McLear
before
2015-01-26even cleanerJohn McLear
2015-01-26much cleanerJohn McLear
2015-01-26clean support for image hookJohn McLear
2015-01-23chrome list handling fix for #2412John McLear
2015-01-21try againJohn McLear
2015-01-21working with a big hackJohn McLear
2015-01-21blind attempt to tryJohn McLear
2015-01-19hrmJohn McLear
2015-01-18allow list text entry up to 16 itemsJohn McLear
2015-01-09fix for uls without classwebzwo0i
2014-12-31patch for e1c683be3f47a350e6bac3146507bd2d7d7478f6John McLear
2014-12-29differentiate between indents and bullets in unordered listswebzwo0i
2014-12-16Merge pull request #2373 from webzwo0i/avoid-global-vairablesJohn McLear
dont make local variables global
2014-12-14dont make local variables globalwebzwo0i
2014-11-27sanitizer changeJohn McLear
2014-11-25use cheerio instead of jsdomJohn McLear
2014-11-01take line breaks and treat them appropriatly instead of creating a space for ↵John McLear
them..
2013-12-05Replace tabs indentation with spaces indentationLuc Didry
Some files are obviously external libraries, I didn't touch them
2013-04-17Remove console.log in content collectorMarcel Klehr
fixes #1731
2012-11-02fix imported ol that were turned into ulChia-liang Kao
2012-10-23Do not assume window object existsChia-liang Kao
2012-09-14Merge pull request #992 from gedion/developJohn McLear
Added hooks and made some ace functions available to editorInfo Object
2012-09-11fixed commentsGedion
2012-09-11fixed pluginsGedion
2012-09-09Use packaged version of UNorm.Chad Weider
2012-09-08added hooks and made some functions available to editor info object in aceGedion
2012-09-08added hooks to contentcollector.jsGedion
2012-09-08added hooks to contentcollector.jsGedion
2012-08-13Normalize inserted text using UNormDaniel Perez Alvarez
For some reason, the client was sending the server a Unicode-normalized version of inserted strings. So if for example we inserted the string 'ä' (i.e. \x61\xCC\x88) into the document, what would be sent to the server would be 'ä' (i.e. \xC3\xA4). This wouldn't be a problem on its own. BUT JavaScript reports that the length of the first string is 2, while the length of the second one is 1. So the command that was being sent to the server was 'Z:1>2*0+1$ä', when it should really be 'Z:1>1*0+1$ä'. When the `checkRep` method checks the length of the inserted string, it finds an inconsistency, and disconnects the client. We now normalize the inserted string before the command is generated, so the length is always correct.
2012-08-01fix #890 test if console is available before writing to console.logWikinaut
2012-07-25Fix #769 - wonky bug with pasted listsodony
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.
2012-04-07made domline and content collector lineAttributes compatibleMatthias Bartelmeß
2012-04-07removed unused variableMatthias Bartelmeß
2012-03-10Merge branch 'require-paths' into pluginChad Weider
Conflicts: node/server.js src/static/js/Changeset.js src/static/js/ace.js src/static/js/ace2_common.js src/static/js/ace2_inner.js src/static/js/broadcast.js src/static/js/changesettracker.js src/static/js/chat.js src/static/js/collab_client.js src/static/js/contentcollector.js src/static/js/domline.js src/static/js/linestylefilter.js src/static/js/pad.js src/static/js/pad_connectionstatus.js src/static/js/pad_docbar.js src/static/js/pad_editbar.js src/static/js/pad_editor.js src/static/js/pad_impexp.js src/static/js/pad_modals.js src/static/js/pad_savedrevs.js src/static/js/pad_userlist.js src/static/js/pad_utils.js src/static/js/timeslider.js src/static/js/undomodule.js src/static/pad.html src/static/timeslider.html
2012-03-01Made ace actually use the new hooks system, and removed remnants of old systemEgil Moeller
2012-02-26First stab at getting client side require(plugin/..) to work from within ↵Egil Moeller
etherpad
2012-02-26The Big Renaming - etherpad is now an NPM moduleEgil Moeller