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 |
|