Commit graph

84 commits

Author SHA1 Message Date
Derk-Jan Hartman 838c627728 Make sure that wikieditor context is ready
This fixes a bug where the event could be triggered before the
WikiEditor context was ready. Also make sure that the fragment monitor
takes into account the possible disabled state of the CodeEditor.

Bug: T103802
Change-Id: Id5564c4a91a0a14632024781f3e57b68c4803970
2015-08-27 21:22:09 +02:00
Fomafix c09b7f5b78 Define variable event
* Declare event as first function parameter.
* Move event.preventDefault() to the synchronous end of the function.

Change-Id: I813355088cbf215264dcccd474e97630915d63c5
2015-08-14 15:12:04 +00:00
Fomafix db1692c38c Remove quotes around object properties keys
Change-Id: Ie2126869364dcf56beb1190c80b6d8c36b282dce
2015-06-27 20:22:54 +00:00
Matthew Flaschen a7f5ae257c ucFirst has been deprecated, so inline it
Also, it wasn't declaring the dependency, so this fixes that as well.

Bug: T103612
Change-Id: Ic37fe3fec02ee4b328bd88ef46107431758216da
2015-06-23 23:40:51 -04:00
Fomafix 887bae8ac9 Remove explicit setting of the width of the textarea
The setting of the width is not necessary and sometimes it generates
a width which is to wide.

Bug: T102736
Change-Id: I7ed715fba4d65e7a571421b7a06d604e6b0958f7
2015-06-17 04:23:56 +00:00
Derk-Jan Hartman aba51ef4f5 Additional CodeEditor buttons
- toggle invisible characters.
- search and replace (disabled)
- indent/outdent
- line wrapping
- go to line

Icons by Connor Shea

Bug: T61923
Change-Id: I9e434d1b23f8254bc654ebbd31b5e4b70bbf5fe1
2015-05-26 01:43:47 +00:00
Derk-Jan Hartman a9cdbcacb4 Add tooltip to annotation indicator
In the past I had made the annotation indicators clickable, and your
cursor will in this case navigate to the next annotation in editor.
This was not really easily discoverable, so I have added a tooltip to
make it slightly more discoverable.

I also added a CSS line to prevent users from accidently selecting the
text (or rather numbers) in this area, which I had noticed happened to
me at times when trying to click it.

Change-Id: I47ecba232ff925169d0f64d85ae34ff6564cc1a5
2015-05-25 11:07:41 +02:00
Derk-Jan Hartman 76b4899835 Only block for errors when saving
Bug: T70765
Change-Id: I947f7f5bda4272677dd8d090e155b1010a66795d
2015-03-29 16:22:42 +02:00
jenkins-bot 442e3a0338 Merge "Remove trigger 'LivePreviewPrepare'" 2015-02-05 12:17:30 +00:00
Fomafix d3be0b552b Fix whitespaces
Change-Id: Ia26f885ac2423d9f4a67b9e4d58a90aba22d0f07
2015-02-05 12:13:18 +00:00
Derk-Jan Hartman 7254cda535 Ace: Update to 2015-01-28
Updated to
6b88b939c2

Includes fixes for drag delay (bug 60432)
and chrome useragent detection: Github issue
https://github.com/ajaxorg/ace/issues/1950

Bug: T62432
Change-Id: I5ac67a812f09ac43e73475613afc9a3f1ddc9a75
2015-01-28 11:04:27 -08:00
Fomafix f64a164986 Remove trigger 'LivePreviewPrepare'
Depends on I30bd709d8 in mediawiki-core.
The '#wpTextbox1' gets read by textSelection( 'getContents' ).
The trigger is not necessary anymore.

Change-Id: Iae54a2422ff1814f8858723d51fcb10d04645c51
2015-01-03 15:35:06 +00:00
Derk-Jan Hartman 2d4810f186 Add setContents to textSelection impl of CodeEditor
Change-Id: I0a5434b9d40d8945b6b801e2aa2b4b23466ea71c
2014-11-29 20:10:44 +01:00
jenkins-bot 8d45645cdc Merge "Disable CodeEditor on mobile" 2014-10-31 17:28:35 +00:00
Derk-Jan Hartman c91e62b74f Improve the CodeEditor toolbar
There isn't much in it yet, but it's a start.
Also needs a patch in WikiEditor, which is forcing some elements to be
visible for no apparent reason.

Change-Id: I6b57e5c11066a104a89bef3b7c8efd2129a80a8f
2014-10-26 18:09:26 +00:00
Derk-Jan Hartman 37228b2578 Split jquery.textSelection and WikiEditor api overrides
Split context.evt up into 2 objects
- context.fn, where WikiEditor API functions are defined
- textSelectionFn, where all textSelection API function are defined.

- scrollToTop() is moved to the WikiEditor API block
- getElementAtCursor() is removed. It is no longer in use by the
WikiEditor API or the textSelection API.

This depends on MediaWiki core change I14492572

