e9858041a4
Merge pull request #494 from 0ip/miscFix
...
Misc fix
2012-02-25 05:32:29 -08:00
1b5a7659c3
fix bug #495
2012-02-25 13:28:47 +00:00
0191c248b5
Merge commit '64f04670efd582230e693a1c6b3c91bc8df27299' into cleanup-ace-fix
...
Conflicts:
static/js/ace2_inner.js
2012-02-24 20:22:32 +01:00
64f04670ef
Merge pull request #483 from fourplusone/ace2_inner_patch2
...
refactored ace_setProperty of ace2_inner.js
2012-02-24 09:00:18 -08:00
b06f3f6903
removed ";"
2012-02-21 23:15:19 +01:00
4ef71c3534
documented ace_setProperty
2012-02-21 23:13:59 +01:00
eae87fd835
fixed indention + variable scoping
2012-02-21 21:46:25 +01:00
d479784559
Hotfix for issue #467 https://github.com/Pita/etherpad-lite/issues/467 -- probably wants a permafix
2012-02-20 01:11:34 +00:00
fc0114fc2d
added settings to mobile version
2012-02-19 17:51:10 +01:00
12298a926c
move width-specific css to bottom + transfer js-css to a class [#chatbox:.stickyChat]
2012-02-19 17:16:05 +01:00
255cf8c5f0
qr codes now have equal margins
2012-02-19 17:04:36 +01:00
f9ad9bec92
clean up broadcast.js
2012-02-19 16:05:07 +01:00
465f6c2de7
use shared functions from Ace2Common
2012-02-19 15:47:20 +01:00
9ede14a546
drop embedding of JS/CSS files in ace.js. May result in a little performance drop but makes code much smaller
2012-02-19 15:02:54 +01:00
7e7646b517
make jshint a bit more happier
2012-02-19 14:52:24 +01:00
ce8d60e32c
remamed to Ace2Inner() and made it more classlike
2012-02-19 14:30:57 +01:00
3c4b4af43d
removed recolor module since it wasn't used
2012-02-19 14:30:08 +01:00
fb879576e1
replaced noop in skiplist with ace2common implementation
2012-02-19 14:28:51 +01:00
5d14fb372a
Merge branch 'cleanup-ace-js' into cleanup-ace
2012-02-19 14:19:54 +01:00
5313053d2d
even more compact code for exposed functions in ace2.js
2012-02-19 14:18:52 +01:00
a66e01a08f
moving noop and identity helper functions to ace2_common
2012-02-19 14:11:32 +01:00
77dbe4646e
binarySearch is never used
2012-02-19 12:40:13 +01:00
3cd7bd0dd1
Since ace2_inner.js is already scoped by require-kernel, function OUTER is pretty useless
2012-02-19 12:34:24 +01:00
99fb567a3d
removed parenModule as it is entirely unused since getCharType() always returns an emtpy string
2012-02-19 12:15:42 +01:00
8031c31bc3
more compact code for exposed functions in ace2.js
2012-02-19 03:16:42 +01:00
6ba865521a
See 1caaff9308
...
https://github.com/Pita/etherpad-lite/pull/462
2012-02-18 17:51:39 +00:00
5751a8e434
Merge pull request #352 from cweider/modulize-share
...
Module Sharing
2012-02-14 09:21:45 -08:00
da23a62c49
Remove an unused collab client message
2012-02-13 22:59:12 -05:00
0d3188365a
Bugfix to noColors view option
2012-02-13 22:59:12 -05:00
e0d23e3c5d
Create and use the Security module.
...
Use it to replace code on the client and server side.
2012-02-10 14:52:35 -08:00
363e168561
Share `randomString` method.
...
This simply shares a common implementation and makes no judgements on the validity of its use. The string created is not a secure random number, so some uses of it may not be applicable.
2012-02-10 14:52:34 -08:00
34edba3adf
Share `createCookie` and `readCookie` methods.
2012-02-10 14:52:34 -08:00
7038f9a61d
Drop the `cssmanager_client` module.
2012-02-10 14:52:34 -08:00
f6ac0b1926
Drop the `linestylefilter_client` module.
2012-02-10 14:52:34 -08:00
3581a45491
Drop the `domline_client` module.
2012-02-10 14:52:34 -08:00
4098cbe03b
Drop the `easysync*` modules.
2012-02-10 14:52:34 -08:00
f8f80968ca
Share the `AttributePoolFactory`, `Changeset`, and `contentcollector` modules.
2012-02-10 14:52:34 -08:00
e74c9e1bc9
Merge pull request #420 from cweider/fix-colorpicker
...
Fix colorpicker
2012-02-06 12:56:37 -08:00
2f32f5a6aa
IE does not support index of.
2012-02-06 12:36:45 -08:00
c130a48d89
Text contrast adjustment for chat time
2012-02-06 16:16:31 +01:00
9e769571fa
Text contrast adjustment for timeslider
2012-02-06 16:00:42 +01:00
169bae6cc9
Tweak contrast factor for author colors in editor
2012-02-06 16:00:08 +01:00
64ae1c433f
Allow modules to be fetched remotely.
2012-02-05 16:59:40 -08:00
4bf9b0c805
Always include the require kernel.
2012-02-05 16:59:40 -08:00
348e7ef1d5
Define packaging for iframe JS in the same way as pad.js and timeslider.js.
2012-02-05 16:59:40 -08:00
3678625c7c
Remove dependencies on native `map`.
2012-02-05 13:59:35 -08:00
b1d871d0fd
Defer socket setup until initialization and on document ready.
...
Code at the top level of a module should be related to definition only. Things that execute code should be inside of initialization methods. All evidence suggests that the binding to `window.onload` was arbitrary, and that this can be done as soon as the document is ready with no ill-effects.
2012-02-05 13:55:35 -08:00
3fb62956b9
Plugins are injected and no longer exist in the global scope.
2012-02-05 13:46:56 -08:00
8ade4c89d5
Merge pull request #400 from elijh/master
...
minor spelling fix
2012-02-05 06:25:42 -08:00
200346ee5d
Allow parameter to be passed to always show cha ton side of screen
2012-02-05 14:23:01 +00:00
John McLear