Commit graph

7675 commits

Author SHA1 Message Date
jenkins-bot c8358205bd Merge "Adjust default alignment when switching from inline to block" 2014-06-04 22:37:06 +00:00
jenkins-bot 55952a32b3 Merge "Use subpage only for media search string" 2014-06-04 22:10:29 +00:00
jenkins-bot d69960aa1a Merge "Check last existing category for whether or not we're trying to re-add it" 2014-06-04 22:10:21 +00:00
Cmcmahon 336c1b8690 [BrowserTest] new test for page options
First pass at an Options test.

Checked in Firefox and Chrome

Change-Id: Ic5e6ec84d291c1642b8e4673c1a33517529e314b
2014-06-04 13:07:45 -07:00
Translation updater bot 957f2f3956 Localisation updates from https://translatewiki.net.
Change-Id: I3b91b9a33993ac91c6d97eaef5c249ac0dc69c78
2014-06-04 19:54:45 +00:00
Krenair 72f3c7808b Check last existing category for whether or not we're trying to re-add it
We were checking all the ones before it, just not the last.

Bug: 66105
Change-Id: Ic22233181a92860c288aa4e3176c469eba58ed43
2014-06-04 20:04:26 +01:00
jenkins-bot a6014563bc Merge "Small SVG images should still adhere to default thumb size" 2014-06-04 17:43:16 +00:00
jenkins-bot d8b44845e5 Merge "Gallery editor: Fix 'inpsector' typo to 'inspector'" 2014-06-04 17:07:47 +00:00
jenkins-bot 70fc15d6b3 Merge "Bump the MW required version to 1.24wmf6" 2014-06-04 04:03:01 +00:00
Timo Tijhof 0c60733ec5 Grunt: Clean up
* Use jshintrc:true which lets grunt defer autodiscovery of the file
  to jshint instead of forcing it to '.jshintrc'. This allows us to
  override certain settings from a subdirectory, to match behaviour
  of standalone jshint.

* Sort modules.

* Use plain string instead of single-value array.

Change-Id: Ib5cd48f3ff0367b8fc84627c29e4fb32452087c0
2014-06-04 05:07:12 +02:00
Moriel Schottlender cb35312c0b Use subpage only for media search string
In namespaces that allow for subpages, use the subpage part of the
page title for the initial search string in the MediaInsertDialog
search widget.

Bug: 51290
Change-Id: I31db88b484eee2206719dc337fbd7c70aef93b3a
2014-06-03 16:54:46 -04:00
James D. Forrester a3d51c0382 Bump the MW required version to 1.24wmf6
As of I87e93777 VisualEditor-MediaWiki now use the new MediaWiki core RL
module of mediawiki.skinning.content.parsoid, introduced in 1.24wmf6,
which has bumped our dependency to an alpha of 1.24.

Change-Id: I33db154980ec207edab75751d60cb4764144f32b
2014-06-03 13:46:12 -07:00
James D. Forrester 7f5acf6abe Gallery editor: Fix 'inpsector' typo to 'inspector'
Change-Id: Ia10987fb35549e721fa0242164f99a872512e569
2014-06-03 13:24:33 -07:00
Translation updater bot 0ef20f99f8 Localisation updates from https://translatewiki.net.
Change-Id: I94f658418782a3c33a8de3301f1c90813ceee969
2014-06-03 19:52:57 +00:00
Moriel Schottlender 6e096fcaef Small SVG images should still adhere to default thumb size
Make sure that SVG drawings have default size of the wiki default
even if their optimal defined size is smaller.

Bug: 62893
Change-Id: I682d832e456a501836f33ed1dfc7dbd78a4edf53
2014-06-03 13:47:18 -04:00
Moriel Schottlender 74a20b8ec9 Adjust default alignment when switching from inline to block
Once more with feeling; default alignment when switching between
inline to block and vise versa. This time, the problem was mainly
that the checkbox for position cannot be updated without triggering
its update event. It was triggered, however, before setting up the
positioning, which caused the model to run positioning twice and
get things wrong.

Another smaller fix in this commit was done to make sure that
the image model remembers the previous alignment, so when image
type changes from inline to block and vise versa, and the alignment
was default, it can recalculate default value for the new node.

Bug: 65564
Change-Id: I6c16a7855ad7e3ce302fa3d042d0a402251b31f0
2014-06-03 00:20:57 -04:00
Krenair 390d8ca793 Fix reference dialog apply button disabling when modifying existing reference
Existing references keep internal records of current saved data, which breaks
the current length check. Instead, use the new function to count all
*non-internal* elements

Relies on I8ecbf387
Related to bug 52182

