infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity
284 Commits
1 Branch
3 Tags
274 MiB
Commit Graph

208 Commits (400f6efde15978f2755c8bc84bd0dc87a811e4d2)

Author SHA1 Message Date
ansuz 0d33af773f implement optional filtering in hyperjson 
Implemented via callback, return falsey if you want to filter an element
and all of its children from the serialized result.
 2016-03-24 12:11:31 +01:00
ansuz 1bd5cb9e27 hyperjson.js : used split instead of filter... oops 2016-03-23 12:31:16 +01:00
ansuz b2753ef7b7 fix string manipulation off-by-one 2016-03-22 19:29:58 +01:00
ansuz 0c6222b5f9 better error reporting when the operational transform fails to parse JSON 2016-03-22 10:19:13 +01:00
ansuz 79a9998b13 implement better serialization of class names 
RTWYSIWYG-27 : poorly formed yet valid HTML caused hyperjson to produce element
               selectors which hyperscript could not parse.
 2016-03-22 10:16:14 +01:00
ansuz bd24821c6c Don't attempt to use the cursor selection when it has length 0 
RTWYSIWYG-20
RTWYSIWYG-24
 2016-03-22 10:06:42 +01:00
ansuz 3a7af63c54 correct malformed json 2016-03-10 11:58:23 +01:00
ansuz 136e2d8cf2 pass in missing textarea argument so textpad starts working again 2016-03-09 11:02:12 +01:00
ansuz 8258018c1d Revert "fix undefined reference" 
This reverts commit 7d65540123.

To restore functionality in convert.js
 2016-03-09 10:32:57 +01:00
ansuz c67451bc1a Revert "remove broken functions from convert module" 
Because I forgot that the /render/ page was still using vdom

This reverts commit 93fb944e1f.
 2016-03-09 10:29:51 +01:00
ansuz d3e2a2f52e make verbose logging switchable via a conditional 2016-03-07 11:59:36 +01:00
ansuz 1c54af69a1 update minor editors to use new realtime-input api 2016-03-07 11:52:18 +01:00
ansuz 9b228eea6b modify vdom main.js to adhere to new realtime-input api 2016-03-07 11:36:33 +01:00
ansuz fefb904261 realtime input changes 2016-03-07 11:34:16 +01:00
ansuz fd99dba4a3 modify realtime-input api to take a single object as configuration. merge netflux API 2016-03-07 11:33:46 +01:00
Yann Flory 62ba579d4a Add Netflux API with WebSocket service V1 2016-03-07 11:07:37 +01:00
ansuz 53d3e475f7 ui hints for hackpad 2016-03-04 16:47:59 +01:00
ansuz d2f4fbcee9 fail the toolbar from the application layer 2016-03-04 16:46:18 +01:00
ansuz d7b34cf6be don't call toolbar from within realtime-input.js 2016-03-04 16:45:11 +01:00
ansuz e8469ae1bb test out extended realtime-input api 2016-03-04 16:41:34 +01:00
ansuz 5e1566eaec fix incomplete 'onAbort' block 2016-03-04 11:07:12 +01:00
ansuz 52fe892bae invert logical relationship with flag 
otherwise updates don't actually propogate
 2016-03-04 11:05:58 +01:00
ansuz 938df2b92f lock the editor until the chain has synced 
add 'onAbort' hook. lock the editor if the connection fails.
 2016-03-03 18:05:05 +01:00
ansuz 1d6ccc99a1 add 'onAbort' hook to realtime-input.js 2016-03-03 18:04:14 +01:00
ansuz e5bef52850 reintroduce the toolbar 2016-03-03 16:05:07 +01:00
ansuz 6ff5b10486 remove local diffDOM version 2016-03-03 16:04:08 +01:00
ansuz 93fb944e1f remove broken functions from convert module 2016-03-03 15:18:05 +01:00
ansuz 7d65540123 fix undefined reference 2016-03-03 15:12:43 +01:00
ansuz c246adc57b Lock contenteditable until chain is done syncing. 
Don't bother patching the dom until the chain has synced
 2016-03-03 14:38:07 +01:00
ansuz 1c0074258c go back to using diffDOM from bower 
The latest version is required. You'll need to update.
 2016-03-03 10:49:59 +01:00
