02ff1a63a4
Merge branch 'netflux' into beta
...
Conflicts:
www/assert/main.js
2016-04-21 15:47:07 +02:00
a18c793f98
use latest hyperjson
2016-04-21 14:53:53 +02:00
9efcc443cd
add 'format' to TextPatcher's API
2016-04-21 12:16:11 +02:00
0769e50414
move TextPatcher to highest application layer
2016-04-20 18:56:18 +02:00
1d70335228
provide all callbacks before starting
2016-04-20 18:27:20 +02:00
a3787ee4dc
Merge branch 'netflux' into beta
2016-04-20 15:25:00 +02:00
010566d3c3
pushDelta was mistakenly deprecated. restored.
2016-04-20 14:20:34 +02:00
3598c93098
move new hyperjson into common
2016-04-20 14:14:06 +02:00
103bb69daa
move custom hyperscript into common
2016-04-20 14:13:08 +02:00
b83fb7b823
improve brFix logic
...
stop exporting functions which we wish to deprecate
2016-04-20 12:29:16 +02:00
cb979844f6
implement text patching at application layer
2016-04-17 14:06:30 +02:00
4a41575e6d
accept onLocal in config
2016-04-17 14:05:33 +02:00
d3c2c901b6
implement cursor transformation in a common library
2016-04-17 14:02:45 +02:00
92d89f6cac
start to factor sharejs into two modules
2016-04-15 18:17:45 +02:00
13dc77b7f6
remove commented line
2016-04-15 18:16:54 +02:00
41e635b2e5
realtime-input.js : turn on logging
2016-04-14 16:27:34 +02:00
69e8e18283
Remove the pipe character in the hash
2016-04-14 16:10:08 +02:00
d62e9fc1c9
add a missing semicolon
2016-04-14 15:41:02 +02:00
c32045d7d0
Fix an issue with missing characters when several users were typing at the same time
2016-04-14 15:30:42 +02:00
be09a1808d
Remove old code from realtime-input
2016-04-14 14:46:42 +02:00
6884b0890a
Fix the typong tests not working properly
2016-04-14 12:24:17 +02:00
e207d8b579
Merge branch 'diffdom' into netflux
2016-04-13 16:19:56 +02:00
f4c5b2a996
Add sane defaults to TextPatcher diffs
2016-04-13 14:51:15 +02:00
259772dd62
Turn on TextPatcher logging for _socket
2016-04-13 13:54:25 +02:00
0537c28919
Add switchable logging to TextPatcher.js
2016-04-13 13:53:20 +02:00
8a36963582
Enable ChainPad PARANOIA mode but remove the part which causes most slowness
2016-04-13 13:51:01 +02:00
19cd991dba
trim dead code, comment, very minor optimizations
2016-04-12 17:29:20 +02:00
9f45ccb2d9
use console.error for stack traces
2016-04-12 16:47:30 +02:00
368d72b337
add missing semicolons to TextPatcher.js
2016-04-12 15:39:53 +02:00
851ccfbdb6
detect falsey operations in OT and ignore them
2016-04-12 15:37:47 +02:00
400f6efde1
json-ot.js : jshint compliance
2016-04-12 15:37:47 +02:00
ca94d30386
detect falsey operations in OT and ignore them
2016-04-12 15:35:07 +02:00
9f9cd8d8cd
realtime-input.js : fixes for jshint compliance
2016-04-12 15:07:05 +02:00
793149a608
json-ot.js : jshint compliance
2016-04-12 15:00:46 +02:00
06a3b63923
jshint compliance for toolbar.js
2016-04-12 14:58:24 +02:00
5cead3fad3
add missing semicolons to TextPatcher.js
2016-04-12 14:51:06 +02:00
94e57e4a26
update location of text-patcher.js
2016-04-12 14:21:31 +02:00
b37dab1f49
Merge branch 'diffdom' into netflux
...
Simple cleanup and unit tests
2016-04-12 14:15:04 +02:00
6b9d982d40
stabilize _socket/realtime-input.js
...
...as common/RealtimeTextSocket.js
2016-04-12 13:10:57 +02:00
39071021eb
stabilize typingTest.js as /common/TypingTests.js
2016-04-12 12:53:23 +02:00
9805958ad7
stabilize text-patcher.js into /common/TextPatcher.js
2016-04-12 12:46:49 +02:00
7782069dbd
Merge pull request #15 from xwiki-labs/diffdom
...
merge diffdom into netflux
2016-04-12 10:21:19 +02:00
a1f9b10175
remove offending line from chainpad entirely
...
RTCHAINPAD-3
2016-04-12 10:02:11 +02:00
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
2016-04-12 09:52:36 +02:00
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/
2016-04-12 09:44:08 +02:00
713c90242b
Hide the usernames when they have not been changed
2016-04-11 15:00:22 +02:00
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
2016-04-08 16:54:03 +02:00
cf9f60bd57
The server don't send back anymore messages to their sender
2016-04-07 11:27:14 +02:00
eb4ea7a6b0
Remove the content from the ACK messages sent by the server
2016-04-05 15:06:38 +02:00
ba4faea939
Update the pads to run with the latest improvements to the websocket server
2016-04-05 12:17:43 +02:00
ansuz