Change-Id: I4b9bb866babe018d75dc083fab35375b9fb53d3c
2014-06-02 17:12:12 -07:00
Roan Kattouw 14c8dc8295 Update VE core submodule to master (26a1027)
New changes:
ed97f51 Localisation updates from https://translatewiki.net.
9382cb7 Localisation updates from https://translatewiki.net.
f3c057b Update OOjs UI to v0.1.0-pre (527ad0ee5a)
db83b1d Localisation updates from https://translatewiki.net.
cf8463e Add a function to ElementLinearData to count all elements that aren't in internalList

Change-Id: I1e07568b1c094d96d4ec8ab1af50b242f77346d6
2014-06-02 17:11:47 -07:00
jenkins-bot 1baf2f08e7 Merge "Remove link node inspector from insert menu" 2014-06-02 21:07:33 +00:00
Roan Kattouw 172ebb839e Remove link node inspector from insert menu
This inspector isn't designed for insertion mode yet; attempting to use
it in insertion mode causes nasty JS errors.

Bonus:
* Make its tool title "Simple link" rather than "Link", for when
  we do reintroduce it.
* Make double-clicking / pressing enter while selecting a link node
  open the link node inspector rather than the link annotation inspector.
* Make link nodes render with MW's external link arrow icon
* Move the link node inspector's messages to the right RL module

Bug: 66047
Change-Id: Ib94da7ed3a2a88297dbdd1529f20cd8dab7c8421
2014-06-02 21:05:07 +00:00
Translation updater bot 8eecdefe1f Localisation updates from https://translatewiki.net.
Change-Id: Ic7cc5b6cd68aa041ccbde62f5d19239f195c8bb9
2014-06-02 21:00:43 +00:00
jenkins-bot 05b377193b Merge "On category pages, only replace category description when saving" 2014-06-02 19:22:40 +00:00
jrobson fef33d30ec Add use existing reference to toolbar on mobile
Note currently a blank icon appears to the left of this.
This will need to be removed later.

Change-Id: Ia8be1f0e83a2154a48de3c3a47bd8feb0c9a2a2c
2014-06-02 12:12:32 -07:00
jenkins-bot 98f403f237 Merge "Use <visualeditor-toolbar-cite-label> correctly in the Media and Reference toolbars" 2014-06-02 17:38:36 +00:00
Trevor Parscal f58861b6c3 Cleanup save dialog counter label
This label is not needed, never visible, not internationalized and doesn't make sense.

KILL IT WITH FIRE!

Change-Id: Ia0b3eda5971598714644b9d0c4fec1fd44b6c440
2014-06-02 09:57:24 -07:00
Amir E. Aharoni c27d62d19f Use <visualeditor-toolbar-cite-label> correctly in the Media and Reference toolbars
Bug: 66039
Change-Id: Ie9cba04a0f117e1d5fb25a93f81df423787a9d79
2014-06-02 09:49:48 -07:00
Cmcmahon 1b6f55e0d7 [BrowserTest] Link UI text changed
Change-Id: I03c53f0f2bab321a48aae186580de1900926ab92
2014-06-02 07:03:48 -07:00
Translation updater bot c2024f2b9f Localisation updates from https://translatewiki.net.
Change-Id: Ic10bf19de14f3a5b6127859e6a57263450fe9b6c
2014-06-01 19:42:20 +00:00
Translation updater bot f20e97abfa Localisation updates from https://translatewiki.net.
Change-Id: Idb33e1311c945429b0bd7a844720b5885f8791db
2014-05-31 19:02:45 +00:00
Krenair e59b1e7f60 Use promises for confirmation dialog instead of done event
Should be merged at the same time as I70af4f4f
Unbreaks the confirm dialogs (I5f971852)

Change-Id: I7e7a5fcef4e749a3196f675e9f1f8e8bc5c11ca0
2014-05-31 16:25:27 +01:00
Trevor Parscal f65c3c6ef1 [BREAKING CHANGE] Update VE core submodule to master (88fe25f)
Switch to processes for windows (dialogs/inspectors)

This conversion also required the splitting of MWLinkInspector into
MWLinkNodeInspector and MWLinkAnnotationInspector.

New changes:
88fe25f [BREAKING CHANGE] Update OOjs UI to v0.1.0-pre (dd888aba5c)

Change-Id: I662d8985463c9fc881775f70aef87ebeb454a73f
2014-05-30 22:03:45 -07:00
jenkins-bot 4719978a47 Merge "Update VE core submodule to master (418cd67)" 2014-05-31 01:05:52 +00:00
Roan Kattouw d7ca1604d6 Clean up interaction with confirmation dialog
It now only sends a single 'done' event, which we can use .once on

Relies on I4f485d4f in OOjs UI.

New changes:
418cd67 Update OOjs UI to v0.1.0-pre (0f101c6f5d)

Bug: 65571
Change-Id: I19aa65612bf02bed056de292f212d2f5732a8fec
2014-05-30 16:39:07 -07:00
Roan Kattouw e3249a4afa Update VE core submodule to master (418cd67)
New changes:
418cd67 Update OOjs UI to v0.1.0-pre (0f101c6f5d)

