Commit graph

152 commits

Author SHA1 Message Date
Derk-Jan Hartman 0154e0d0e8 Fix trailing comma
Also applied upstream at https://github.com/ajaxorg/ace/pull/1938

Bug: 64559
Change-Id: Ieb55819b634c14335806bd7ce3e6c1f063a346cc
2014-04-29 20:51:51 +02:00
jenkins-bot 8da019fe29 Merge "CodeEditor: Disable in IE7, too unstable." 2014-04-29 17:48:24 +00:00
Derk-Jan Hartman a99f5c824c CodeEditor: Disable in IE7, too unstable.
Bug: 64559
Change-Id: I59a8cebf1d1c7f3e839295d8a85739d9c2dc2683
2014-04-29 14:35:02 +02:00
Derk-Jan Hartman 7847555702 Update Ace to 29-04-2014
Updates ACE to commit: 4949e18f00e4dbf34fc8a213909ef6ae3e1a1015

This includes fixes for IE7/8 support, which was broken in the last ACE
release. Specifically
051128c16f (diff-502b909e9de186749df3051f8d4bfa42L137)

Bug: 64559
Change-Id: I0765c5f95de81a5ce9632f6eb5422b98c02941ff
2014-04-29 11:03:14 +02:00
jenkins-bot 0343d914c3 Merge "Add a status bar to the CodeEditor" 2014-04-22 17:37:11 +00:00
Derk-Jan Hartman 0759a6de4f Allow the CodeEditor in read only mode
Depends on: I6885d617e18562acf0331e8db5790b53b489dbc2
Bug: 45258
Change-Id: Ie69e9c33bc307ec34abb7dcf3f427cfbe407fde3
2014-04-16 23:54:01 +02:00
Derk-Jan Hartman 00905d1829 Add a status bar to the CodeEditor
- Show counts of errors/warnings/info annotations. This is useful
  because the annotations are in the gutter, so in big files it takes
  a lot of scrolling to look for errors
- Clicking the totals count skips you to the 'next' annotation
- If the current line contains an error, show the message of the error
  in the status bar.
- Show the current line:column number, the selection range and the
  editor mode.
- Degrades to a useful and readable but not pretty state in IE7

More complex version of: Ib9f08fcbc0365302756095b9027289736856fc73

Bug: 63294
Change-Id: Ided0804d5eb7864452287087dd1cf5a3dd8ff078
2014-04-14 09:46:55 +02:00
Derk-Jan Hartman 262bfde28e Ask for confirmation when saving document with errors
Bug: 63202
Change-Id: Ifbdf976f3c0f27da67d7cf034c040d4279d62217
2014-03-30 00:47:10 +01:00
Derk-Jan Hartman 03327915be Work around a problem with web workers in ACE
This will do for now, but we need a better fix upstream

Change-Id: I621066a4eb5ba1e14f92d2896852026d23b4be18
2014-03-25 10:59:08 -07:00
Derk-Jan Hartman 28c4b5ac10 Update ACE to Mar 16, 2014
This should be merged at the same time as it's followup patch, which
fixes an issue with loading webworkers when hosted on protocol
relative URLs.

Amongst other issues, it fixes bug 60156 with } pairing

Bug: 60156
Change-Id: I962c70ea2a07d27e0c3774095d63f9a5cd3de76e
2014-03-25 17:46:47 +00:00
helderwiki 6276431c6e Remove inexistent hook "LivePreviewPrepare"
This hook is never fired, therefore, per code review of
Ife952fc165dacea3ae7726e09bf61279f4bdae59 it should be
removed from CodeEditor.

Bug: 47235
Bug: 52071
Change-Id: Ic9dd9066f7d1676f45381cb6796425f13490fea3
2014-03-19 20:21:04 +00:00
Derk-Jan Hartman d0ec3d6982 Fix JSHint for CodeEditor
Change-Id: Iaf5c1fde6e002ea31eeef88f1963090e14784a7a
2014-03-17 00:28:35 +01:00
Derk-Jan Hartman b50d6d2fc7 Revert "Update ACE to Jan 17, 2014"
The update throws an error for the workers. Better we revert this for
now.

This reverts commit c2eed4f0e6.

Change-Id: I7090b833dc41a25a2c360113c10717055c003330
2014-01-22 16:29:24 -08:00
jenkins-bot 0b9626eab3 Merge "Update ACE to Jan 17, 2014" 2014-01-19 07:37:14 +00:00
Derk-Jan Hartman c2eed4f0e6 Update ACE to Jan 17, 2014
This fixes a breakage with } pairing
Also adds support for CORS loading of the workers.

Bug: 60156
Change-Id: I7333a107b49bb6aec0f91f443f5823e82a327fab
2014-01-18 01:49:45 +01:00
Derk-Jan Hartman 2de765b86c JSHint: fix the last jslint/hint failures
Change-Id: I3695d0da964ee607d91510c490793aca1ace5d58
2014-01-11 12:11:57 +01:00
Derk-Jan Hartman 85fdb01d00 Enable ACE webworkers
Now that the RL path is set correctly we can enable the webworkers
This adds syntax checker and linting