ansuz 79bd82a62e main.js : integrate with patched diffDOM 2016-02-29 17:59:00 +01:00
ansuz 6884fabda9 Use local diffDOM instead of bower_components 
At least until the PR gets accepted
 2016-02-29 17:05:04 +01:00
ansuz f5a8727254 remove some unused functions from cursor.js 2016-02-29 16:52:07 +01:00
ansuz db1515c445 cursor.js : commit before cleaning up 2016-02-29 16:27:55 +01:00
ansuz 7e367e770e resize vdom debug panel to 30% width 2016-02-29 15:37:51 +01:00
ansuz 91ada5ce7a export Operation from chainpad. for use with OT 2016-02-29 15:28:32 +01:00
ansuz 5425699f43 check if possible parent exists before checking if it contains another element 2016-02-29 15:27:11 +01:00
ansuz 67bdb8a65a fix a bad regex that occasionally threw an error 
'nothing to repeat'
 2016-02-25 12:35:11 +01:00
ansuz e87a4599a4 main.js : tiny patch until things are working correctly. 2016-02-23 16:22:09 +01:00
ansuz 9ce59c985f only do stuff with the cursor when a remote edit takes place 2016-02-23 15:54:25 +01:00
ansuz 39f56d4fd1 throw error when checking for the index of a node that has no parent. 
it probably isn't in the dom if this is the case.
Check if it's there before using this function
 2016-02-23 15:53:58 +01:00
ansuz de46be85ba add better helpers for finding and resetting the cursor 2016-02-23 15:52:58 +01:00
ansuz 7e7f1fee76 include abstracted json-ot, add comments, start to use cursor stuff 2016-02-22 18:01:57 +01:00
ansuz c09036bd29 snapshot cursor.js, as some things are working quite well now 2016-02-22 18:00:46 +01:00
ansuz 4eee1f5210 add orderOfNodes function to tree library 2016-02-22 17:56:17 +01:00
ansuz 7689151fc0 pull json validation for OT into its own module for reuse 2016-02-22 17:54:59 +01:00
ansuz fbb9163e42 main.js : clean up and commit before making big-ish changes for cursor fixing 2016-02-19 14:12:22 +01:00
ansuz 2c8a2406c6 cursor.js : snapshot before code deletion 2016-02-19 14:07:43 +01:00
ansuz 1beb3f5355 snapshot of treesome.js before deletion 2016-02-19 14:07:16 +01:00
ansuz 8ead5ca129 realtime-input.js : add notes regarding integration of the netflux api 2016-02-16 15:14:38 +01:00
ansuz 3cb94b8d80 jshint compliance 2016-02-15 16:07:46 +01:00
ansuz d1885fbab6 better jshint compliance for common files 2016-02-15 15:42:08 +01:00
ansuz 539cc3a2fa remove unused files from common directory 2016-02-15 15:41:36 +01:00
ansuz afa2811472 remove local version of marked.js, prefer bower version 2016-02-15 11:49:47 +01:00
ansuz 587f95b6d7 don't overflow 2016-02-14 12:01:05 +01:00
ansuz a01331cb9a hide styling textarea no matter what 2016-02-12 16:44:54 +01:00
ansuz a600ece5c5 fix jshint complaints in common directory 2016-02-12 16:22:20 +01:00
ansuz 4a05a859e6 fix initialization routines 2016-02-12 16:21:52 +01:00
ansuz f1915d3b7c fix jshint complaints in pad directory 2016-02-12 16:21:17 +01:00
ansuz fe3917c0f1 fix jshint complaints in codemirror directory 2016-02-12 16:20:55 +01:00
ansuz 2c5a2b6023 remove unused code, add todos, fix minor errors 2016-02-12 12:03:15 +01:00
ansuz c5ab5dfe26 realtime style editor with lorum ipsum 2016-02-12 11:45:40 +01:00
ansuz 967d636df9 address more jshint complaints 2016-02-12 11:39:37 +01:00
ansuz f6c848385f hyperjson.js : jshint complains about var index in for loop 2016-02-12 11:21:33 +01:00
ansuz 0fbbb51f7f drop this useless line 2016-02-12 11:19:36 +01:00
ansuz d1dd497457 html-patcher.js : add missing semicolon 2016-02-12 11:17:10 +01:00
ansuz 62ea172ff4 errorbox.js : add missing semicolon so jshint doesn't complain 2016-02-12 11:15:59 +01:00
ansuz 3b5c932252 jshint ignore eval line 2016-02-12 11:10:59 +01:00
ansuz 7f92abc7bf Merge branch 'diffdom' of github.com:xwiki-labs/cryptpad into demoEffect 2016-02-12 10:24:11 +01:00
Caleb James DeLisle a7da21ccba Remove the cursor treatment 2016-02-11 16:22:59 +01:00
Caleb James DeLisle 86c4a69a97 Switch to patching with DiffDOM for testing :D 2016-02-11 16:10:44 +01:00
ansuz 653ba33b65 Merge branch 'vdom' of github.com:xwiki-labs/cryptpad into demoEffect 2016-02-11 13:15:57 +01:00
Caleb James DeLisle 2031191261 testing=false 2016-02-11 13:13:58 +01:00
Caleb James DeLisle 37db31b09e Attempt an operational transformation and if the result is not valid JSON then fail 2016-02-11 12:34:06 +01:00
Caleb James DeLisle e16299b5c4 Revert "restub OT until it's verified" 
This reverts commit 350c9e6c76.
 2016-02-11 12:33:12 +01:00