Change-Id: I9488f688483af4003a89b10876f1356691d2a1dc
2014-05-30 16:35:59 -07:00
Roan Kattouw 350c99e249 Update VE core submodule to master (0f178b5)
New changes:
636d84e Optionally allow undo while staging
8d75e08 Don't fix selection on document focus if focusedNode is set
42c35dd Fallback options for receiving bad information into Scalable object
3a07dd0 Remove last jQuery.browser uses with temporary ve.isMsie hack
f265c86 Localisation updates from https://translatewiki.net.
6a8c609 Localisation updates from https://translatewiki.net.
0343976 Update OOjs UI to v0.1.0-pre (469d40c88f)
0b684c5 ActionDialog: Allow errors to be jQuery objects

Change-Id: I5ac0b828ed4b7c492cd770b1e980d02e60128740
2014-05-30 16:08:03 -07:00
jenkins-bot 21ab1a9b7e Merge ""Use an existing reference" in the reference dialog should be disabled when there is content" 2014-05-30 22:26:33 +00:00
Ed Sanders 2122ccb654 Cleanup createSurface methods
No need to set in mw.Target as it now exists in core Target.

Add config param to MobileViewTarget override.

Depends on I555935d2 in core.

Change-Id: I72be9098bd9d59272ca3d7a9a64dca4271ef3ee5
2014-05-30 20:36:26 +00:00
Alex Monk 96bcc2dc55 "Use an existing reference" in the reference dialog should be disabled when there is content
Bug: 65689
Change-Id: I55f7af71957634f5c19996be02a51af0288e9e2f
2014-05-30 21:04:51 +01:00
Translation updater bot 5e5eb07969 Localisation updates from https://translatewiki.net.
Change-Id: Ife01323a102264c7d496b3cc73c76dae1a9e29a3
2014-05-30 18:51:07 +00:00
Alex Monk d43db7f12f Trim description when working out whether or not we should disable the info button
So we don't display just a blank box for a single space.

Bug: 65862
Change-Id: Ie0ab305b8ee3cfe86e8f17adaab45c57b4ec49b7
2014-05-30 18:25:58 +00:00
Alex Monk b10d30084b On category pages, only replace category description when saving
Instead of overwriting everything else on the page (e.g. 'Pages in category ...')

See also bug 65349 / Ib6c49286 for file pages with a similar issue

Bug: 64239
Change-Id: I59ff9de5d0463f0f1ae8a18d54ebea5844fb1af5
2014-05-30 14:07:37 +01:00
Translation updater bot 50d3af5508 Localisation updates from https://translatewiki.net.
Change-Id: If46f03458426a394cc40e6ad0fb9088442db32d5
2014-05-29 19:39:35 +00:00
jenkins-bot a2d7668a01 Merge "[BrowserTest] updates for new bullets/indent UI" 2014-05-29 17:38:11 +00:00
Cmcmahon 26a5d50b6e [BrowserTest] updates for new bullets/indent UI
DONE: bullets test passes in Firefox and Chrome
DONE: indent/outdent test passes in Firefox and Chrome

TODO: instead of sleep do wait_until for the iframe

Change-Id: Ibcda64dc2457648abf3d5c6bc226b5cc628c0c45
2014-05-29 10:30:14 -07:00
Alex Monk 837eea324e Fix beta warning appearing for some users that it shouldn't.
Check that the user is anonymous before looking at their cookie to decide whether
to show beta warning dialog.
With the existing code, we would see that the preference is false and then check
that they have no cookie. But being logged in should make the cookie existence
be disregarded.

Fixes Ica9e5a92

Bug: 65821
Change-Id: I84e31323930c404222388bb74e4b4ca8d303e05c
2014-05-29 17:54:51 +01:00
James D. Forrester d2896e111d Update VE core submodule to master (610021b)
New changes:
610021b Update OOjs UI to v0.1.0-pre (09b223d279)

Change-Id: I93bafa996b6fd8da1b140833a869074a6402f572
2014-05-29 08:44:43 -07:00
jenkins-bot 9e522c638b Merge "Make images look better, account for e82629895b38 in MW core" 2014-05-29 01:40:33 +00:00
Roan Kattouw 9e9a671fc1 Make images look better, account for e82629895b38 in MW core
Prevent images from getting double borders due to slugs,
and prevent extraneous margins from piling up in captions.

Also add the ve-ce-mwBlockImageNode class which shockingly
wasn't being set (only ve-ce-mwBlockImageNode-TYPE was set).

Change-Id: I86b95aa0c0def92a9790b7cdb4b05837fb8f65e2
2014-05-28 18:35:07 -07:00
jenkins-bot 21b4249360 Merge "Switch action=opensearch call to list=prefixsearch where appropriate" 2014-05-29 00:38:20 +00:00
jenkins-bot de0091fec5 Merge "Allow extensions to add extra meta item checkboxes to the page settings dialog" 2014-05-29 00:33:19 +00:00