Commit graph

10987 commits

Author SHA1 Message Date
Alex Monk 76a12f2f9b Try to actually resolve visualeditor-editor preference setting when switching editors
Seems we need to make sure this returns before navigating to the target page.
This reverts commit 40807a0743.

Bug: T121122
Change-Id: I4edf03bc0d57b03897d9f1802eabd8f0dd9962b9
2015-12-15 17:35:22 +00:00
jenkins-bot b08c8bd682 Merge "Fix up "Simplify some SET logic"" 2015-12-15 02:56:45 +00:00
Alex Monk 39af893c75 Fix up "Simplify some SET logic"
By 'simplifying', I broke stuff.

This reverts commit b7227f96fe.

Change-Id: I46fdcf336f556680fa72df0893447b6850cc4b1d
2015-12-15 02:50:15 +00:00
jenkins-bot d3d851f394 Merge "Simplify some SET logic" 2015-12-14 21:17:15 +00:00
Alex Monk b7227f96fe Simplify some SET logic
Change-Id: Ie89260607f0253dd7d749af7426702985a0340f4
2015-12-14 21:11:15 +00:00
Translation updater bot 0200bbf328 Localisation updates from https://translatewiki.net.
Change-Id: I43deefad46e60797eda66e10c37eed67a61c141b
2015-12-14 22:06:23 +01:00
jenkins-bot 33cbf199f1 Merge "Revert "DesktopArticleTarget: Don't abort in SET mode if veswitched is set"" 2015-12-14 20:53:28 +00:00
Jforrester 40807a0743 Revert "DesktopArticleTarget: Don't abort in SET mode if veswitched is set"
This reverts commit 5b083a7272.

Change-Id: Ieac905b80ea219075b4de498d645f22c3e86c5ca
2015-12-14 20:46:08 +00:00
Bartosz Dziewoński ca81362afd ve.ui.MWMediaDialog: Make the dialog higher (600px)
Avoids a scrollbar for option 4 of the A/B test from T120867.

Change-Id: I3eacb560117219febd6e08066599e2d4d42df219
2015-12-14 20:53:32 +01:00
James D. Forrester 8d35988c31 Update VE core submodule to master (c9ab407)
New changes:
a51febb build: Upgrade various devDependencies to latest
4e5b524 Localisation updates from https://translatewiki.net.
f43cab6 ve.ce.Selection: Fix docs and variable names
f99a93d ve.ce.Selection: Introduce isFocusedNode && isNativeCursor methods
102f667 ve.ce.Surface: Remove selection type awareness from #focus
f9b586b ve.ce.Surface: Remove selection-type awareness from fake selection rendering
7f57d55 ve.ce.Surface: Remove some selection-type awareness from handleInsertion
75a9116 ve.ce.Surface: Remove selection-type awareness from showModelSelection
00e500b ve.ce.Surface: Remove selection-type awareness from fixShiftClickSelect
428e4a6 ve.ce.Surface: Remove selection-type awareness from checkSequences
154779c ve.ce.Selection: Freeze focusedNode when selection is created
849d758 Fragment delete: handle a document with no valid content offsets

Change-Id: I562f76bff0ab8e135d4cf8cb133374f1b5288e9c
2015-12-14 09:59:03 -08:00
jenkins-bot d750417545 Merge "Take pageCanLoadVE into account when figuring out whether VE will load in-page or not" 2015-12-14 17:14:41 +00:00
jenkins-bot 04d8089db6 Merge "Fix setEditorPreference call" 2015-12-14 17:08:42 +00:00
Alex Monk 774034b553 Take pageCanLoadVE into account when figuring out whether VE will load in-page or not
Bug: T121342
Change-Id: I84ade6e2ab062597fbfd859a90a864c7607547da
2015-12-14 16:58:26 +00:00
Alex Monk a3148a1559 Fix setEditorPreference call
Added brokenly in I82e39752