Change-Id: Ie9177d4acae45f2aadb1dfd3e66049195056bca0
2014-01-11 08:39:31 +00:00
Derk-Jan Hartman a6e4d82b58 Remove extraneous border in CodeEditor
Change-Id: Iedfed3e8722cb8440797d692739322d7fdf05b43
2014-01-09 22:26:19 +01:00
Derk-Jan Hartman 62da94ce68 Remove trailing commas
Also submitted upstream as:
https://github.com/ajaxorg/ace/pull/1742

Change-Id: Ia71b4e35a7168ea4c437ae728de71e5b0fe03bbe
2014-01-09 18:01:43 +00:00
Derk-Jan Hartman 05e6be051c CodeEditor: Update to package 12.02.2013 (December 2013)
ACE defaults to a white background now. I have no preference in
this, but it is caused by a change in the TextMate theme. There is a
bugreport (Bug 55423) about the old blue background.

This fixes an annoying problem with Safari 7, where characters are no
longer properly measured by ACE.
https://github.com/ajaxorg/ace/issues/1534

Fixes double-click to select:
https://github.com/ajaxorg/ace/issues/956

Set proper basePath so that require works, allowing conditional loading
of ACE resources. Need for Find to work after this update

Bug: 55423
Bug: 45876
Bug: 58521
Change-Id: Ia64b67b4553f77c6ba3d2aefec4bab62d111deb7
2014-01-02 11:11:32 +01:00
Siebrand Mazeland daf1aee4e8 Combine var statements
Change-Id: If005690ab8ecf21e64399781acbecd1ec3b02172
2013-12-31 18:44:56 +01:00
Siebrand Mazeland 2d121364d3 Update formatting of JavaScript files
Change-Id: I7a18b7f76f7c0a064645f23974f1fe09dafc4ca2
2013-12-31 13:03:11 +01:00
Siebrand Mazeland 37e2ec1286 Fix some JSHint issues
Change-Id: I46ae3ce2f39b35af6d75a94b5132eea0e6672064
2013-12-31 12:58:35 +01:00
jenkins-bot 2ce7afebbd Merge "Explicit dir="ltr" for code" 2013-08-26 20:47:32 +00:00
Krenair 7a9b6a5168 Save real tabs and allow configuration by users via JS hook
Bug: 39616
Change-Id: I64c3b9b53f1265f5b9c19edb480040113fa85590
2013-08-25 18:45:16 +01:00
Amir E. Aharoni 54c5b35bc3 Explicit dir="ltr" for code
Change-Id: Ia7d6958a10481c39abb1406b67210cac998818e7
2013-08-24 11:19:30 +03:00
MatmaRex d841459c2e Adjust after changes in core
I6a6c12a9, Id27555c6.

Change-Id: I2e93cfffd7b31b090c93f7911e1e45f2a6619371
2013-05-17 22:04:51 +02:00
Brad Jorsch b802deafbf Make CodeEditor cooperate with the experimental live preview
LivePreview takes the text from the textarea and sends it to the server
via an Ajax call to handle preview and diff. But CodeEditor hides that
textarea, and only updates it when the form is submitted or the "disable
CodeEditor" button is used.

Fortunately, LivePreview already provides a custom JavaScript event to
indicate when it is about to pull the textarea contents. So all we have
to do is listen for that and update it.

Bug: 47235
Change-Id: Iba1b727c55aabcd31afc06cec99618fcdce207d8
2013-05-07 11:08:47 -04:00
Ori Livneh 8ee19004b3 Disable background linting using WebWorkers
Ace uses JavaScript Web Workers for linting code. Ace's attempt to load workers
in JS and JSON modes runs into the mismatch between its require()
implementation and ResourceLoader, resulting in a request for
/worker_<lang>.js, which 404s.

Change-Id: Ia60ef2122c015635ef0ad963a956b4f77cd6f7e8
2013-02-14 19:05:45 -08:00
Ori Livneh 4ae61874af (Bug 42561) Enable Ace's JSON mode
MZMcBride suggested CodeEditor should be deployed to Meta, citing the
need for a JSON-aware interface for editing articles in the new
Schema: namespace, which are JSON-encoded. The bundled distribution of
ACE supports JSON, but the extension does not include it as one of the
file formats it supports.

Change-Id: Ice63dece67c732b76c23abc617782332435427cf
2012-12-01 01:09:55 -08:00
Tim Starling 4fb277c607 Fix unbind call in disableCodeEditor
Presumably the unbind was meant to refer to the event which was bound in
setupCodeEditor(), not a nonexistent function. It appeared to work because
passing an undefined value as the second argument to unbind() causes all
event handlers to be unbound.

Change-Id: I51b8e7de5e95cb17b595a6b8022a6216048cdb41
2012-07-13 16:31:23 +10:00
Tim Starling 4bb8a4c984 Updated Ace
Updated Ace to the latest version of my fork on Github, i.e.
approximately 0.2.0 plus some improvements to the Lua indenting module.
I have submitted a pull request, so hopefully the next update will be
from upstream.

