Commit Graph

314 Commits (50474dff1f1fd9c6a573c723a928f297651a5975)

Author SHA1 Message Date
Matthias Bartelmeß 3cd7bd0dd1 Since ace2_inner.js is already scoped by require-kernel, function OUTER is pretty useless 2012-02-19 12:34:24 +01:00
Matthias Bartelmeß 99fb567a3d removed parenModule as it is entirely unused since getCharType() always returns an emtpy string 2012-02-19 12:15:42 +01:00
Matthias Bartelmeß 8031c31bc3 more compact code for exposed functions in ace2.js 2012-02-19 03:16:42 +01:00
John McLear 6ba865521a See 1caaff9308
https://github.com/Pita/etherpad-lite/pull/462
2012-02-18 17:51:39 +00:00
Peter 'Pita' Martischka 5751a8e434 Merge pull request #352 from cweider/modulize-share
Module Sharing
2012-02-14 09:21:45 -08:00
Jordan da23a62c49 Remove an unused collab client message 2012-02-13 22:59:12 -05:00
Jordan 0d3188365a Bugfix to noColors view option 2012-02-13 22:59:12 -05:00
Chad Weider 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
Chad Weider 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
Chad Weider 34edba3adf Share `createCookie` and `readCookie` methods. 2012-02-10 14:52:34 -08:00
Chad Weider 7038f9a61d Drop the `cssmanager_client` module. 2012-02-10 14:52:34 -08:00
Chad Weider f6ac0b1926 Drop the `linestylefilter_client` module. 2012-02-10 14:52:34 -08:00
Chad Weider 3581a45491 Drop the `domline_client` module. 2012-02-10 14:52:34 -08:00
Chad Weider 4098cbe03b Drop the `easysync*` modules. 2012-02-10 14:52:34 -08:00
Chad Weider f8f80968ca Share the `AttributePoolFactory`, `Changeset`, and `contentcollector` modules. 2012-02-10 14:52:34 -08:00
John McLear e74c9e1bc9 Merge pull request #420 from cweider/fix-colorpicker
Fix colorpicker
2012-02-06 12:56:37 -08:00
Chad Weider 2f32f5a6aa IE does not support index of. 2012-02-06 12:36:45 -08:00
Marcel Klehr c130a48d89 Text contrast adjustment for chat time 2012-02-06 16:16:31 +01:00
Marcel Klehr 9e769571fa Text contrast adjustment for timeslider 2012-02-06 16:00:42 +01:00
Marcel Klehr 169bae6cc9 Tweak contrast factor for author colors in editor 2012-02-06 16:00:08 +01:00
Chad Weider 64ae1c433f Allow modules to be fetched remotely. 2012-02-05 16:59:40 -08:00
Chad Weider 4bf9b0c805 Always include the require kernel. 2012-02-05 16:59:40 -08:00
Chad Weider 348e7ef1d5 Define packaging for iframe JS in the same way as pad.js and timeslider.js. 2012-02-05 16:59:40 -08:00
Chad Weider 3678625c7c Remove dependencies on native `map`. 2012-02-05 13:59:35 -08:00
Chad Weider 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
Chad Weider 3fb62956b9 Plugins are injected and no longer exist in the global scope. 2012-02-05 13:46:56 -08:00
John McLear 8ade4c89d5 Merge pull request #400 from elijh/master
minor spelling fix
2012-02-05 06:25:42 -08:00
John McLear 200346ee5d Allow parameter to be passed to always show cha ton side of screen 2012-02-05 14:23:01 +00:00
elijah 17e9cf71da use english spelling: replace costumStart with customStart. 2012-02-04 15:22:25 -08:00
Robin eb24404d3d automatic prefixfree.js dl 2012-02-04 18:37:36 +01:00
Robin adc58cdcaf add missing slash 2012-02-04 18:11:41 +01:00
Robin 7075ff6731 get rid of vendor prefixes 2012-02-04 18:08:04 +01:00
John McLear 894ff56611 Merge pull request #396 from 0ip/ui_dialog_hl
Mark UI button of currently 'open' dialog
2012-02-03 17:22:44 -08:00
Robin 28386adbbb Scroll down 2012-02-03 22:52:57 +01:00
0ip a8cc61545c Prevent that li.sepereator gets .selected 2012-02-03 22:29:43 +01:00
Robin 79794c0572 remove unnecessary module 2012-02-03 21:45:25 +01:00
Robin 1c826da1d1 rem jQ-UI from pad.js too 2012-02-03 21:28:19 +01:00
Robin bb808d11ac remove jquery ui 2012-02-03 21:20:02 +01:00
Robin 2adda472fc Highlight button for currently opened dialog 2012-02-03 20:43:09 +01:00
John McLear 9d72ddfbc7 Solves first part of #377 -- Swap order of title and pad name 2012-01-31 14:15:36 +00:00
Chad Weider 23a166ca99 JSON exports itself. This fixes issue #376. 2012-01-30 15:26:30 -08:00
Chad Weider f83e619fd9 Null-out the padeditor's reference to ace once it has been distroyed.
This enables the guards placed in `padeditor.disable` to work. On `window.unload` the pad's connection would get closed which would lead to the editor becomming disabled. If the editor had already been `disposed` then the call to `disable` would raise the exception:

  `Uncaught TypeError: Cannot call method 'ace_setProperty' of null`