ansuz c22269e36e cursor.js : make the console a little less noisy 2016-02-11 10:02:47 +01:00
ansuz 350c9e6c76 restub OT until it's verified 2016-02-11 09:44:47 +01:00
ansuz 99a23154b7 files for unstubbing OT 2016-02-11 09:38:58 +01:00
ansuz c740c0ec92 add stuff for walking the tree 2016-02-11 09:32:58 +01:00
ansuz ad184b1114 add stuff to recover the cursor 2016-02-11 09:32:41 +01:00
ansuz 1aea11bb30 describe all the prototypes which are available 2016-02-10 16:50:00 +01:00
ansuz 9b13fd8f34 pull cursor correction code out of main.js 
put it in cursor.js
 2016-02-10 11:38:53 +01:00
ansuz 3b0ac3af4c More sensible styles 
respond to viewport size
don't use gigantic font
 2016-02-10 10:53:56 +01:00
ansuz b43674eb53 switch back to two-panel layout 2016-02-10 10:52:46 +01:00
ansuz f33e061c9a visit /hack/ to see what this is 
I'll leave it up to the users to decide
whether XSS is a bug or a feature
 2016-02-10 10:47:33 +01:00
ansuz 019750bea8 realtime-input.js : callback onInit if exists 2016-02-10 10:40:52 +01:00
ansuz 61fbf81dcd factor out rainbow stuff into rainbow.js 2016-02-05 11:55:37 +01:00
ansuz 7102a0a164 make rainbows 2016-02-05 11:48:34 +01:00
ansuz aa3880f442 up to date 2016-02-03 16:48:49 +01:00
ansuz d2f6c63d8a realtime-input.js : changed the api and left an undefined reference. fixed 2016-02-03 12:58:54 +01:00
ansuz 150c9a300d scale viewport so mobile is readable 2016-02-03 12:50:36 +01:00
ansuz d96124229b clean up realtime-input.js, break API 
use an object for configuration, so as to be more extensible.
modify applications which use the API to match.
 2016-02-03 12:45:45 +01:00
ansuz e43b9715e8 remove /md/ prototype 
use /text/ and /render/ instead.
 2016-02-03 11:52:23 +01:00
ansuz 64cc177a60 remove vmd directory 
it was only a prototype, and only contained code which was no longer useful
 2016-02-03 11:46:11 +01:00
ansuz e220113e98 fix the 'crapstorm' bug 2016-02-01 19:41:55 +01:00
ansuz ed03a48092 minor patches that make things a bit more reliable, still some bugs 2016-02-01 19:41:13 +01:00
ansuz ac0f7852fc committing latest changes for review 2016-02-01 15:28:33 +01:00
ansuz 2016550e01 virtual-dom.js : identify problem area? 2016-02-01 14:28:13 +01:00
ansuz 08fb010627 give 'onChange' a name 2016-02-01 14:27:43 +01:00
ansuz b52327be49 restyle /text/ page 2016-02-01 14:14:48 +01:00