ansuz
|
e3b78e20de
|
Merge branch 'cjd-fixed-it-with-hax' of github.com:xwiki-labs/cryptpad into cjd-fixed-it-with-hax
|
9 years ago |
|
ansuz
|
e26246178f
|
start to clean up and give things more sensible names.
get rid of the textarea entirely
|
9 years ago |
|
Caleb James DeLisle
|
b372b0b77c
|
small change to chainpad in order to make it more likely to fail if the authDoc goes into the wrong state
|
9 years ago |
|
Caleb James DeLisle
|
f3fb674504
|
Merge branch 'cjd-fixed-it-with-hax' of github.com:xwiki-labs/cryptpad into cjd-fixed-it-with-hax
|
9 years ago |
|
Caleb James DeLisle
|
98c85cef8b
|
xxx
|
9 years ago |
|
ansuz
|
12dcbc9121
|
fix quick red fox and make test.cancel work again
|
9 years ago |
|
Caleb James DeLisle
|
62eabbc7ae
|
If a message does not match parent hash, don't delete it from storage
|
9 years ago |
|
Caleb James DeLisle
|
dbf31798d5
|
json-ot triggering PARANOIA errors in ChainPad
|
9 years ago |
|
Caleb James DeLisle
|
03932d0169
|
small changes to chainpad for testing
|
9 years ago |
|
Caleb James DeLisle
|
669bcc1935
|
If there is a difference in the hjson then send a message back
|
9 years ago |
|
Caleb James DeLisle
|
f62ec85a4c
|
Shuffled around some assertions and logs
|
9 years ago |
|
Caleb James DeLisle
|
420a7098a6
|
more testing and crap
|
9 years ago |
|
ansuz
|
4b35a145e3
|
Push WIP
|
9 years ago |
|
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.
|
9 years ago |
|
ansuz
|
1bd5cb9e27
|
hyperjson.js : used split instead of filter... oops
|
9 years ago |
|
ansuz
|
b2753ef7b7
|
fix string manipulation off-by-one
|
9 years ago |
|
ansuz
|
0c6222b5f9
|
better error reporting when the operational transform fails to parse JSON
|
9 years ago |
|
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.
|
9 years ago |
|
ansuz
|
bd24821c6c
|
Don't attempt to use the cursor selection when it has length 0
RTWYSIWYG-20
RTWYSIWYG-24
|
9 years ago |
|
ansuz
|
3a7af63c54
|
correct malformed json
|
9 years ago |
|
ansuz
|
136e2d8cf2
|
pass in missing textarea argument so textpad starts working again
|
9 years ago |
|
ansuz
|
8258018c1d
|
Revert "fix undefined reference"
This reverts commit 7d65540123.
To restore functionality in convert.js
|
9 years ago |
|
ansuz
|
c67451bc1a
|
Revert "remove broken functions from convert module"
Because I forgot that the /render/ page was still using vdom
This reverts commit 93fb944e1f.
|
9 years ago |
|
ansuz
|
d3e2a2f52e
|
make verbose logging switchable via a conditional
|
9 years ago |
|
ansuz
|
1c54af69a1
|
update minor editors to use new realtime-input api
|
9 years ago |
|
ansuz
|
9b228eea6b
|
modify vdom main.js to adhere to new realtime-input api
|
9 years ago |
|
ansuz
|
fefb904261
|
realtime input changes
|
9 years ago |
|
ansuz
|
fd99dba4a3
|
modify realtime-input api to take a single object as configuration. merge netflux API
|
9 years ago |
|
Yann Flory
|
62ba579d4a
|
Add Netflux API with WebSocket service V1
|
9 years ago |
|
ansuz
|
53d3e475f7
|
ui hints for hackpad
|
9 years ago |
|
ansuz
|
d2f4fbcee9
|
fail the toolbar from the application layer
|
9 years ago |
|
ansuz
|
d7b34cf6be
|
don't call toolbar from within realtime-input.js
|
9 years ago |
|
ansuz
|
e8469ae1bb
|
test out extended realtime-input api
|
9 years ago |
|
ansuz
|
5e1566eaec
|
fix incomplete 'onAbort' block
|
9 years ago |
|
ansuz
|
52fe892bae
|
invert logical relationship with flag
otherwise updates don't actually propogate
|
9 years ago |
|
ansuz
|
938df2b92f
|
lock the editor until the chain has synced
add 'onAbort' hook. lock the editor if the connection fails.
|
9 years ago |
|
ansuz
|
1d6ccc99a1
|
add 'onAbort' hook to realtime-input.js
|
9 years ago |
|
ansuz
|
e5bef52850
|
reintroduce the toolbar
|
9 years ago |
|
ansuz
|
6ff5b10486
|
remove local diffDOM version
|
9 years ago |
|
ansuz
|
93fb944e1f
|
remove broken functions from convert module
|
9 years ago |
|
ansuz
|
7d65540123
|
fix undefined reference
|
9 years ago |
|
ansuz
|
c246adc57b
|
Lock contenteditable until chain is done syncing.
Don't bother patching the dom until the chain has synced
|
9 years ago |
|
ansuz
|
1c0074258c
|
go back to using diffDOM from bower
The latest version is required. You'll need to update.
|
9 years ago |
|
ansuz
|
79bd82a62e
|
main.js : integrate with patched diffDOM
|
9 years ago |
|
ansuz
|
6884fabda9
|
Use local diffDOM instead of bower_components
At least until the PR gets accepted
|
9 years ago |
|
ansuz
|
f5a8727254
|
remove some unused functions from cursor.js
|
9 years ago |
|
ansuz
|
db1515c445
|
cursor.js : commit before cleaning up
|
9 years ago |
|
ansuz
|
7e367e770e
|
resize vdom debug panel to 30% width
|
9 years ago |
|
ansuz
|
91ada5ce7a
|
export Operation from chainpad. for use with OT
|
9 years ago |
|
ansuz
|
5425699f43
|
check if possible parent exists before checking if it contains another element
|
9 years ago |
|
ansuz
|
67bdb8a65a
|
fix a bad regex that occasionally threw an error
'nothing to repeat'
|
9 years ago |
|
ansuz
|
e87a4599a4
|
main.js : tiny patch until things are working correctly.
|
9 years ago |
|
ansuz
|
9ce59c985f
|
only do stuff with the cursor when a remote edit takes place
|
9 years ago |
|
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
|
9 years ago |
|
ansuz
|
de46be85ba
|
add better helpers for finding and resetting the cursor
|
9 years ago |
|
ansuz
|
7e7f1fee76
|
include abstracted json-ot, add comments, start to use cursor stuff
|
9 years ago |
|
ansuz
|
c09036bd29
|
snapshot cursor.js, as some things are working quite well now
|
9 years ago |
|
ansuz
|
4eee1f5210
|
add orderOfNodes function to tree library
|
9 years ago |
|
ansuz
|
7689151fc0
|
pull json validation for OT into its own module for reuse
|
9 years ago |
|
ansuz
|
fbb9163e42
|
main.js : clean up and commit before making big-ish changes for cursor fixing
|
9 years ago |
|
ansuz
|
2c8a2406c6
|
cursor.js : snapshot before code deletion
|
9 years ago |
|
ansuz
|
1beb3f5355
|
snapshot of treesome.js before deletion
|
9 years ago |
|
ansuz
|
8ead5ca129
|
realtime-input.js : add notes regarding integration of the netflux api
|
9 years ago |
|
ansuz
|
3cb94b8d80
|
jshint compliance
|
9 years ago |
|
ansuz
|
d1885fbab6
|
better jshint compliance for common files
|
9 years ago |
|
ansuz
|
539cc3a2fa
|
remove unused files from common directory
|
9 years ago |
|
ansuz
|
afa2811472
|
remove local version of marked.js, prefer bower version
|
9 years ago |
|
ansuz
|
587f95b6d7
|
don't overflow
|
9 years ago |
|
ansuz
|
a01331cb9a
|
hide styling textarea no matter what
|
9 years ago |
|
ansuz
|
a600ece5c5
|
fix jshint complaints in common directory
|
9 years ago |
|
ansuz
|
4a05a859e6
|
fix initialization routines
|
9 years ago |
|
ansuz
|
f1915d3b7c
|
fix jshint complaints in pad directory
|
9 years ago |
|
ansuz
|
fe3917c0f1
|
fix jshint complaints in codemirror directory
|
9 years ago |
|
ansuz
|
2c5a2b6023
|
remove unused code, add todos, fix minor errors
|
9 years ago |
|
ansuz
|
c5ab5dfe26
|
realtime style editor with lorum ipsum
|
9 years ago |
|
ansuz
|
967d636df9
|
address more jshint complaints
|
9 years ago |
|
ansuz
|
f6c848385f
|
hyperjson.js : jshint complains about var index in for loop
|
9 years ago |
|
ansuz
|
0fbbb51f7f
|
drop this useless line
|
9 years ago |
|
ansuz
|
d1dd497457
|
html-patcher.js : add missing semicolon
|
9 years ago |
|
ansuz
|
62ea172ff4
|
errorbox.js : add missing semicolon so jshint doesn't complain
|
9 years ago |
|
ansuz
|
3b5c932252
|
jshint ignore eval line
|
9 years ago |
|
ansuz
|
7f92abc7bf
|
Merge branch 'diffdom' of github.com:xwiki-labs/cryptpad into demoEffect
|
9 years ago |
|
Caleb James DeLisle
|
a7da21ccba
|
Remove the cursor treatment
|
9 years ago |
|
Caleb James DeLisle
|
86c4a69a97
|
Switch to patching with DiffDOM for testing :D
|
9 years ago |
|
ansuz
|
653ba33b65
|
Merge branch 'vdom' of github.com:xwiki-labs/cryptpad into demoEffect
|
9 years ago |
|
Caleb James DeLisle
|
2031191261
|
testing=false
|
9 years ago |
|
Caleb James DeLisle
|
37db31b09e
|
Attempt an operational transformation and if the result is not valid JSON then fail
|
9 years ago |
|
Caleb James DeLisle
|
e16299b5c4
|
Revert "restub OT until it's verified"
This reverts commit 350c9e6c76.
|
9 years ago |
|
ansuz
|
c22269e36e
|
cursor.js : make the console a little less noisy
|
9 years ago |
|
ansuz
|
350c9e6c76
|
restub OT until it's verified
|
9 years ago |
|
ansuz
|
99a23154b7
|
files for unstubbing OT
|
9 years ago |
|
ansuz
|
c740c0ec92
|
add stuff for walking the tree
|
9 years ago |
|
ansuz
|
ad184b1114
|
add stuff to recover the cursor
|
9 years ago |
|
ansuz
|
1aea11bb30
|
describe all the prototypes which are available
|
9 years ago |
|
ansuz
|
9b13fd8f34
|
pull cursor correction code out of main.js
put it in cursor.js
|
9 years ago |
|
ansuz
|
3b0ac3af4c
|
More sensible styles
respond to viewport size
don't use gigantic font
|
9 years ago |
|
ansuz
|
b43674eb53
|
switch back to two-panel layout
|
9 years ago |
|
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
|
9 years ago |
|
ansuz
|
019750bea8
|
realtime-input.js : callback onInit if exists
|
9 years ago |
|
ansuz
|
61fbf81dcd
|
factor out rainbow stuff into rainbow.js
|
9 years ago |