2012-01-30 15:23:54 -08:00
Peter 'Pita' Martischka 4d714cee94 Merge pull request #371 from cweider/page-initialization
Page initialization
2012-01-30 01:56:02 -08:00
John McLear 7096ce7f1e Fix #171 IE9 edit issue and #361 IE URL Last Letter issue 2012-01-29 18:41:33 +00:00
John McLear 3287a0000a Merge pull request #349 from marcelklehr/master
Make text color change depending on luminosity of  author color
2012-01-29 08:39:54 -08:00
Chad Weider a408557a0e Make implicit loading of modules unnecessary.
This is one step on the way to simplifying `Minify` and allowing all of the modules within pad.js to be loaded independently in development mode (which is useful for debugging).
2012-01-28 23:11:54 -08:00
Chad Weider 6a4c025e08 Global exception handler is not registered until the page's controller adds it.
It is bad form to register this handler on definition. This would cause problems if, for instance, this module was required by our Node code.
2012-01-28 22:35:38 -08:00
Chad Weider 67e6f9fa5a Move timeslider code into JS. 2012-01-28 18:42:49 -08:00
Chad Weider d934fd6107 Remove all global dependencies from broadcast modules. 2012-01-28 18:40:56 -08:00
Chad Weider cd86ef5600 Shift pad initialization into JavaScript. 2012-01-28 14:48:53 -08:00
Chad Weider 3e9b56aa75 Give controller for pad.html a more appropriate name. 2012-01-28 14:48:53 -08:00
Chad Weider 514698162f Inject pad dependencies into most pad submodules. 2012-01-28 14:48:53 -08:00
Chad Weider 56c07e484a Expose settings on pad object. 2012-01-28 14:48:53 -08:00
John McLear e68643b67e Comment out some of the sidebar code that is no longer used and add a cookie set and get for sticky chat view 2012-01-28 22:24:14 +00:00
Robin d872b42e31 reverted John's commits, added labels and tweaked popups to act more dynamically 2012-01-28 17:38:52 +01:00
John McLear a53de45b32 Beautifying 0ips commit to give settings option, also add warning prior to altering everyones view and moved everyones view stuff into my view only that needed to be moved.. 2012-01-27 01:00:14 +00:00
John McLear 47ee0ec383 Fix minor styling isue where focus chat box would try to show up even if chat was stuck to screen 2012-01-27 00:43:00 +00:00
Robin 57075d1545 Beautified html, sticky chat, dynamic inputs, beautified qr-code, fixed chat bug 2012-01-26 17:22:44 +01:00
Peter 'Pita' Martischka 622068183a Revert "Text color changes based on author color"
This reverts commit 49061175c9.
2012-01-26 12:57:57 +01:00
Peter 'Pita' Martischka 9f9eb6e928 Merge branch 'master' of github.com:Pita/etherpad-lite 2012-01-26 12:40:23 +01:00
John McLear 917732422d fix minor bug where chat would overlay document scroll bar and also ensure rounded edges 2012-01-25 19:06:41 +00:00
John McLear 7b77f3d4b5 Toggle sticky chatf unction can be called very easily, 0ip to add to settings interface 2012-01-25 19:03:25 +00:00
Marcel Klehr 228543a30e Text color changes based on author color 2012-01-23 18:40:54 +01:00
Chad Weider 9253f9993d Remove guards surrounding export steps. 2012-01-22 09:54:28 -08:00
Chad Weider 62e0a8f26c Use require-kernel for require functionality. 2012-01-22 09:54:28 -08:00
Chad Weider 86f31c752d Implement `require` for for plugin module. 2012-01-22 09:49:13 -08:00
Chad Weider fa2a6e9ee6 Implement `require` of dependencies for all `pad_*` modules.
Create a lazily-defined local reference for pad on initialization in each pad module in order to avoid circular dependency. At some point in the future this dependency should instead be injected into each module on initialization.
2012-01-22 09:49:13 -08:00
Chad Weider 7f98116a43 Implement `require` for most modules. 2012-01-22 09:49:13 -08:00
Chad Weider 72d29b1c62 Inject the pad dependency into chat. 2012-01-22 09:49:13 -08:00
Chad Weider 9e16b9a575 Always use the JS assets processed by Minify.
This allows the preprocessing that will restrict scope of files to be done once in Minify.
2012-01-22 09:49:13 -08:00
Chad Weider 2b5d7a0048 All files export their public interface if `exports` is available. 2012-01-22 09:48:21 -08:00
Chad Weider 003c2a59aa Remove dependency on a global socket and address `pad.socket` instead. 2012-01-22 09:46:09 -08:00
Chad Weider 6bbc32a19f Default plugin should not fail if clientVars is not defined.
In the case that it is not defined, the configuration is `undefined`.
2012-01-22 09:46:09 -08:00
Chad Weider 0f7e6feda1 Remove individual settings in `pad2.js` from global. 2012-01-22 09:46:09 -08:00
Chad Weider 50d304022d Change calculation of `userAgent`.
Default to 'node-js' only if no user agent can be found the normal way.
2012-01-22 09:46:09 -08:00
Chad Weider 548c527aaf Move exposure of `Ace2Editor` closer to the code that requires it. 2012-01-22 09:46:08 -08:00
Peter 'Pita' Martischka 7a3e800fca Merge branch 'master' of git://github.com/marcelklehr/etherpad-lite 2012-01-22 15:41:24 +01:00
Marcel Klehr 49061175c9 Text color changes based on author color 2012-01-22 13:30:25 +01:00
Robin c0a0687fe9 It was definetely too late 2012-01-22 13:09:10 +01:00
0ip 3f8b03a900 Typo again 2012-01-22 02:15:02 +01:00
Robin 3c85a9cc6c Typo 2012-01-22 00:13:00 +01:00
Robin 300886da34 Removed duplicates 2012-01-22 00:10:06 +01:00
John McLear 9f0ca7cc44 Remove alt key from Z to stop Polish people feeling sad 2012-01-17 16:50:35 +00:00
Peter 'Pita' Martischka 8f887262b0 Merge pull request #335 from johnyma22/importInstructions
Added a string to let people know to install abiword to enable import
2012-01-15 12:50:55 -08:00
Peter 'Pita' Martischka a313c2570e Merge pull request #331 from cweider/packaging-improvement
Packaging improvement
2012-01-15 12:48:41 -08:00
John McLear eec22c4b70 Added a string to let people know to install abiword to enable import 2012-01-15 20:48:29 +00:00
Chad Weider 71a7c00abc Merge adjacent scripts. 2012-01-15 12:10:29 -08:00
Chad Weider a7bea30d83 Remove unnecessary quoting approach. 2012-01-15 11:27:08 -08:00
Chad Weider 9c91f16c71 Improve inlining of editor content.
Instead of replacing substrings, write each included file's content into a shared dictionary for lookup later. This eliminates duplication and arguably improves readability.
2012-01-15 11:27:04 -08:00
John McLear 5f46ac2b01 Temporary fix that was breaking clicks inside of embedded pads 2012-01-15 18:24:18 +00:00
John McLear f4dca37a93 Ordered list support 2012-01-15 17:20:20 +00:00
Chad Weider 387dd4a48b The value of all href attributes is escaped. 2012-01-14 14:50:23 -08:00
Chad Weider 6e36b59a59 All escaping functions replace HTML reserved characters. 2012-01-14 14:46:15 -08:00
John McLear 642b716553 Merge pull request #289 from jhollinger/no_spaces
Sanitize pad names
2012-01-08 07:30:07 -08:00
John McLear 86902c2c0b Merge pull request #291 from jhollinger/export_revisions
Add ability to export specific pad revisions
2012-01-08 07:06:13 -08:00
John McLear 7232dff6db Merge pull request #306 from 0ip/patch-7
Disables line numbers on mobile devices (fix for #304 and #305)
2012-01-08 06:49:56 -08:00
Jordan ca70a7772a Fix cursor jump in IE when clicking edit buttons 2012-01-02 20:45:31 -05:00
0ip a9a17e7360 properly disables line numbers on mobile devices (fix for #304 and #305) 2011-12-31 17:46:10 +01:00
Jordan 2a86d57e46 Add ability to export specific pad revisions 2011-12-18 00:18:35 -05:00
Jordan e8ef99fb72 Sanitize pad names 2011-12-16 15:41:11 -05:00