ansuz
7f02c899ea
add snippet for copying text to the clipboard
2016-07-28 10:08:51 +02:00
ansuz
93142b364f
tests for pretty printed html
2016-07-28 09:54:52 +02:00
ansuz
4833cf0d7b
add a fontpicker
2016-07-28 09:24:14 +02:00
ansuz
6cb2f72aa6
pretty print html during export if possible
2016-07-27 11:38:25 +02:00
ansuz
c09166efe2
scroll down when adding a new option to the table
2016-07-25 15:42:46 +02:00
ansuz
42eafe9e29
don't create duplicate stylesheets in the document head
2016-07-25 15:39:54 +02:00
ansuz
fe3f02f5e0
enable text foreground and background colors
2016-07-25 15:38:59 +02:00
ansuz
68f8d0101d
fix flash of unstyled content
2016-07-25 15:28:27 +02:00
ansuz
8ea6c03094
notify user on disconnect
...
also disable inputs
2016-07-25 11:57:06 +02:00
ansuz
efd190beca
export file with correct file extension, if possible
2016-07-25 11:26:42 +02:00
ansuz
5e71a5473c
add another missing script
2016-07-25 11:26:07 +02:00
ansuz
992bc4f449
add missing script
2016-07-25 11:09:25 +02:00
ansuz
2351d8a23e
make tests green again
2016-07-22 16:00:33 +02:00
ansuz
068a3f5944
remove rows from the poll
2016-07-22 15:42:41 +02:00
ansuz
c6bdb7506d
forget everything about a pad when you forget it
2016-07-22 15:18:09 +02:00
ansuz
b8a3a4d188
persist usernames across sessions via localStorage
2016-07-22 14:31:40 +02:00
ansuz
846d1135b9
set mode in the editor, not just the dropdown
2016-07-22 14:16:07 +02:00
ansuz
446266a79b
remember the last language used on a particular pad
2016-07-22 12:25:42 +02:00
ansuz
e84fbf0bc3
more helpers in common
2016-07-22 12:24:54 +02:00
ansuz
70f8837681
maintain scroll position on remote changes
2016-07-22 11:57:04 +02:00
ansuz
c267dd6a88
ensure that 'text' is a string
2016-07-20 12:26:57 +02:00
ansuz
2f2ab4392c
clear the table on user clicks
2016-07-20 12:23:41 +02:00
ansuz
64f030c344
add a clear table button
2016-07-20 12:23:08 +02:00
ansuz
d2c5cfe646
add col/row ids to arrays
2016-07-20 12:22:49 +02:00
ansuz
1a63faf188
infer names from the first comment on code pad
2016-07-20 12:21:33 +02:00
ansuz
f77e2cec34
set text values of new options
2016-07-19 17:27:40 +02:00
ansuz
52ab5147c9
add a missing semicolon so tests don't fail
2016-07-19 16:23:39 +02:00
ansuz
e3f4df7e0a
push my latest changes because I'm agile
2016-07-19 16:22:44 +02:00
ansuz
cde239c97a
implement row/column removal
2016-07-18 20:57:53 +02:00
ansuz
9860b7427a
addition signs are slightly informative
2016-07-18 20:57:35 +02:00
ansuz
ac50bf7286
height and width of the table are unreliable because of multiple users. remove them
2016-07-18 19:49:43 +02:00
ansuz
a3254a2619
consistent ordering of columns and rows
2016-07-18 19:49:12 +02:00
ansuz
d30eddf2f2
ui hint for 'adduser' and 'addoption'
2016-07-18 19:48:24 +02:00
ansuz
a995f2306d
fix undefined variable reference
2016-07-16 12:42:23 +02:00
ansuz
44fe95c76b
add titles to buttons on pad and code
2016-07-16 12:38:21 +02:00
ansuz
ebf5c27453
add rename and forget buttons to poll app
2016-07-16 12:37:17 +02:00
ansuz
f7a1332317
add a 'back' button
2016-07-15 19:09:35 +02:00
ansuz
7dd1624206
commit polls to localStorage
2016-07-15 18:47:07 +02:00
ansuz
0cf5f3cc87
realtime polls!
2016-07-15 16:46:50 +02:00
ansuz
ff74a67a09
translate alertify button messages
2016-07-12 16:43:33 +02:00
ansuz
d39ab5c250
point to the actual translation file
2016-07-12 15:52:36 +02:00
ansuz
dea8e225db
fix double scrollbar issue
2016-07-12 15:45:49 +02:00
ansuz
6f598682f8
templates for custom themes
2016-07-12 12:36:13 +02:00
ansuz
02cd2fbee0
style fixes for the ansuz theme
2016-07-12 12:35:17 +02:00
ansuz
c9edf69ed1
one less prototype using messages.js while we figure out internationalization
2016-07-12 12:34:38 +02:00
ansuz
3eccec7054
better effort for translation
2016-07-11 17:36:53 +02:00
ansuz
3bdfee71e1
move padrtc to .git
2016-07-08 16:53:38 +02:00
ansuz
18ce69b756
use constants from toolbar.js, address linter warnings
2016-07-08 16:52:49 +02:00
ansuz
2a7a84b774
use constants exported from toolbar for selections
...
make things a little less brittle
address linter warnings
2016-07-08 16:50:56 +02:00
ansuz
cbeaa8d609
major refactoring for toolbar. CAN HAZ LESS
2016-07-08 16:45:48 +02:00
ansuz
7504f79e05
add log and warn methods to cryptpad common
2016-07-08 16:45:15 +02:00
ansuz
750731d3db
workaround for favicon magic
2016-07-07 14:03:06 +02:00
ansuz
3ad5d71ab1
make sure the regular favicon is set
2016-07-07 13:43:08 +02:00
ansuz
fd3cd73d0b
try to fix favicon bug
2016-07-07 13:40:03 +02:00
ansuz
589b0087a1
listen for keyup events while alertify prompts are active
2016-07-07 13:27:45 +02:00
ansuz
a2a8570453
use alertify UI in /pad/
2016-07-07 12:47:56 +02:00
ansuz
e32c0aaac8
use alertify UI in /code/
2016-07-07 12:47:23 +02:00
ansuz
deae7ac78f
don't hide the notification until it has been seen
2016-07-07 10:45:09 +02:00
ansuz
3d3c6e4800
add wrappers for alertifyjs
2016-07-06 22:20:15 +02:00
ansuz
85702f2706
inform users of changes in /pad/ too
2016-07-06 22:19:22 +02:00
ansuz
1ae212af44
let users know when changes have occurred while tabs lack focus
2016-07-06 22:19:01 +02:00
ansuz
6075849ed7
add favicons to /pad/ and /code/
2016-07-06 22:17:18 +02:00
ansuz
73d2b6561a
add small modules for page visibility api and notification apis
2016-07-06 22:16:17 +02:00
ansuz
7e8d66a141
filter unwanted elements when receiving patches
2016-07-06 14:51:34 +02:00
ansuz
d8b467422a
fix default title in localStorage migration
2016-07-04 16:43:39 +02:00
ansuz
7a5877d12a
don't filter pads after 30 days
2016-07-04 15:34:43 +02:00
ansuz
d844551fba
add a forget button. clean up toolbar a bit
2016-06-30 17:24:25 +02:00
ansuz
8a82e11306
make sure title is defined for home page usage
2016-06-30 15:53:13 +02:00
ansuz
71b1f71ba0
fix migration to include ctime
2016-06-30 15:15:38 +02:00
ansuz
7da58a0de9
improve pad naming UX, slight refactoring
...
* prevent naming conflicts
* migrate localestorage to use named attributes
* use ctime and atime
* display default names in table
* sort pads by most recent atime
* move more functions into cryptpad common
* change table styles
2016-06-30 15:10:32 +02:00
ansuz
ec0dba3f7c
correct undefined reference
2016-06-30 14:47:37 +02:00
ansuz
a3da10766a
add rename button to /code/ and /pad/
2016-06-30 10:51:19 +02:00
ansuz
93dcf29c15
more functions for working with localstorage
2016-06-30 10:43:56 +02:00
ansuz
93fed83a08
remove annoying border around editor
2016-06-29 15:13:45 +02:00
ansuz
23788bca67
add 'ansuz' theme because I'm horribly vain
2016-06-29 15:13:24 +02:00
ansuz
22929fd3f5
add title attributes for dropdown menus
2016-06-29 12:02:39 +02:00
ansuz
8b1a2b7b8b
commit theme choices to localStorage
2016-06-29 12:00:12 +02:00
ansuz
fb2ca04c34
add a theme selector
2016-06-29 11:51:53 +02:00
ansuz
dc8e36bf20
move themes directly into ./code/
2016-06-29 11:45:57 +02:00
ansuz
908e79c0b9
add autolink plugin
2016-06-28 12:09:43 +02:00
ansuz
d025d13295
address some jshint complaints
2016-06-23 16:44:20 +02:00
ansuz
12bbf3e8f6
don't drop values onto the window
2016-06-23 16:38:40 +02:00
ansuz
ca45e3533d
pass loaded file to callback when importing
2016-06-23 16:38:24 +02:00
ansuz
5b79775810
infer modes from MIME types
2016-06-23 16:37:51 +02:00
ansuz
df99395b4d
fix a few more paths that I missed
2016-06-23 12:44:30 +02:00
ansuz
b3deb9531d
fix paths that I broke when updating codemirror
2016-06-23 12:44:11 +02:00
ansuz
82a9b05d5f
upgrade to newest codemirror
2016-06-23 12:30:40 +02:00
ansuz
1a5905d9fd
more work on highlighting modes in codemirror
...
* style the select menu
* add more modes
* preset language selection to 'javascript'
* don't prompt the user with a silly hash when changing their name
2016-06-23 12:07:51 +02:00
ansuz
a89511985f
add _really_ basic multilanguage support. I'll come back for css later
2016-06-22 22:54:42 +02:00
ansuz
31aa09d6f6
work a bit more on import/export and code highlighting
2016-06-22 20:58:50 +02:00
ansuz
242c9a99e3
implement import and export in /pad/
2016-06-22 17:00:07 +02:00
ansuz
1526c26f8e
remember code and wysiwyg pads
2016-06-21 18:49:37 +02:00
ansuz
0a8137e7eb
move rememberPad to cryptpad common and simplify it a bit
2016-06-21 18:46:19 +02:00
ansuz
849683d586
update to use new style crypto module
2016-06-21 15:17:09 +02:00
ansuz
f94c06abc0
drop a bunch of stuff and use diff dom and hyperjson
2016-06-20 18:39:30 +02:00
ansuz
69f3f4c9a8
drop hyperscript dependency
2016-06-20 18:39:13 +02:00
ansuz
f607fcc0ad
test using newest hyperjson. forget hyperscript
2016-06-20 18:38:56 +02:00
ansuz
c3d2568d3c
add file export for codepad
...
addresses #24
2016-06-17 10:59:45 +02:00
ansuz
920dbeabd1
add a save button
2016-06-16 16:39:38 +02:00
ansuz
4cc5388c76
trial run of canvas export via filesaver.js
2016-06-16 16:32:39 +02:00
ansuz
f818d873bb
remove usernames, refactor a wee bit
2016-06-16 16:20:51 +02:00
ansuz
2b8c21d292
set styles with setAttribute. fixes style fights
2016-06-16 13:00:48 +02:00
ansuz
36baf498ce
fix magicline filter and strange interaction with cursor
2016-06-16 12:59:40 +02:00
ansuz
303e8d6c3e
remove debugging line
2016-06-10 17:03:54 +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
48d222e565
depend on listmap api from bower
2016-06-06 12:38:31 +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
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
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
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
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
Caleb James DeLisle
da2bfe2de9
Added checkpoints with the new code from ChainPad
2016-05-26 17:09:02 +02:00
ansuz
014dce272b
working on better abstractions. still held together with duct tape
2016-05-26 11:55:33 +02:00
ansuz
c1bca09cce
move list/map functionality into wrapper file
2016-05-25 18:36:44 +02:00
ansuz
f61d06fa18
first commit for listmap prototype
2016-05-25 11:56:17 +02:00
ansuz
774d349ec3
ignore hidden elements and submit buttons
2016-05-25 11:55:11 +02:00
ansuz
cf85de6113
remove old bencoding code
2016-05-25 11:54:36 +02:00
ansuz
d99bb8ff84
WIP : fallback to old parsing doesn't work
2016-05-20 17:46:48 +02:00
ansuz
f04be53d11
fall back to old parsing if the message is bencoded?
2016-05-20 16:45:25 +02:00
ansuz
976a08cc7a
move to chainpad version 2
2016-05-20 16:34:55 +02:00
ansuz
297d8c2d44
reformat code for jshint compliance
2016-05-20 13:39:40 +02:00
ansuz
baf523e9a5
add new functionality from xwiki development
2016-05-19 12:20:05 +02:00
ansuz
0c89443c1b
fix typo
2016-05-17 17:22:18 +02:00
ansuz
39fcd7dc4c
more specific filtering for magicline plugin
...
to avoid false positives for other things which are non-contenteditable spans
2016-05-17 16:57:50 +02:00
ansuz
cae750cd75
update padrtc for to use bower libraries
2016-05-13 17:35:17 +02:00
ansuz
ad3c53c344
use textpatcher from bower for all pads
2016-05-13 17:32:56 +02:00
ansuz
0cd4f85ff0
remove migration notes
2016-05-13 17:00:01 +02:00
ansuz
a7cbd8c470
we're pushing json over the wire, so let's use json-ot.validate
2016-05-13 16:42:14 +02:00
ansuz
3ea270acb9
fix cursors in form prototype
2016-05-13 16:41:36 +02:00
ansuz
d2c8fbf1f8
use hyperjson.amd.js, not hyperjson.js
2016-05-12 18:21:01 +02:00
ansuz
663c157e2a
expose text patcher to the window via APP
2016-05-12 10:46:17 +02:00
ansuz
1769ca16dc
add example for configuring the logLevel in /pad/
2016-05-10 10:23:22 +02:00
ansuz
7faf57602b
implement log level settings from application layer
2016-05-10 09:39:20 +02:00
ansuz
523aff3067
use upstream chainpad.js
2016-05-09 15:50:19 +02:00
ansuz
dcd130cd9d
use hyperjson from bower in padrtc
2016-05-09 15:27:37 +02:00
ansuz
c752e4a6e5
remove sharejs
2016-05-09 14:20:11 +02:00
ansuz
6b2e986789
remove deprecated textsocket library
2016-05-09 11:57:40 +02:00
ansuz
d2fa5e8f70
start using hyperjson from bower.io
2016-05-09 11:41:02 +02:00
ansuz
150ebaba7b
add ability to force text diffing
2016-04-27 17:58:55 +02:00
ansuz
aef6f3a85b
lock codemirror editor until chain has synced
2016-04-27 16:21:10 +02:00
ansuz
6736335db2
add 'made with <3' toolbar to code
2016-04-27 15:43:31 +02:00
ansuz
506a703b7d
turn off TextPatcher logging on /pad/
2016-04-27 15:42:27 +02:00
ansuz
ba17b78f7a
restyle name change button
2016-04-27 15:32:58 +02:00
ansuz
d79b3616c9
remove unused files
2016-04-27 15:32:15 +02:00
ansuz
4c84758265
disable textpatcher logging
2016-04-27 15:30:53 +02:00
ansuz
46b009d20f
remove last non-netflux pad
2016-04-27 12:30:43 +02:00
ansuz
18e0131d6e
Merge branch 'migrate' of github.com:xwiki-labs/cryptpad into beta
2016-04-27 12:28:24 +02:00
ansuz
32d1807350
import unused functions from /p/, to be integrated later
2016-04-27 12:25:19 +02:00
Yann Flory
492054a938
Fix the cursor position when a remote patch is applied
2016-04-27 12:17:06 +02:00
ansuz
626ecaffcd
log browser fights in /pad/
2016-04-27 11:10:31 +02:00
Yann Flory
5bb2e12db2
Merge branch 'beta' into migrate
2016-04-27 10:51:51 +02:00
ansuz
afe78dad56
Merge branch 'netflux' into beta
2016-04-27 10:44:32 +02:00
Yann Flory
cc51e6d6ed
Update CodeMirror pad to work with Netflux
2016-04-27 10:44:04 +02:00
ansuz
a735d63306
migrate markdown rendering 'pad' to netflux
2016-04-27 10:38:44 +02:00
Yann Flory
f5f8f6e1eb
Remove the delay between a change and its propagation to chainpad
2016-04-26 17:50:54 +02:00
ansuz
fa6914037c
start rewriting codepad to use realtime-input
2016-04-26 17:34:57 +02:00
ansuz
2852c8f594
Merge branch 'netflux' of github.com:xwiki-labs/cryptpad into beta
2016-04-26 17:24:51 +02:00
Yann Flory
fe3bb4da27
Merge branch 'netflux' of github.com:xwiki-labs/cryptpad into netflux
2016-04-26 17:18:31 +02:00
Yann Flory
53b2644b64
Fix a issue with fights over usernames
2016-04-26 17:16:58 +02:00
Caleb James DeLisle
3b6fe44378
Merge branch 'beta' of github.com:xwiki-labs/cryptpad into beta
2016-04-26 14:31:57 +02:00
ansuz
255dc17a5d
Merge branch 'beta' into netflux
2016-04-25 16:08:00 +02:00
ansuz
f9de1c9e1f
Merge branch 'beta' of github.com:xwiki-labs/cryptpad into beta
2016-04-25 16:07:24 +02:00
ansuz
c14b86d84a
add missing semicolon
2016-04-25 16:07:02 +02:00
ansuz
b3ef2abb84
fix jshint complain
2016-04-25 16:06:10 +02:00
Yann Flory
85d5f5c47f
Convert netflux to es5
2016-04-25 15:29:39 +02:00
Yann Flory
c0b8aac792
Fix an issue where metadata could be duplicated in the realtime userdoc
2016-04-25 15:29:09 +02:00
ansuz
22cf18f78c
Merge branch 'beta' of github.com:xwiki-labs/cryptpad into beta
2016-04-23 16:31:35 +02:00
ansuz
c509c28c18
realtime form prototype, almost in good condition
2016-04-23 16:31:07 +02:00
ansuz
1a9e7299fc
working state
2016-04-23 00:15:39 +02:00
ansuz
69e8f54e8f
pass in Crypto to realtime-input
2016-04-22 18:54:24 +02:00
Caleb James DeLisle
5f16ad4a58
Update to most recent chainpad
2016-04-22 18:17:00 +02:00
ansuz
aa07dd31ee
have json-ot initialize its own debug module, instead of relying on a window variable's existence
2016-04-22 17:35:07 +02:00
Yann Flory
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
2016-04-22 14:26:37 +02:00
Yann Flory
8ac69ca262
Add a missing "time" property in the netflux client causing incorrect
...
timeout errors
2016-04-22 11:46:27 +02:00
ansuz
be1ef7abe3
migrate canvas to netflux
2016-04-22 10:04:54 +02:00
ansuz
d4943511fe
move text/ and hack/ to Netflux
2016-04-22 09:47:26 +02:00
ansuz
4c95602347
remove a little bit more dead code
2016-04-22 09:46:41 +02:00
ansuz
b140b6429d
remove a little bit of dead code
2016-04-22 09:46:06 +02:00
ansuz
2c6cf9883b
stop using deleted file
2016-04-22 08:19:58 +02:00
ansuz
bbdc9da853
delete duplicated file
2016-04-22 08:19:28 +02:00
ansuz
cce50390a0
don't depend on library to set hash
2016-04-21 19:04:15 +02:00
ansuz
5f4825f3a0
don't change the hash from realtime input
...
let applications handle that logic
2016-04-21 19:03:50 +02:00
ansuz
80fb5e1e21
don't rely on RealtimeSocket exporting textPatcher
2016-04-21 17:59:30 +02:00
ansuz
4f426651ad
remove TextPatcher from RealtimeTextSocket
2016-04-21 17:41:50 +02:00
ansuz
a527024a8c
start on realtime form prototype
2016-04-21 15:51:04 +02:00
ansuz
02ff1a63a4
Merge branch 'netflux' into beta
...
Conflicts:
www/assert/main.js
2016-04-21 15:47:07 +02:00
ansuz
04f6299938
reconcile differences with netflux
2016-04-21 15:44:56 +02:00
ansuz
565fb1d186
include small snippets for preventing browser fights
2016-04-21 15:40:29 +02:00
ansuz
ffbd428b87
better logging of browser fights
2016-04-21 15:06:03 +02:00
ansuz
4d44661f3b
more correct tests
2016-04-21 15:05:41 +02:00
ansuz
a18c793f98
use latest hyperjson
2016-04-21 14:53:53 +02:00
ansuz
980ff8a0ca
Fix a test that was failing on chrome
...
it failed for reasons which are irrelevant to our application
2016-04-21 12:16:48 +02:00
ansuz
9efcc443cd
add 'format' to TextPatcher's API
2016-04-21 12:16:11 +02:00
ansuz
0769e50414
move TextPatcher to highest application layer
2016-04-20 18:56:18 +02:00
ansuz
1d70335228
provide all callbacks before starting
2016-04-20 18:27:20 +02:00
ansuz
9498937b43
add a FIXME to the assert page
...
tests were failing (unnecessarily) on Chrome
2016-04-20 18:15:17 +02:00
ansuz
a3787ee4dc
Merge branch 'netflux' into beta
2016-04-20 15:25:00 +02:00
ansuz
06b464c524
move sheet/ to .git
2016-04-20 15:04:43 +02:00
ansuz
cdf02ac725
remove input pad
2016-04-20 15:00:21 +02:00
ansuz
11961b4f1d
export stringifyDOM to REALTIME_MODULE
2016-04-20 14:50:56 +02:00
ansuz
5db487db3f
remove old pad entirely
...
hyperjson version is considered a strict improvement
2016-04-20 14:26:56 +02:00
ansuz
010566d3c3
pushDelta was mistakenly deprecated. restored.
2016-04-20 14:20:34 +02:00
ansuz
1639c5b099
use hyperscript and hyperjson from common
2016-04-20 14:14:44 +02:00
ansuz
3598c93098
move new hyperjson into common
2016-04-20 14:14:06 +02:00
ansuz
103bb69daa
move custom hyperscript into common
2016-04-20 14:13:08 +02:00
ansuz
e357549eda
push browser fights into an array for inspection
2016-04-20 14:01:21 +02:00
ansuz
b83fb7b823
improve brFix logic
...
stop exporting functions which we wish to deprecate
2016-04-20 12:29:16 +02:00
ansuz
1c7954ed51
Grab Fabric off of the window
2016-04-20 12:13:04 +02:00
ansuz
06786b6e02
Remove redundant declaration
2016-04-20 10:37:20 +02:00
ansuz
df22c246c4
serialize text nodes correctly
2016-04-20 10:10:26 +02:00
ansuz
7ca5f47d02
remove multitest pad since it offers no significant benefit
2016-04-18 17:31:37 +02:00
ansuz
bafdd588dd
fix /hack/ to not require sharejs textarea
2016-04-18 17:14:00 +02:00
ansuz
f2db6b83eb
better sizing for palette options
2016-04-18 16:40:44 +02:00
ansuz
5ce158d2e2
add more colors
2016-04-17 20:21:19 +02:00
ansuz
7c4b334ad3
here's a canvas app!
2016-04-17 20:04:49 +02:00
ansuz
41276fffb5
repair /text/ application, conform to new API
2016-04-17 14:15:34 +02:00
ansuz
cb979844f6
implement text patching at application layer
2016-04-17 14:06:30 +02:00
ansuz
4a41575e6d
accept onLocal in config
2016-04-17 14:05:33 +02:00
ansuz
d3c2c901b6
implement cursor transformation in a common library
2016-04-17 14:02:45 +02:00
ansuz
92d89f6cac
start to factor sharejs into two modules
2016-04-15 18:17:45 +02:00
ansuz
13dc77b7f6
remove commented line
2016-04-15 18:16:54 +02:00
ansuz
41e635b2e5
realtime-input.js : turn on logging
2016-04-14 16:27:34 +02:00
Yann Flory
69e8e18283
Remove the pipe character in the hash
2016-04-14 16:10:08 +02:00
ansuz
d62e9fc1c9
add a missing semicolon
2016-04-14 15:41:02 +02:00
ansuz
4095201d15
Merge branch 'netflux' of github.com:xwiki-labs/cryptpad into integrate
2016-04-14 15:40:37 +02:00
Yann Flory
c32045d7d0
Fix an issue with missing characters when several users were typing at the same time
2016-04-14 15:30:42 +02:00
ansuz
822b2bd2b9
Merge branch 'netflux' of github.com:xwiki-labs/cryptpad into integrate
2016-04-14 14:47:22 +02:00
Yann Flory
be09a1808d
Remove old code from realtime-input
2016-04-14 14:46:42 +02:00
ansuz
5a5b9ad718
Merge branch 'netflux' into beta
2016-04-14 12:37:28 +02:00
ansuz
4af987a2a2
point to correct toolbar.js
2016-04-14 12:36:25 +02:00
ansuz
3ade46adc7
Merge branch 'newtests' into beta
2016-04-14 12:33:12 +02:00
Yann Flory
6884b0890a
Fix the typong tests not working properly
2016-04-14 12:24:17 +02:00
ansuz
b12a01e08f
report test results on the page, not in the console
2016-04-14 12:16:10 +02:00
ansuz
feaae609ad
fix broken path for padrtc
2016-04-14 10:48:25 +02:00
Yann Flory
ecc41d14af
Use canonical serializer for json serialization
2016-04-13 17:46:41 +02:00
ansuz
fc77ef66b3
Merge remote-tracking branch 'origin/sortify' into HEAD
...
utilize canonical stringify function
Conflicts:
www/_socket/main.js
2016-04-13 17:36:05 +02:00
Caleb James DeLisle
319f5b95f7
Use canonical serializer for json serialization
2016-04-13 16:54:34 +02:00
Yann Flory
9683fd9aec
Always serialize the DOM in one way.
2016-04-13 16:46:31 +02:00
Caleb James DeLisle
698338b49a
Use canonical serializer for json serialization
2016-04-13 16:43:59 +02:00
Yann Flory
e207d8b579
Merge branch 'diffdom' into netflux
2016-04-13 16:19:56 +02:00
ansuz
468827dadd
newest tests
2016-04-13 16:10:38 +02:00
ansuz
c867ab04ab
rename /_socket/ app to /p/
2016-04-13 16:01:45 +02:00
ansuz
a1fe941f69
Always serialize the DOM in one way.
2016-04-13 15:00:19 +02:00
ansuz
f4c5b2a996
Add sane defaults to TextPatcher diffs
2016-04-13 14:51:15 +02:00
ansuz
259772dd62
Turn on TextPatcher logging for _socket
2016-04-13 13:54:25 +02:00
ansuz
0537c28919
Add switchable logging to TextPatcher.js
2016-04-13 13:53:20 +02:00
Caleb James DeLisle
8a36963582
Enable ChainPad PARANOIA mode but remove the part which causes most slowness
2016-04-13 13:51:01 +02:00
ansuz
284da6a4e9
minor improvements I made to the /hack/ pad last night
2016-04-13 10:16:44 +02:00
ansuz
9f0cc4ed64
update hack with a slightly better UI
2016-04-12 18:51:03 +02:00
ansuz
71c0a06c3b
Merge branch 'hack' into diffdom
2016-04-12 18:17:01 +02:00
ansuz
19cd991dba
trim dead code, comment, very minor optimizations
2016-04-12 17:29:20 +02:00
ansuz
f75c246029
remove dead code from pad/main.js
2016-04-12 17:17:14 +02:00
ansuz
9f45ccb2d9
use console.error for stack traces
2016-04-12 16:47:30 +02:00
ansuz
d705b947ab
Merge branch 'diffdom' into netflux
...
basic cleanup while performing a larger merge between two prototypes
2016-04-12 15:56:43 +02:00
ansuz
2ffa69dc15
remove checks for a non-existent race condition
2016-04-12 15:55:03 +02:00
ansuz
368d72b337
add missing semicolons to TextPatcher.js
2016-04-12 15:39:53 +02:00
ansuz
851ccfbdb6
detect falsey operations in OT and ignore them
2016-04-12 15:37:47 +02:00
ansuz
400f6efde1
json-ot.js : jshint compliance
2016-04-12 15:37:47 +02:00
ansuz
a0999d1d2b
add a comment about why hashes are being stubbed
2016-04-12 15:36:03 +02:00
ansuz
ca94d30386
detect falsey operations in OT and ignore them
2016-04-12 15:35:07 +02:00
ansuz
9f9cd8d8cd
realtime-input.js : fixes for jshint compliance
2016-04-12 15:07:05 +02:00
ansuz
793149a608
json-ot.js : jshint compliance
2016-04-12 15:00:46 +02:00
ansuz
06a3b63923
jshint compliance for toolbar.js
2016-04-12 14:58:24 +02:00
ansuz
3b8238ef3b
add missing semicolons to pad/main.js
...
jshint compliance
2016-04-12 14:51:32 +02:00
ansuz
5cead3fad3
add missing semicolons to TextPatcher.js
2016-04-12 14:51:06 +02:00
ansuz
e6ab03164c
import TypingTests.js and expose at the console
...
RTWYSIWYG-54
> implement tests for components of the WYSIWYG editor
2016-04-12 14:34:47 +02:00
ansuz
94e57e4a26
update location of text-patcher.js
2016-04-12 14:21:31 +02:00
ansuz
b37dab1f49
Merge branch 'diffdom' into netflux
...
Simple cleanup and unit tests
2016-04-12 14:15:04 +02:00
ansuz
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
2016-04-12 14:12:44 +02:00
ansuz
6bb37aed44
main.js : support tab insertion in /hack/ pad
2016-04-12 14:05:56 +02:00
ansuz
6b9d982d40
stabilize _socket/realtime-input.js
...
...as common/RealtimeTextSocket.js
2016-04-12 13:10:57 +02:00
ansuz
1a22592afa
remove unused modules from realtime-input.js
2016-04-12 13:06:52 +02:00
ansuz
39071021eb
stabilize typingTest.js as /common/TypingTests.js
2016-04-12 12:53:23 +02:00
ansuz
9805958ad7
stabilize text-patcher.js into /common/TextPatcher.js
2016-04-12 12:46:49 +02:00
ansuz
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.
2016-04-12 12:27:33 +02:00
ansuz
7782069dbd
Merge pull request #15 from xwiki-labs/diffdom
...
merge diffdom into netflux
2016-04-12 10:21:19 +02:00
ansuz
a1f9b10175
remove offending line from chainpad entirely
...
RTCHAINPAD-3
2016-04-12 10:02:11 +02:00
ansuz
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.
2016-04-12 09:55:50 +02:00
ansuz
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
ansuz
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
Yann Flory
360fee9feb
Fix a new cursor error with Codepad
2016-04-11 17:58:30 +02:00
Yann Flory
c2e0dded3a
Fix an issue with the cursor sometimes disappearing when a patch was received
...
Update CodeMirror to the latest version (5.13.2)
2016-04-11 15:47:40 +02:00
Yann Flory
713c90242b
Hide the usernames when they have not been changed
2016-04-11 15:00:22 +02:00
Yann Flory
c53baab99d
Update Codepad with the latest improvements
2016-04-11 14:43:39 +02:00
Yann Flory
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
ansuz
cd357a9136
turn an alert into a console.error
2016-04-07 17:03:30 +02:00
ansuz
ec64e0d381
use getAttribute to inspect document elements
...
el.getAttribute('attr') is more reliable than el[attr].
2016-04-07 15:55:57 +02:00
ansuz
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
2016-04-07 15:50:56 +02:00
ansuz
842b9d4243
Generalize _socket/realtime-input.js a little more
...
Anything JSON related should be at the application layer
2016-04-07 15:48:38 +02:00
Yann Flory
cf9f60bd57
The server don't send back anymore messages to their sender
2016-04-07 11:27:14 +02:00
Yann Flory
eb4ea7a6b0
Remove the content from the ACK messages sent by the server
2016-04-05 15:06:38 +02:00
Yann Flory
ba4faea939
Update the pads to run with the latest improvements to the websocket server
2016-04-05 12:17:43 +02:00
Yann Flory
5ef7e29a9b
Add the latest changes from _socket into the netflux pad
2016-04-01 17:58:33 +02:00
ansuz
b59a14c5ac
merge hyperjson changes from realtime xwiki
...
more resilient class serialization.
comments
2016-04-01 11:20:19 +02:00
ansuz
2691d85582
use forked chainpad with assertions for _socket
2016-04-01 10:51:47 +02:00
Yann Flory
b41f0e8c50
Merge branch 'cjd-fixed-it-with-hax' into netflux2
2016-04-01 10:51:27 +02:00
ansuz
c50690349b
comments describing the role of each argument
2016-04-01 10:46:54 +02:00
ansuz
df78d284c4
initial state should be valid JSON so JSON parse doesn't fail
2016-04-01 10:44:23 +02:00
ansuz
96e03fcfa4
Use latest chainpad without mutations
2016-03-30 15:29:28 +02:00
ansuz
d5772c6315
when json-ot produces json that fails to parse...
...
export the relevant data to a window variable so we can inspect it better
2016-03-30 14:39:41 +02:00
ansuz
aaf7c777cc
add debugging info to the textPatcher
...
* kill dead code
* add assertions
* better logging for insertions and removals
2016-03-30 14:38:10 +02:00
ansuz
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.
2016-03-30 14:36:11 +02:00
ansuz
e446a3645c
don't send funny BR attributes over the wire. Properly initialize the typing test
2016-03-29 17:21:02 +02:00
ansuz
22290590cb
don't rely on window scope in typingTest.js
2016-03-29 17:02:56 +02:00
ansuz
772ca5d30e
comment out debugging line
2016-03-29 17:01:57 +02:00
ansuz
6c340a6527
chainpad testing = true, reject non-compliant messages
2016-03-29 16:53:40 +02:00
ansuz
afa1104d85
Pull the cursor out of bogus BR tarpits when it gets stuck
2016-03-29 15:36:03 +02:00
ansuz
bac0e0ff88
implement hyperjson filtering
2016-03-29 15:35:40 +02:00
ansuz
e51635c4bb
fix index error
2016-03-29 15:34:58 +02:00
ansuz
3aebf7d2c2
minor changes to pass linting
2016-03-29 12:35:23 +02:00
ansuz
29e24f556c
kill another window variable
2016-03-29 12:13:57 +02:00
ansuz
e699073d45
attempt to preserve the magic line plugin while someone else is typing
2016-03-29 11:54:55 +02:00
ansuz
941f5361ea
forgot to add 'typingTest', which main depends on
2016-03-29 11:16:50 +02:00
ansuz
d852c578d8
removed dead code
2016-03-29 11:16:13 +02:00