8af49698da
add a class to the magicline markup so it's easier to remove
9 years ago
48d222e565
depend on listmap api from bower
9 years ago
1746a4e732
use crypto from bower
9 years ago
2a3ff256b9
remove libraries which are now in bower
9 years ago
f72cb24fc5
rm LORIA
9 years ago
2c3de49922
remove realtime-input, since it's in bower now
9 years ago
beba78d7f8
update prototype dependencies
9 years ago
2798d1b1f9
all of the list/map api's dependencies are now on bower
9 years ago
58c968b319
minor cleanup in realtime-input
9 years ago
288b4d5b66
depend on main passing in the crypto module for now
9 years ago
f76dc615c0
use chainpad-crypto from bower and pass it into the listmap api
9 years ago
85dbd5cb6e
pass in websocketURL from main
9 years ago
d9a4f2f22c
missed one
9 years ago
cf2866baa7
use json-ot from bower for tests
9 years ago
5bb77bd50c
add UI.add and UI.remove methods.
...
also use json-ot from bower
9 years ago
ff0f7d15dc
use json-ot from bower
9 years ago
dccf5e8dcf
use listmap api from common/
9 years ago
58633af943
listmap can be reused. put it in common/
9 years ago
f80e9772a8
merge api.js and deep-proxy.js into one file
9 years ago
dbf1e2b870
support reusing the netflux network
...
export more internals from realtime input
9 years ago
6f7543e9cc
demonstrate chaining of 'on' directives
9 years ago
e44446f71e
proper recursive proxy initialization
9 years ago
68cec2348a
don't prompt the user with a crypto hash for their name
9 years ago
83696495a8
use chainpad from bower, not local
9 years ago
2b9ac14cb1
restructure main to take advantage of new callback infrastructure
9 years ago
fea74782a2
remove a little more dead code that I missed
9 years ago
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
9 years ago
4222c0b516
simplify api
...
* refactor conditional with DeepProxy helpers
* don't call 'onRemote' until fully initialized
* use disconnect, ready, and create handlers on proxy object
9 years ago
954ee26f4d
fix undefined disconnect reason
9 years ago
a0ec5eada8
better fix for magicline filter
9 years ago
9336c4de5c
import latest chainpad
9 years ago
d0b553d198
port Yann's multiple-select implementation to cryptpad
9 years ago
e3b8a10959
fix magicline filter
9 years ago
058548b95a
revert my reversion
...
Revert "Revert "Added checkpoints with the new code from ChainPad""
This reverts commit 6e2e8bf21f
9 years ago
6e2e8bf21f
Revert "Added checkpoints with the new code from ChainPad"
...
This reverts commit da2bfe2de9
9 years ago
599f5aeec8
add sample listeners for debugging
9 years ago
3afd144562
don't make noise when adding a listener
9 years ago
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)
9 years ago
ce99bd9ba3
Merge branch 'two' of github.com:xwiki-labs/cryptpad into two
9 years ago
7c63219add
fix some minor bugs
9 years ago
a0c73c95d8
do away with a bit of boilerplate
9 years ago
e189092ba8
document/spec the listmap api in its current/intended form
9 years ago
55846044e1
rewrite underlying API. implement listeners
9 years ago
da2bfe2de9
Added checkpoints with the new code from ChainPad
9 years ago
014dce272b
working on better abstractions. still held together with duct tape
9 years ago
c1bca09cce
move list/map functionality into wrapper file
9 years ago
f61d06fa18
first commit for listmap prototype
9 years ago
774d349ec3
ignore hidden elements and submit buttons
9 years ago
cf85de6113
remove old bencoding code
9 years ago
d99bb8ff84
WIP : fallback to old parsing doesn't work
9 years ago
f04be53d11
fall back to old parsing if the message is bencoded?
9 years ago
976a08cc7a
move to chainpad version 2
9 years ago
297d8c2d44
reformat code for jshint compliance
9 years ago
baf523e9a5
add new functionality from xwiki development
9 years ago
0c89443c1b
fix typo
9 years ago
39fcd7dc4c
more specific filtering for magicline plugin
...
to avoid false positives for other things which are non-contenteditable spans
9 years ago
cae750cd75
update padrtc for to use bower libraries
9 years ago
ad3c53c344
use textpatcher from bower for all pads
9 years ago
0cd4f85ff0
remove migration notes
9 years ago
a7cbd8c470
we're pushing json over the wire, so let's use json-ot.validate
9 years ago
3ea270acb9
fix cursors in form prototype
9 years ago
d2c8fbf1f8
use hyperjson.amd.js, not hyperjson.js
9 years ago
663c157e2a
expose text patcher to the window via APP
9 years ago
1769ca16dc
add example for configuring the logLevel in /pad/
9 years ago
7faf57602b
implement log level settings from application layer
9 years ago
523aff3067
use upstream chainpad.js
9 years ago
dcd130cd9d
use hyperjson from bower in padrtc
9 years ago
c752e4a6e5
remove sharejs
9 years ago
6b2e986789
remove deprecated textsocket library
9 years ago
d2fa5e8f70
start using hyperjson from bower.io
9 years ago
150ebaba7b
add ability to force text diffing
9 years ago
aef6f3a85b
lock codemirror editor until chain has synced
9 years ago
6736335db2
add 'made with <3' toolbar to code
9 years ago
506a703b7d
turn off TextPatcher logging on /pad/
9 years ago
ba17b78f7a
restyle name change button
9 years ago
d79b3616c9
remove unused files
9 years ago
4c84758265
disable textpatcher logging
9 years ago
46b009d20f
remove last non-netflux pad
9 years ago
18e0131d6e
Merge branch 'migrate' of github.com:xwiki-labs/cryptpad into beta
9 years ago
32d1807350
import unused functions from /p/, to be integrated later
9 years ago
492054a938
Fix the cursor position when a remote patch is applied
9 years ago
626ecaffcd
log browser fights in /pad/
9 years ago
5bb2e12db2
Merge branch 'beta' into migrate
9 years ago
afe78dad56
Merge branch 'netflux' into beta
9 years ago
cc51e6d6ed
Update CodeMirror pad to work with Netflux
9 years ago
a735d63306
migrate markdown rendering 'pad' to netflux
9 years ago
f5f8f6e1eb
Remove the delay between a change and its propagation to chainpad
9 years ago
fa6914037c
start rewriting codepad to use realtime-input
9 years ago
2852c8f594
Merge branch 'netflux' of github.com:xwiki-labs/cryptpad into beta
9 years ago
fe3bb4da27
Merge branch 'netflux' of github.com:xwiki-labs/cryptpad into netflux
9 years ago
53b2644b64
Fix a issue with fights over usernames
9 years ago
3b6fe44378
Merge branch 'beta' of github.com:xwiki-labs/cryptpad into beta
9 years ago
255dc17a5d
Merge branch 'beta' into netflux
9 years ago
f9de1c9e1f
Merge branch 'beta' of github.com:xwiki-labs/cryptpad into beta
9 years ago
c14b86d84a
add missing semicolon
9 years ago
b3ef2abb84
fix jshint complain
9 years ago
85d5f5c47f
Convert netflux to es5
9 years ago
c0b8aac792
Fix an issue where metadata could be duplicated in the realtime userdoc
9 years ago
22cf18f78c
Merge branch 'beta' of github.com:xwiki-labs/cryptpad into beta
9 years ago
c509c28c18
realtime form prototype, almost in good condition
9 years ago
1a9e7299fc
working state
9 years ago
69e8f54e8f
pass in Crypto to realtime-input
9 years ago
5f16ad4a58
Update to most recent chainpad
9 years ago
aa07dd31ee
have json-ot initialize its own debug module, instead of relying on a window variable's existence
9 years ago
d3203d1c2a
Remove Crypto from the modules loaded with RequireJS in realtime-input
...
It now has to be passed in the config in the main JS file
9 years ago
8ac69ca262
Add a missing "time" property in the netflux client causing incorrect
...
timeout errors
9 years ago
be1ef7abe3
migrate canvas to netflux
9 years ago
d4943511fe
move text/ and hack/ to Netflux
9 years ago
4c95602347
remove a little bit more dead code
9 years ago
b140b6429d
remove a little bit of dead code
9 years ago
2c6cf9883b
stop using deleted file
9 years ago
bbdc9da853
delete duplicated file
9 years ago
cce50390a0
don't depend on library to set hash
9 years ago
5f4825f3a0
don't change the hash from realtime input
...
let applications handle that logic
9 years ago
80fb5e1e21
don't rely on RealtimeSocket exporting textPatcher
9 years ago
4f426651ad
remove TextPatcher from RealtimeTextSocket
9 years ago
a527024a8c
start on realtime form prototype
9 years ago
02ff1a63a4
Merge branch 'netflux' into beta
...
Conflicts:
www/assert/main.js
9 years ago
04f6299938
reconcile differences with netflux
9 years ago
565fb1d186
include small snippets for preventing browser fights
9 years ago
ffbd428b87
better logging of browser fights
9 years ago
4d44661f3b
more correct tests
9 years ago
a18c793f98
use latest hyperjson
9 years ago
980ff8a0ca
Fix a test that was failing on chrome
...
it failed for reasons which are irrelevant to our application
9 years ago
9efcc443cd
add 'format' to TextPatcher's API
9 years ago
0769e50414
move TextPatcher to highest application layer
9 years ago
1d70335228
provide all callbacks before starting
9 years ago
9498937b43
add a FIXME to the assert page
...
tests were failing (unnecessarily) on Chrome
9 years ago
a3787ee4dc
Merge branch 'netflux' into beta
9 years ago
06b464c524
move sheet/ to .git
9 years ago
cdf02ac725
remove input pad
9 years ago
11961b4f1d
export stringifyDOM to REALTIME_MODULE
9 years ago
5db487db3f
remove old pad entirely
...
hyperjson version is considered a strict improvement
9 years ago
010566d3c3
pushDelta was mistakenly deprecated. restored.
9 years ago
1639c5b099
use hyperscript and hyperjson from common
9 years ago
3598c93098
move new hyperjson into common
9 years ago
103bb69daa
move custom hyperscript into common
9 years ago
e357549eda
push browser fights into an array for inspection
9 years ago
b83fb7b823
improve brFix logic
...
stop exporting functions which we wish to deprecate
9 years ago
1c7954ed51
Grab Fabric off of the window
9 years ago
06786b6e02
Remove redundant declaration
9 years ago
df22c246c4
serialize text nodes correctly
9 years ago
7ca5f47d02
remove multitest pad since it offers no significant benefit
9 years ago
bafdd588dd
fix /hack/ to not require sharejs textarea
9 years ago
f2db6b83eb
better sizing for palette options
9 years ago
5ce158d2e2
add more colors
9 years ago
7c4b334ad3
here's a canvas app!
9 years ago
41276fffb5
repair /text/ application, conform to new API
9 years ago
cb979844f6
implement text patching at application layer
9 years ago
4a41575e6d
accept onLocal in config
9 years ago
d3c2c901b6
implement cursor transformation in a common library
9 years ago
92d89f6cac
start to factor sharejs into two modules
9 years ago
13dc77b7f6
remove commented line
9 years ago
41e635b2e5
realtime-input.js : turn on logging
9 years ago
69e8e18283
Remove the pipe character in the hash
9 years ago
d62e9fc1c9
add a missing semicolon
9 years ago
4095201d15
Merge branch 'netflux' of github.com:xwiki-labs/cryptpad into integrate
9 years ago
c32045d7d0
Fix an issue with missing characters when several users were typing at the same time
9 years ago
822b2bd2b9
Merge branch 'netflux' of github.com:xwiki-labs/cryptpad into integrate
9 years ago
be09a1808d
Remove old code from realtime-input
9 years ago
5a5b9ad718
Merge branch 'netflux' into beta
9 years ago
4af987a2a2
point to correct toolbar.js
9 years ago
3ade46adc7
Merge branch 'newtests' into beta
9 years ago
6884b0890a
Fix the typong tests not working properly
9 years ago
b12a01e08f
report test results on the page, not in the console
9 years ago
feaae609ad
fix broken path for padrtc
9 years ago
ecc41d14af
Use canonical serializer for json serialization
9 years ago
fc77ef66b3
Merge remote-tracking branch 'origin/sortify' into HEAD
...
utilize canonical stringify function
Conflicts:
www/_socket/main.js
9 years ago
319f5b95f7
Use canonical serializer for json serialization
9 years ago
9683fd9aec
Always serialize the DOM in one way.
9 years ago
698338b49a
Use canonical serializer for json serialization
9 years ago
e207d8b579
Merge branch 'diffdom' into netflux
9 years ago
468827dadd
newest tests
9 years ago
c867ab04ab
rename /_socket/ app to /p/
9 years ago
a1fe941f69
Always serialize the DOM in one way.
9 years ago
f4c5b2a996
Add sane defaults to TextPatcher diffs
9 years ago
259772dd62
Turn on TextPatcher logging for _socket
9 years ago
0537c28919
Add switchable logging to TextPatcher.js
9 years ago
8a36963582
Enable ChainPad PARANOIA mode but remove the part which causes most slowness
9 years ago
284da6a4e9
minor improvements I made to the /hack/ pad last night
9 years ago
9f0cc4ed64
update hack with a slightly better UI
9 years ago
71c0a06c3b
Merge branch 'hack' into diffdom
9 years ago
19cd991dba
trim dead code, comment, very minor optimizations
9 years ago
f75c246029
remove dead code from pad/main.js
9 years ago
9f45ccb2d9
use console.error for stack traces
9 years ago
d705b947ab
Merge branch 'diffdom' into netflux
...
basic cleanup while performing a larger merge between two prototypes
9 years ago
2ffa69dc15
remove checks for a non-existent race condition
9 years ago
368d72b337
add missing semicolons to TextPatcher.js
9 years ago
851ccfbdb6
detect falsey operations in OT and ignore them
9 years ago
400f6efde1
json-ot.js : jshint compliance
9 years ago
a0999d1d2b
add a comment about why hashes are being stubbed
9 years ago
ca94d30386
detect falsey operations in OT and ignore them
9 years ago
9f9cd8d8cd
realtime-input.js : fixes for jshint compliance
9 years ago
793149a608
json-ot.js : jshint compliance
9 years ago
06a3b63923
jshint compliance for toolbar.js
9 years ago
3b8238ef3b
add missing semicolons to pad/main.js
...
jshint compliance
9 years ago
5cead3fad3
add missing semicolons to TextPatcher.js
9 years ago
e6ab03164c
import TypingTests.js and expose at the console
...
RTWYSIWYG-54
> implement tests for components of the WYSIWYG editor
9 years ago
94e57e4a26
update location of text-patcher.js
9 years ago
b37dab1f49
Merge branch 'diffdom' into netflux
...
Simple cleanup and unit tests
9 years ago
a07774e81a
Implement tests for serialization
...
ensure that complex DOM elements can serialize and deserialize without modifications
RTWYSIWYG-54
> implement tests for components of the WYSIWYG editor
9 years ago
6bb37aed44
main.js : support tab insertion in /hack/ pad
9 years ago
6b9d982d40
stabilize _socket/realtime-input.js
...
...as common/RealtimeTextSocket.js
9 years ago
1a22592afa
remove unused modules from realtime-input.js
9 years ago
39071021eb
stabilize typingTest.js as /common/TypingTests.js
9 years ago
9805958ad7
stabilize text-patcher.js into /common/TextPatcher.js
9 years ago
2c34833d2c
break text-patcher's functionality into components
...
text-patcher.js now exports diff, patch, log, and apply change
in addition to the previous 'create' method.
9 years ago
7782069dbd
Merge pull request #15 from xwiki-labs/diffdom
...
merge diffdom into netflux
9 years ago
a1f9b10175
remove offending line from chainpad entirely
...
RTCHAINPAD-3
9 years ago
4071a3aa25
revert to using the chainpad in /common/
...
now that we have found the problem that caused the backspace bug
we don't need a special chainpad for testing.
9 years ago
4ba68eb2bf
fix leaky variable in chainpad
...
Patch.transform declared a 'toTransform' variable without using 'var'
this caused it to leak onto the window during operational transformations
9 years ago
05108efdfa
correct chainpad's transformation function
...
addresses RTCHAINPAD-3
Pending further testing, this change will still need
to be corrected in https://github.com/xwiki-contrib/chainpad/
9 years ago
360fee9feb
Fix a new cursor error with Codepad
9 years ago
c2e0dded3a
Fix an issue with the cursor sometimes disappearing when a patch was received
...
Update CodeMirror to the latest version (5.13.2)
9 years ago
713c90242b
Hide the usernames when they have not been changed
9 years ago
c53baab99d
Update Codepad with the latest improvements
9 years ago
0b3d6e15b8
Replace the Netflux old client (netflux.js) by the Netflux2 client.
...
Move the WebRTC peer-to-peer use case in /padrtc, which still uses the old
Netflux client
Use es6-promises.min.js to solve a issue with some browser and the new
Netflux client
9 years ago
cd357a9136
turn an alert into a console.error
9 years ago
ec64e0d381
use getAttribute to inspect document elements
...
el.getAttribute('attr') is more reliable than el[attr].
9 years ago
f5b0e1a5df
Add comments, debug variables. initialize better
...
Expose Hyperscript via window.REALTIME_MODULE
Make sure to pass in a JSON.parse'able initial state.
Add comments detailing the problems with not using setAttribute
9 years ago
842b9d4243
Generalize _socket/realtime-input.js a little more
...
Anything JSON related should be at the application layer
9 years ago
cf9f60bd57
The server don't send back anymore messages to their sender
9 years ago
eb4ea7a6b0
Remove the content from the ACK messages sent by the server
9 years ago
ba4faea939
Update the pads to run with the latest improvements to the websocket server
9 years ago
5ef7e29a9b
Add the latest changes from _socket into the netflux pad
9 years ago
b59a14c5ac
merge hyperjson changes from realtime xwiki
...
more resilient class serialization.
comments
9 years ago
2691d85582
use forked chainpad with assertions for _socket
9 years ago
b41f0e8c50
Merge branch 'cjd-fixed-it-with-hax' into netflux2
9 years ago
c50690349b
comments describing the role of each argument
9 years ago
df78d284c4
initial state should be valid JSON so JSON parse doesn't fail
9 years ago
96e03fcfa4
Use latest chainpad without mutations
9 years ago
d5772c6315
when json-ot produces json that fails to parse...
...
export the relevant data to a window variable so we can inspect it better
9 years ago
aaf7c777cc
add debugging info to the textPatcher
...
* kill dead code
* add assertions
* better logging for insertions and removals
9 years ago
523df40d09
Debugging concurrent typing:
...
track whether there are local operations in progress, such that we can tell
whether a remote change is interrupting the DOM's conversion to hjson.
9 years ago
e446a3645c
don't send funny BR attributes over the wire. Properly initialize the typing test
9 years ago
22290590cb
don't rely on window scope in typingTest.js
9 years ago
772ca5d30e
comment out debugging line
9 years ago
6c340a6527
chainpad testing = true, reject non-compliant messages
9 years ago
afa1104d85
Pull the cursor out of bogus BR tarpits when it gets stuck
9 years ago
bac0e0ff88
implement hyperjson filtering
9 years ago
e51635c4bb
fix index error
9 years ago
3aebf7d2c2
minor changes to pass linting
9 years ago
29e24f556c
kill another window variable
9 years ago
e699073d45
attempt to preserve the magic line plugin while someone else is typing
9 years ago
941f5361ea
forgot to add 'typingTest', which main depends on
9 years ago
d852c578d8
removed dead code
9 years ago
5591aae8fa
Clean up main file
...
* convert.js includes the vdom library, which we aren't using anymore
- removed, and replaced with the simple functions from Hyperjson and Hyperscript
* removed several variables that had been exported to 'window'
* moved the testing functions out into their own file for easier reuse
* restructured realtime initialization to be more compact
9 years ago
478ccbf984
revert changes to chainpad
9 years ago
e3b78e20de
Merge branch 'cjd-fixed-it-with-hax' of github.com:xwiki-labs/cryptpad into cjd-fixed-it-with-hax
9 years ago
e26246178f
start to clean up and give things more sensible names.
...
get rid of the textarea entirely
9 years ago
ansuz