Sebastian Castro
4115f792e4
ace.js: prioritize the skin style over the plugin style
...
Preparatory work for introducing colibris skin
2018-11-08 21:55:34 +01:00
Sebastian Castro
8a6eae26d7
ace.js: also add plugins names to #outerdocbody (refs #3488 )
...
This commit is an integration to aa8204e5dfe4
2018-11-08 21:55:07 +01:00
muxator
36f39a6e13
ace.js: remove template literals to keep IE 11 compatibility
...
Files in "src/static" are executed on the client: do not break browser
compatibility because of syntactic sugar.
Introduced in 9c990ab08a
2018-08-27 02:18:34 +02:00
muxator
9c990ab08a
skins: finalize support for multiple skins
...
The old "static/custom" directory is replaced by "static/skins/<skinName>",
where <skinName> is taken from settings.json.
When no value is found, a default of "no-skin" is assumed, so that backward
compatibility is maintained.
The most evident security concerns have been addressed.
Closes #3471 .
2018-08-26 21:17:04 +02:00
muxator
6c56e7ca7a
ace.js: use URL encoding when building an URL via string concatenation
...
Not performing encoding/decoding when traversing logical domains is a security
risk.
String concatenation is not great, too, but this change is just focused on
allowing the implementation of skin support.
2018-08-26 02:40:36 +02:00
John McLear
73414df3c7
heh whoops :)
2016-05-20 14:43:01 +01:00
John McLear
a8487dd5dc
client Var value for disabling scripts
2016-05-20 14:42:05 +01:00
Mikk Andresen
ad2ea924b5
aceEditorCSS to allow absolute paths to resources to include external CSS
2015-12-01 14:16:44 +02:00
John McLear
82c7ca4ac3
add classes for bootstrap targeting, pew pew
2015-10-22 01:32:02 +01:00
John McLear
7b726cbc02
more working logic and also pretty nice screen reader experience
2015-03-26 13:58:57 +00:00
John McLear
959aa92656
stop listing URL each time focus is placed back on inner iframe
2015-03-26 13:32:45 +00:00
John McLear
1a5ea8707f
make the pad contents act like an application and not contents, this can probably be togglable but default state should be editable
2015-03-26 13:16:54 +00:00
webzwo0i
3f31445abf
don't call ace_getInInternationalComposition if editor is not fully loaded
2014-01-28 14:07:26 +01:00
webzwo0i
020bd3915c
remove empty&unused overlaysdiv
2013-12-08 17:24:12 +01:00
Chia-liang Kao
f31db205da
allow cssmanager to manage outer_ace
2013-06-15 01:38:46 +08:00
NAGOYA, Yoshihiko
957a0aa873
fix Pita/etherpad-lite #1032
...
refact inInternationalComposition
2012-10-12 01:12:15 +09:00
Chad Weider
622819ba93
Make intialization of Ace2Inner analogous to other page controllers.
2012-09-21 22:09:55 -07:00
Chad Weider
9f5946c942
Reformat Ace2Editor frame boot scripts.
2012-09-21 22:09:55 -07:00
Chad Weider
fa65f889ec
Consolidate Ace2Editor frame's boot script.
2012-09-21 22:09:55 -07:00
Chad Weider
b691606c4e
Replace ParentRequire hack.
...
Instead of hacking with the internals of require, make client_plugins aware
and capable of sharing behavior.
2012-09-11 21:16:47 -07:00
Chad Weider
1258ed3a0d
Split client and server plugin functionality.
...
There is virtually no shared code for the client, extract it into its own
module and do away with the switches.
2012-09-11 21:16:47 -07:00
Chad Weider
3b5ea88bf5
If the file was not found this should be nothing.
2012-09-09 14:42:32 -07:00
Chad Weider
3312387b08
Drop embedding of modules.
...
With loopback removed, embedding concatenated resources doesn't happen. It
was a marginal feature to begin with so it will not be missed.
2012-09-09 14:40:20 -07:00
Chad Weider
6e796eb5fb
Make exception case for require kernel obvious.
2012-09-03 14:41:26 -07:00
Egil Moeller
357ca73a99
Bugfix for bug introduced by 96ab3dc3b4: jQuery is packaged - this is pure duplication.
2012-05-30 10:00:36 +02:00
Chad Weider
819fb76dcd
These definitions are meaningless.
2012-05-28 16:43:20 -07:00
Chad Weider
96ab3dc3b4
jQuery is packaged - this is pure duplication.
2012-05-28 15:14:52 -07:00
Chad Weider
c4c30bf725
Correct parent_require path.
2012-05-28 15:14:51 -07:00
Chad Weider
299a90b3ba
Fix paths for ace files.
2012-05-28 15:14:51 -07:00
Chad Weider
a9eb2d4e31
Fix ordering of editer code loading operations.
2012-05-14 19:01:00 -07:00
Chad Weider
384523859e
Require ace2_common separately.
2012-05-14 18:20:16 -07:00
Chad Weider
97c7842d19
Remove unused line.
2012-05-14 18:20:16 -07:00
John McLear
c70d88eedc
Merge pull request #667 from fourplusone/feature/cleaner_code
...
Removing unused code - All looks good, some minor tweeks are probably worthwhile in the future.
2012-05-13 06:51:58 -07:00
Matthias Bartelmeß
f809b0d6c8
removing de-facto noop
2012-04-20 12:03:11 +02:00
Martyn York
da75b87d3c
added new hook 'acePostWriteDomLineHTML' which gets called after a domline is created and has been added to the page. Also fixed problems with ReferenceExceptions due to require-kernel not being sent to the iframe.
2012-04-18 14:44:25 -07:00
Matthias Bartelmeß
c79593569a
added aceEditorCSS hook
2012-04-07 01:40:13 +02:00
Egil Moeller
6120a0b7aa
Merge branch 'develop' of git://github.com/Pita/etherpad-lite
2012-03-27 22:36:48 +02:00
Egil Moeller
668725b892
Add jquery to ace iframe
2012-03-27 22:24:36 +02:00
Egil Moeller
d0ad90456e
Merge commit '1a64a6c1'
2012-03-22 18:43:59 +01:00
Egil Moeller
7304a9ef3f
Bugfix for misplaced hook call
2012-03-21 19:27:43 +01:00
Matthias Bartelmeß
e559df18ce
use underscore.js
2012-03-17 13:38:26 +01:00
Constantin Jucovschi
1a64a6c1c5
makes plugin architecture work in client-side from inside IFrames as well
2012-03-14 11:45:25 +01:00
Chad Weider
ddda347f7a
Merge branch 'require-paths' into plugin
...
Conflicts:
node/server.js
src/static/js/Changeset.js
src/static/js/ace.js
src/static/js/ace2_common.js
src/static/js/ace2_inner.js
src/static/js/broadcast.js
src/static/js/changesettracker.js
src/static/js/chat.js
src/static/js/collab_client.js
src/static/js/contentcollector.js
src/static/js/domline.js
src/static/js/linestylefilter.js
src/static/js/pad.js
src/static/js/pad_connectionstatus.js
src/static/js/pad_docbar.js
src/static/js/pad_editbar.js
src/static/js/pad_editor.js
src/static/js/pad_impexp.js
src/static/js/pad_modals.js
src/static/js/pad_savedrevs.js
src/static/js/pad_userlist.js
src/static/js/pad_utils.js
src/static/js/timeslider.js
src/static/js/undomodule.js
src/static/pad.html
src/static/timeslider.html
2012-03-10 15:08:09 -08:00
Chad Weider
1a1f222221
Change paths.
2012-03-10 14:39:37 -08:00
Chad Weider
c6b8beabd3
Correct paths to reflect their being libraries.
2012-03-10 14:39:37 -08:00
Chad Weider
ca02ca05ae
Remove unnecessary line.
2012-03-10 14:39:37 -08:00
Chad Weider
2fd9019792
Remove require code that is unnecessary and/or incorrect.
2012-03-10 14:39:37 -08:00
Chad Weider
648603126b
Remove require changes in pushScriptsTo method.
...
These duplicate `pushRequireScriptTo` at least, but mostly break things.
2012-03-10 14:39:37 -08:00
Egil Moeller
ce5d2d8685
Merge branch 'pita'
...
Resolved conflicts:
.gitignore
src/static/js/ace.js
src/static/js/ace2_inner.js
src/static/js/broadcast.js
src/static/js/domline.js
src/static/pad.html
src/static/timeslider.html
Ignored conflicts (please merge manually later):
node/server.js
src/node/utils/Minify.js
2012-03-02 22:00:20 +01:00
Egil Moeller
df531a7b2b
Made ace actually use the new hooks system, and removed remnants of old system
2012-03-01 19:22:02 +01:00