Bug: T121343
Change-Id: Ie7b228e94458b17d6ec7c23be264144dec9563be
2015-12-14 16:49:28 +00:00
jenkins-bot 51d493918b Merge "DesktopArticleTarget: Don't abort in SET mode if veswitched is set" 2015-12-14 16:46:02 +00:00
jenkins-bot 648457ca4c Merge "Switch numbered link context to "delete" instead of "clear"" 2015-12-14 01:19:22 +00:00
Translation updater bot a6bab3aeff Localisation updates from https://translatewiki.net.
Change-Id: I9b6d4fa66a9a18160d5143de1ed1c6e783bd0ed3
2015-12-13 22:24:39 +01:00
jenkins-bot 3763219377 Merge "Remove no longer needed ContentHandlerDefaultModelFor hook" 2015-12-12 21:52:55 +00:00
Kunal Mehta 7f02824ec4 Remove no longer needed ContentHandlerDefaultModelFor hook
As of 3b44da3261673 in MediaWiki core, all MediaWiki:*.json pages are
given the JSON content model, so our hook that does the same is no
longer needed.

Change-Id: I8b39edf36b479ca22d74481c3d571d15db69aa1e
2015-12-12 13:34:11 -08:00
James D. Forrester 5b083a7272 DesktopArticleTarget: Don't abort in SET mode if veswitched is set
Bug: T121122
Change-Id: I6dca85361be0c1c1c0d39b12b167af813706ae0b
2015-12-11 18:15:25 -08:00
James D. Forrester 2368171fb7 DesktopArticleTarget: Consolidate editor preference setting code
Change-Id: I82e3975233eee0473b513d0931a2d6770fc0f86d
2015-12-11 17:12:28 -08:00
jenkins-bot 580605c418 Merge "Try to clean up the WT->VE prompt opened -> closing -> closed data callbacks" 2015-12-12 00:31:34 +00:00
jenkins-bot 94ac79bc87 Merge "Remember switching into VE from WT when discarding changes" 2015-12-12 00:28:51 +00:00
Alex Monk 0774bdf924 Try to clean up the WT->VE prompt opened -> closing -> closed data callbacks
To use
	.then( function ( opened ) { return opened; } )
	.then( function ( closing ) { return closing; } )
	.then( function ( data ) {
etc. instead of nesting them in .done functions

Change-Id: Ic8cee9639b90cb378ce0b7e58dc04eab0ff4cbc7
2015-12-11 23:43:13 +00:00
jenkins-bot 8e4f888274 Merge "Check that we really want VE before loading it for section edits" 2015-12-11 23:40:10 +00:00
Alex Monk 155d0240a4 Remember switching into VE from WT when discarding changes
Bug: T120966
Change-Id: I9a7b87cb2561416b72f53afa5140e9d2a4330cfe
2015-12-11 23:35:59 +00:00
jenkins-bot c98e6d1390 Merge "build: Update various devDependencies to latest" 2015-12-11 23:25:21 +00:00
Alex Monk 9e5a01aa6b Check that we really want VE before loading it for section edits
Bug: T121189
Change-Id: I34371bf78d34e9d362e9cf5c64bdd108478969b9
2015-12-11 23:19:07 +00:00
Translation updater bot e71f1d67d6 Localisation updates from https://translatewiki.net.
Change-Id: Ife97e1435802802dfeb7754fcea6874433bc6b0d
2015-12-11 23:56:38 +01:00
James D. Forrester 90045db7a3 build: Update various devDependencies to latest
* grunt-contrib-copy     : 0.8.0 -> 0.8.2
* grunt-jsonlint         : 1.0.4 -> 1.0.6
* grunt-jscs             : 2.1.0 -> 2.5.0

Change-Id: Ia66996d4ccf48bb8baab792fda5cd67863b31575
2015-12-11 12:59:17 -08:00
jenkins-bot e24e2ed7cf Merge "[BREAKING CHANGE] Create ve.init.mw.Target base class" 2015-12-11 18:16:22 +00:00
jenkins-bot 2e6719c0d7 Merge "Use upstreamed actionGroups functionality" 2015-12-11 18:09:50 +00:00
Ed Sanders aa2e0af348 Update VE core submodule to master (19e50b7)
New changes:
e536779 [DEPRECATING CHANGE] Rename link inspector tools
3899967 Localisation updates from https://translatewiki.net.
0a1c09e [BREAKING CHANGE] ve.init.Target: Upstream the action toolbar from sa/mw desktop targets

Local changes:
* Refactor tools for the breaking change

Change-Id: I676af9c50b09ef007926240eb2327d1a0fdd80f5
2015-12-11 10:03:02 -08:00
Ed Sanders fbb05fb8ed Use upstreamed actionGroups functionality
Depends on I272175dff3 in ve core.

Change-Id: I94cef0f3d8c1b903780890934c2c4963cbe05989
2015-12-11 16:43:48 +00:00
Ed Sanders 21d5856000 [BREAKING CHANGE] Create ve.init.mw.Target base class
Move over logic which isn't specific to the article
implementation of VE (e.g. nothing related to loading/saving).

Refactors setupSurface to use an abstract tracking method (which
does nothing by default), and moves surface CSS classes to #createSurface.

Breaking change:
* Rename onSurfaceReady to surfaceReady. We shouldn't need to listen
  to our own events.
* Rename onReady to documentReady. onReady is not a listener.

Bug: T97166
Change-Id: I7242b1bb5501b7755a18a13d13e166c30cac9cdd
2015-12-11 16:41:47 +00:00
Ed Sanders 672c91f41b DesktopArticleTarget: Fix signature of editNotices
Also ensure it is always an array.

Change-Id: I8498463d3131817b90fa91404289c839110bdeaa
2015-12-11 16:41:47 +00:00
Alex Monk 98a456b189 Single edit tab: Fall back to the wikitext editor when certain parameters show up
We can't handle these yet. There's also 'preview' but I think we probably
qualify as supporting that.

Bug: T121126
Change-Id: I4602992a77f460b9bfcbad0eac1bdd79d67df04d
2015-12-10 23:13:25 +00:00
jenkins-bot 69778a65e5 Merge "Let the feedback tool be configured for a remote wiki" 2015-12-10 22:04:23 +00:00
Translation updater bot 46b901e640 Merge "Localisation updates from https://translatewiki.net." 2015-12-10 22:02:32 +00:00
Translation updater bot 536ff00e5a Localisation updates from https://translatewiki.net.
Change-Id: Ide641aaf9ffec8558271116f9a3a29c1307ed588
2015-12-10 23:01:35 +01:00
jenkins-bot 3db4f22ecf Merge "MWSaveDialog: De-flag the 'return to save' button on diffs" 2015-12-10 21:51:01 +00:00
James D. Forrester 356b6e153f Update VE core submodule to master (601ba8c)
New changes:
234da0b Annotation: Rename 'inferFromDom' to 'inferFromView'
8c1ed4c Fix more typos
c515123 Fix typos
36a7d1f Count chunk list bounds more carefully

Change-Id: Ibc1b385e0c6d8fafdcd5ab4ff6e613c6d491e2a7
2015-12-10 12:42:02 -08:00
James D. Forrester 705199753c Let the feedback tool be configured for a remote wiki
Bug: T92661
Change-Id: Id48729c89db208714f67fec1eabafe577a834b51
2015-12-10 12:12:59 -08:00
Ed Sanders 29f33a57d5 Rename mw.Target to mw.ArticleTarget
This makes way for a base mw.Target class which is
not specific to articles (e.g. Flow boards).

Bug: T97166
Change-Id: If72650bdf87aa9f195b004da0a4d815f1a8063a3
2015-12-10 16:26:20 +00:00
jenkins-bot 0d9643e9e2 Merge "Single edit tab: Update preference value" 2015-12-10 01:33:25 +00:00
Alex Monk 128901866a Don't check editor preferences etc. if user wants veaction=edit
Bug: T120978
Change-Id: I39e28c80440260959b7f1c25b82a057c21de43be
2015-12-09 23:04:02 +00:00
Alex Monk bca222912c Hide VE tabs preference when user has disabled VE
Bug: T120965
Change-Id: I846124f762d811be4fbfb32c08063fc57a029cb4
2015-12-09 22:54:28 +00:00
Alex Monk e8a682f567 Single edit tab: Update preference value
It's all Timo's fault for suggesting the new values in I65d96627 PS21, obviously.

Bug: T120969
Change-Id: Ib0309342a831ec1950c1be8c7a0c79a31c413163
2015-12-09 22:51:16 +00:00
jenkins-bot 212300af1f Merge "Avoid useless jQuery.click shortcut" 2015-12-09 22:18:12 +00:00
Translation updater bot d08da2d62f Localisation updates from https://translatewiki.net.
Change-Id: Ibbc339a27888a391c6c40ced26c154cabb29acf7
2015-12-09 21:43:17 +01:00