The suffixed file names (*-uncompressed, *-noconflict) have disappeared
from upstream, replaced by conditional compilation in separate build
directories. There's not much point in maintaining two unused copies of
the entire source tree, so I deleted them. To avoid migration issues, I
re-added symlinks in place of the suffixed files which were previously
referenced from MediaWiki.

Change-Id: Ic9d2450528769539dfea59bdde7620dbec903604
2012-07-09 02:13:50 +00:00
Tim Starling 84cdb4f4bf Remove automatic edit summary
Remove the "using CodeEditor" automatic edit summary. Maybe this makes
sense for a gadget, but it certainly doesn't make sense as an extension
enabled by default for all JS, CSS and Lua pages.

Change-Id: If3b29d3878f5b8b43727ae34e4b5e3a2f4137a6f
2012-07-03 13:19:56 +10:00
Tim Starling 8fe95e1469 Fixed a couple of minor issues in r115010:
* Scroll up a few lines so that the user can see the error context
* Defer processing of the fragment until the load event, otherwise the code editor is not fully initialised and does not properly respond to the navigateTo() call.
2012-04-23 11:40:43 +00:00
Tim Starling 7fc4552a8d Allow links to specific lines of code using a special fragment syntax 2012-04-23 04:09:47 +00:00
vvv 0ac1a47dbb * Update the list of the languages
* Make the language to be used determined on server side
* Allow extension to enable code editor for certain pages
2012-02-06 21:59:13 +00:00
vvv ea66677b66 * Update Ace
* Fix JS code in order to make Ace work with new updates
2012-02-06 20:59:17 +00:00
Sam Reed 2d686fcbb5 Swap
/*
 *

for

/**
 *
2011-10-26 03:49:06 +00:00
Brion Vibber bf67581924 CodeEditor ext: Add an experimental demo (off by default) mode to edit SyntaxHighlight_GeSHi sections inline using Ace editor
Not ready for prime-time. :) Doesn't actually save pages (just updates the live view), and seems to have problems when invoked multiple times.
Not all GeSHi languages are supported.

Colors of course are different.

Set $wgCodeEditorGeshiIntegration = true to enable; adds a 'section edit link' on source bits.
2011-08-04 22:33:59 +00:00
Brion Vibber 67cc93c468 CodeEditor ext: Update Ace editor to upstream 237c2243734b7968e39bf3c97fa5bb3b26a920c4
Fixes issues with control keys: https://github.com/ajaxorg/ace/issues/294
2011-08-02 14:37:03 +00:00
Brion Vibber 852e1ee551 Fix for CodeEditor's form submit handler; unbind the handler when we disable the editor, and rebind it when we enabled it. Prevents sometimes failing to copy in updates properly or failing during save because an obj is unavailable. 2011-06-17 20:56:34 +00:00
Brion Vibber e31035d86f CodeEditor: compat fix for use as gadget on MediaWiki 1.17
$.map doesn't handle objects in jQuery before 1.6, so roll our own helper internally
2011-06-16 23:24:32 +00:00
Brion Vibber c09fc16d54 Followup to r90240: clean up some stray code, check for an error condition 2011-06-16 23:04:26 +00:00
Brion Vibber c981d97061 CodeEditor: add an interface for gadget loader to override the local $wgExtensionAssetsPath for CodeEditor's usage (to load its icons) 2011-06-16 22:51:39 +00:00
Brion Vibber 81ba498314 CodeEditor ext: basic ability to toggle the syntax-highlighting editor on/off.
When off, we restore the regular textarea and its behavior.
State is saved as a cookie, like other WikiEditor settings.
2011-06-16 22:30:01 +00:00
Brion Vibber 9578a2322f CodeEditor: attempt at disabling some annoying keyboard shortcuts in Ace, but it's not working.
Issue filed upstream at https://github.com/ajaxorg/ace/issues/294 & asked about on mailing list.
2011-06-11 00:08:54 +00:00
Brion Vibber 5d42ce5f24 CodeEditor: fix to avoid selecting when inserting non-samples such as character insertions
Logging some stub func calls
2011-06-10 23:09:52 +00:00
Brion Vibber 3603c6acae CodeEditor: now integrates with WikiEditor's search-replace 2011-06-10 20:04:17 +00:00
Brion Vibber 2b4a12cadf CodeEditor: fix for encapsulateSelection; now handles replacements & selection for standard cases (bold/italic/link insertion, quote pairs, etc) 2011-06-10 19:32:53 +00:00
Brion Vibber 18af202a72 Partway through integrating CodeEditor more closely with WikiEditor. Special character insertions now work! Bold, link etc will insert their sample text, which is less useful but hey. 2011-06-10 01:11:18 +00:00
Brion Vibber e3f5ab3f2e Update CodeEditor extension to load Ace editor via RL instead of manually 2011-06-09 22:17:00 +00:00
Brion Vibber ec233e4297 Add stub extension version of CodeEditor embedding Ace (ace.ajax.org) for editing JS and CSS pages.
Simply using the existing gadget version modified to load Ace from the extension directory for now, will integrate better into WikiEditor and use ResourceLoader to load Ace itself in upcoming commits.
2011-06-09 21:50:45 +00:00