ansuz
50695f41ed
resolve merge conflict
2016-06-10 11:36:03 +02:00
ansuz
8af49698da
add a class to the magicline markup so it's easier to remove
2016-06-10 09:56:40 +02:00
ansuz
c2b4b1283c
Merge pull request #22 from xwiki-labs/two
...
Two
2016-06-09 15:39:50 +02:00
ansuz
48d222e565
depend on listmap api from bower
2016-06-06 12:38:31 +02:00
ansuz
aca75383cc
depend on the listmap api
2016-06-06 12:37:50 +02:00
ansuz
1746a4e732
use crypto from bower
2016-06-06 12:35:06 +02:00
ansuz
2a3ff256b9
remove libraries which are now in bower
2016-06-06 12:29:45 +02:00
ansuz
f72cb24fc5
rm LORIA
2016-06-06 12:27:42 +02:00
ansuz
2c3de49922
remove realtime-input, since it's in bower now
2016-06-06 12:15:00 +02:00
ansuz
beba78d7f8
update prototype dependencies
2016-06-06 12:14:07 +02:00
ansuz
2798d1b1f9
all of the list/map api's dependencies are now on bower
2016-06-06 11:54:37 +02:00
ansuz
d9b6d72a7f
depend on netflux-websocket (netflux-client.js) and chainpad-netflux (realtime-input.js) via bower
2016-06-06 11:53:08 +02:00
ansuz
58c968b319
minor cleanup in realtime-input
2016-06-03 18:55:32 +02:00
ansuz
288b4d5b66
depend on main passing in the crypto module for now
2016-06-03 18:52:35 +02:00
ansuz
f76dc615c0
use chainpad-crypto from bower and pass it into the listmap api
2016-06-03 18:51:31 +02:00
ansuz
85dbd5cb6e
pass in websocketURL from main
2016-06-03 17:27:01 +02:00
ansuz
d9a4f2f22c
missed one
2016-06-03 16:44:15 +02:00
ansuz
cf2866baa7
use json-ot from bower for tests
2016-06-03 16:35:54 +02:00
ansuz
5bb77bd50c
add UI.add and UI.remove methods.
...
also use json-ot from bower
2016-06-03 16:24:41 +02:00
ansuz
ff0f7d15dc
use json-ot from bower
2016-06-03 16:23:25 +02:00
ansuz
dccf5e8dcf
use listmap api from common/
2016-06-03 15:51:54 +02:00
ansuz
58633af943
listmap can be reused. put it in common/
2016-06-03 15:47:34 +02:00
ansuz
f80e9772a8
merge api.js and deep-proxy.js into one file
2016-06-03 15:45:58 +02:00
ansuz
dbf1e2b870
support reusing the netflux network
...
export more internals from realtime input
2016-06-03 15:30:51 +02:00
ansuz
ba3e120fbf
remove everything related to jquery sheet since we're not using it
2016-06-03 13:12:40 +02:00
ansuz
6f7543e9cc
demonstrate chaining of 'on' directives
2016-06-02 17:50:55 +02:00
ansuz
e44446f71e
proper recursive proxy initialization
2016-06-02 17:49:27 +02:00
ansuz
68cec2348a
don't prompt the user with a crypto hash for their name
2016-06-02 16:56:01 +02:00
ansuz
83696495a8
use chainpad from bower, not local
2016-06-02 16:54:47 +02:00
ansuz
2b9ac14cb1
restructure main to take advantage of new callback infrastructure
2016-06-01 12:36:26 +02:00
ansuz
fea74782a2
remove a little more dead code that I missed
2016-06-01 12:35:42 +02:00
ansuz
a58d6c745a
implement remaining listeners and factor
...
* 'isProxyable' helper
* 'find' helper
* 'lengthDescending' helper (for sorting change/remove events by path length)
* implement recursive proxy creation
* implement recursive proxy removal
* implement 'bubbling' prevention (via return false)
* implement create, ready, and disconnect event handlers
* return 'this' from 'on'
* trim dead code
2016-06-01 12:28:25 +02:00
ansuz
4222c0b516
simplify api
...
* refactor conditional with DeepProxy helpers
* don't call 'onRemote' until fully initialized
* use disconnect, ready, and create handlers on proxy object
2016-06-01 12:25:16 +02:00
ansuz
954ee26f4d
fix undefined disconnect reason
2016-06-01 12:19:54 +02:00
ansuz
a0ec5eada8
better fix for magicline filter
2016-05-31 12:51:04 +02:00
ansuz
9336c4de5c
import latest chainpad
2016-05-31 12:35:01 +02:00
ansuz
d0b553d198
port Yann's multiple-select implementation to cryptpad
2016-05-31 12:27:28 +02:00
ansuz
e3b8a10959
fix magicline filter
2016-05-30 17:33:24 +02:00
ansuz
da42e00344
Merge branch 'checkpoints' into two
2016-05-30 14:58:33 +02:00
ansuz
058548b95a
revert my reversion
...
Revert "Revert "Added checkpoints with the new code from ChainPad""
This reverts commit 6e2e8bf21f
2016-05-30 14:58:20 +02:00
Caleb James DeLisle
ba4dba24dd
If there are no checkpoints, the document fails to sync
2016-05-30 12:29:58 +02:00
ansuz
6e2e8bf21f
Revert "Added checkpoints with the new code from ChainPad"
...
This reverts commit da2bfe2de9
2016-05-30 10:20:08 +02:00
ansuz
599f5aeec8
add sample listeners for debugging
2016-05-30 10:18:08 +02:00
ansuz
3afd144562
don't make noise when adding a listener
2016-05-30 10:17:46 +02:00
ansuz
e86a3567be
more minor bugfixes and general improvements
...
off by one error in deletion loop (and undefined references)
sort listeners by pattern specificity
deletions are changes (for now)
2016-05-28 13:51:24 +02:00
ansuz
ce99bd9ba3
Merge branch 'two' of github.com:xwiki-labs/cryptpad into two
2016-05-28 13:15:33 +02:00
ansuz
7c63219add
fix some minor bugs
2016-05-28 13:15:06 +02:00
ansuz
a0c73c95d8
do away with a bit of boilerplate
2016-05-28 13:13:54 +02:00
ansuz
e189092ba8
document/spec the listmap api in its current/intended form
2016-05-28 00:48:52 +02:00
ansuz
55846044e1
rewrite underlying API. implement listeners
2016-05-28 00:48:10 +02:00