Bug: 29328
Change-Id: I57bc7791dc61b7edcf258e6c16445d5a4a8783cf
2014-10-16 21:18:15 +02:00
Timo Tijhof 72f3c78381 Use returnFalse instead of jQuery.noop
Follows-up 86622b6.

While these functions looked like placeholders in a configuration
object to allow calling them unconditionally, they actually had
meaning. They were event overrides to prevent WikiEditor from
running its own event handlers.

They were implicitly returning false by having no return statement
(implying a 'return undefined', which casts to false).

The separate functions were already quite obfuscated as returning
false, using $.noop made it even harder to understand what's
going on.

Use an explicit return value instead.

Change-Id: I0852fbc9225d069f50085787d2d0105fd7b1743c
2014-10-16 20:37:18 +02:00
Fomafix 86622b63fb Use jQuery.noop
This avoids the definition of several empty functions.

Change-Id: Ic6fe5c46e1ed90217c1935dd0a87c6b97a0ad513
2014-10-16 19:25:17 +02:00
jenkins-bot aefe1def47 Merge "Use mediawiki.api.parse" 2014-10-16 17:16:42 +00:00
jenkins-bot 18423323d2 Merge "Apply coding conventions for JavaScript" 2014-10-16 17:16:41 +00:00
Fomafix d3e3a9796e Use mediawiki.api.parse
Change-Id: I9106245c6c0ee98093155c8b9a8f92b270bde063
2014-10-10 13:31:02 +00:00
Fomafix 3b30aaf78a Apply coding conventions for JavaScript
* Fix closure invocation
* Avoid global variablesin closure
* Avoid unused variable
* Fix whitespaces

Change-Id: I67552a67e8ab493e5af8717c11668430886ee468
2014-10-10 13:24:22 +00:00
Fomafix 9e2d2c842a Apply coding convections for JavaScript
* Reorder functions to avoid forward references
* Remove unused variables saved and summary
* Fix whitespaces
* Avoid else after return
* Combine var blocks

Change-Id: I2a66645c24b9cce287c4196f2c4a762420ad80a0
2014-10-10 11:58:58 +00:00
Derk-Jan Hartman 7bfd574cbe CodeEditor: Keep experimental Geshi editor working
Still experimental, not really functional, but this fixes it to at
least run again.

Change-Id: Ia71aa9421179654a063c706e0cbf3016a2fcc280
2014-08-28 19:41:19 +00:00
Derk-Jan Hartman 4aa22a1df1 Undefined function mw.log.error
Bug: 68557
Change-Id: Ib9e8b291711f3d582ab70cab25ace6f61500f5af
2014-08-14 22:18:02 +02:00
Derk-Jan Hartman 853282fa34 Disable CodeEditor on mobile
Disabled on our known android/iphone/ipod UAs, because of Bug 55345.

Change-Id: I8c5377889c349df14d43803fecaab09d7554e97a
2014-07-14 12:18:35 +02:00
Derk-Jan Hartman c949981553 Allow on the fly loading of language modes
Change-Id: Ie04138677dead4c23b1bcfef4e1f7a2cd6e8826e
2014-07-10 16:47:42 +02:00
Derk-Jan Hartman 96f421386f Clear the statusbar if no annotations are left
Bug: 64758
Change-Id: Id2a26742420d03242265e537dc5404707c4bf714
2014-05-09 09:17:59 +00:00
Derk-Jan Hartman 1373c915df CodeEditor: Add basic code completion and snippet support
Bug: 48828
Change-Id: If7d165fc849ca9687dd7d511b0d111b9969fb2a7
2014-05-06 22:55:16 +02:00
jenkins-bot 26973c1fa9 Merge "Persistent disabling of CodeEditor" 2014-05-06 17:39:33 +00:00
Derk-Jan Hartman 0c172d6359 Persistent disabling of CodeEditor
This makes it so that if you do not have WikiEditor enabled, you also
will not have CodeEditor enabled. In the feedback we have seen so far,
this seems to be desirable for those users (bug 55936).

Also people were not able with the cookie pref for the editor, because
it can easily expire. This introduces a hidden pref, controlled by the
enable/disable CodeEditor button, to preserve this value instead (bug
46779).

It also gives a more reliable way to detect if the editor is enabled or
disabled. mw.user.options.get( 'usebetatoolbar' ) and
mw.user.options.get( 'usecodeeditor' ) combined should be able to convey
this information to something like WikEd (bug 62250).

Bug: 46779
Bug: 62250
Bug: 55936
Change-Id: I4639f68c00a2b9183a6f89b5e00983c07a8592a2
2014-05-01 10:33:26 +02:00
Derk-Jan Hartman 96afba23d6 IE8: Fix line endings in CodeEditor
IE8 uses innerText, which is a bit more sloppy with line ending
preservation than other browsers are. Instead of copying the value into
the DOM and have the Editor pick it up during init, just set it directly
on the EditSession. Should even be faster.

Bug: 64559
Change-Id: Iafbb07afb6d06ed94057f8ddf8b080fd136d7fb3
2014-04-30 14:26:53 +02:00
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