Commit graph

7547 commits

Author SHA1 Message Date
jenkins-bot 5d27d1d90c Merge "Update eg-iframe.html" 2014-05-24 03:34:28 +00:00
jenkins-bot afa3264e0b Merge "Fix default alignment in MWImageModel" 2014-05-24 03:33:03 +00:00
Moriel Schottlender 7a6f59920d Fix default alignment in MWImageModel
Make default alignment a computed value, and make sure the GUI listens
to 'choose' instead of 'select' events for SelectWidgets so to prevent
recursive calls and make sure the GUI is updated properly.

Also added a default alignment check on type change so the user can
visually have an indication that the new image will have a different
alignment. The user can then change the value manually.

Bug: 65564
Bug: 65596
Bug: 62852
Bug: 65617

Change-Id: I55e16775d18e0a4bf7f1fa73bbb3aa5e0aa51a79
2014-05-24 03:22:52 +00:00
James D. Forrester 1d92138f99 Update eg-iframe.html
Change-Id: I41a6e89339b586690d04c4704d2427e89d2c8605
2014-05-23 20:20:49 -07:00
James D. Forrester 0d4aaf5b4c Move Safari 5.x to greylist because dialogs aren't working well
Bug: 65656
Change-Id: Idb1236d199e323381bcd69a50b34d8ba05ecc145
2014-05-23 20:05:01 -07:00
jenkins-bot f9aecc4b60 Merge "Fix dependencies for eg-iframe" 2014-05-23 23:59:12 +00:00
Ed Sanders 7330b38ebf Fix dependencies for eg-iframe
Requires standalone to actually run, as in core.

Change-Id: I408981eb1ba12f0a447d0582b88f6b67d0e455cb
2014-05-23 16:56:53 -07:00
jenkins-bot fb46a98886 Merge "Remove media item styling moved to MW-core in I400336c12d." 2014-05-23 23:39:57 +00:00
jenkins-bot 40315e5bf6 Merge "Preserve veaction, vesection on special redirects to wiki pages" 2014-05-23 23:38:56 +00:00
jenkins-bot c86b9f7046 Merge "Switch from Parsoid extension's styles to MediaWiki core's" 2014-05-23 23:36:21 +00:00
jenkins-bot a58db4629b Merge "Detect that a category is hidden when following a redirect" 2014-05-23 23:29:27 +00:00
jenkins-bot b34249a563 Merge "Follow redirects when looking up template data" 2014-05-23 23:13:21 +00:00
Alex Monk 9182fc1958 Follow redirects when looking up template data
Relies on If6fb5856 to do anything useful, but degrades gracefully to current
behaviour.

Bug: 50964
Change-Id: Ia35c2f433a1a604d7794f367fd10dbccac102b89
2014-05-23 19:57:22 +01:00
Roan Kattouw 40fd403c0c Update VE core submodule to master (a42143c)
New changes:
3ecd488 Add check icon for Apply button in ActionDialog
3dccb7d .unbind() -> .off()

Local change:
Add new CSS file to VisualEditor.php.

Change-Id: I443f9f4514ae2a61c688549107e7f2e5de700b62
2014-05-23 18:42:02 +00:00
James D. Forrester 47e19a9873 Convert toolbar structure group from bar to list
Aligns with I84a4d948ae in stand-alone.

Change-Id: I533355a20bb329b91d6550bde4afa18180b38f59
2014-05-22 17:47:29 -07:00
jenkins-bot 4c36d6e9c6 Merge "Make MWGalleryInspector wider" 2014-05-22 23:02:32 +00:00
James D. Forrester 805dbdd5bb Update VE core submodule to master (1c1eb3a)
New changes:
7368ea3 Localisation updates from https://translatewiki.net.
712be31 Followup 682b4d0b88: bring this.isSetup back
78fd10e Document that SurfaceFragment#getSelectedNode doesn't require selection

Change-Id: I8df73bfc30b5bfeed88d5e96236991ce8bbae72d
2014-05-22 14:31:38 -07:00
Translation updater bot 55fb76438e Localisation updates from https://translatewiki.net.
Change-Id: I51844559766397b05d727d06f3f7ac6c09d274f0
2014-05-22 20:04:39 +00:00
Moriel Schottlender 963e133851 Remove media item styling moved to MW-core in I400336c12d.
Change-Id: I348e55ddea94f3b67f647c66ba53f7384d683584
2014-05-22 12:34:00 -07:00
Ed Sanders d10f27e80a Make MWGalleryInspector wider
Galleries usually have very long lines of text so make the
inspector big.

Change-Id: I69f294af9603a271b73ac1d39166fe4b492290f0
2014-05-22 18:52:27 +01:00
Ed Sanders bafad7ea1e Remove DesktopContext.css/js from core, leave in desktop
Change-Id: I6f5e5a01a9feba593567288f5237a773fa02453e
2014-05-22 18:23:52 +01:00
Matthew Flaschen a50e5c6fd6 Preserve veaction, vesection on special redirects to wiki pages
Bug: 50877
Change-Id: I61fcc9109105ea25f30f89ec18d8fa0d13dcde82
2014-05-22 13:05:23 -04:00
Krenair 060fcabe3b Detect that a category is hidden when following a redirect
At the moment, if you have a category on a page, and the category redirects
to another category which is hidden, VE does not mark it as hidden when
loading the page.

Change-Id: I9303838d36fbc1e2c0ed16b8bb0020bf52a6c211
2014-05-22 17:44:05 +01:00
jenkins-bot e288385569 Merge "Don't add |link= when converting block images to inline" 2014-05-22 00:44:23 +00:00
Juliusz Gonera 44db741a4b Hide unsupported UI elements in references on mobile
Also tweak styles for the supported ones slightly.

Change-Id: Ia4f0f3627d062698c085cd60f72928ef16532d20
2014-05-21 16:18:08 -07:00
James D. Forrester 1294791b40 Re-sync .docs/eg-iframe.html
Change-Id: I50d2bee652d2a1c2b61d34eefaf61817e4c60bce
2014-05-21 16:17:15 -07:00
Roan Kattouw c6fa82f0fb Don't add |link= when converting block images to inline
Change-Id: I71d996df4839bb507b970c55f97d5543665f4f81
2014-05-21 16:05:27 -07:00
Roan Kattouw 6c1c01c657 Update VE core submodule to master (b0a1e1a)
New changes:
36762de Localisation updates from https://translatewiki.net.
d040f9e Add SVG to image demo
c4523fb Always cover inserted content in SurfaceFragment#insertContent

Change-Id: Icef709a904255b2453d6a2f3ed081b1b12bdb042
2014-05-21 15:52:58 -07:00
jenkins-bot 1606452037 Merge "Update VE core submodule to master (fa14d31)" 2014-05-21 22:04:56 +00:00
Translation updater bot 2cbdf0df3b Localisation updates from https://translatewiki.net.
Change-Id: Ide809ebd18382b9459065ece4031c47ab5584c8d
2014-05-21 20:26:17 +00:00
James D. Forrester 7f0d6646dc Update VE core submodule to master (fa14d31)
New changes:
1bc3c99 Remove Firefox cursoring hack
5ebd89a Separate demo into mobile demo and desktop demo
3714877 Add test files to dependency tree
2aecf95 Localisation updates from https://translatewiki.net.
e750fb7 Update OOjs UI to v0.1.0-pre (d4086ff6e6)
363f2a1 Phantom optimisations
edfd5cb Localisation updates from https://translatewiki.net.
6fed173 Localisation updates from https://translatewiki.net.
0dd3402 Update OOjs UI to v0.1.0-pre (521a9e242b)
50ad883 Localisation updates from https://translatewiki.net.
501afaf Update OOjs UI to v0.1.0-pre (0fbf6bd14e)
cdaf6c1 Localisation updates from https://translatewiki.net.
682b4d0 Phantom optimisations, episode II
e1721a2 Move DesktopSurface and DesktopContext to visualEditor.desktop
857d463 Make $window a property of ce.Surface
fa14d31 Update OOjs UI to v0.1.0-pre (0436296667)

Change-Id: I13d7dd9289f273b938fdb070cec12ff998351265
2014-05-21 13:26:02 -07:00
jenkins-bot a66c3147cb Merge "Don't update image model twice" 2014-05-21 19:23:55 +00:00
James D. Forrester a8501778dd Switch from Parsoid extension's styles to MediaWiki core's
Using the new mediawiki.skinning.content.parsoid module instead of the clunky
ext.parsoid.styles (which added an unhelpful dependency).

Change-Id: I87e93777ece75ebf035df29490a80daf9fa7c45a
2014-05-21 12:19:07 -07:00
Moriel Schottlender d8040dbffc Don't update image model twice
The image model is updated through events from the edit dialog.
There is no need to update the states of the select/checkboxes
at the end in 'apply'. The only inputs that are not updated
on change are caption and alternate text.

Bug: 65564
Change-Id: I18c009546120e270467418cff677ec491fd109ca
2014-05-21 14:41:33 -04:00
cmcmahon 82dc0cbb99 [browser test] Dismiss new confirm dialog
Note: this is not a real confirm, it is an iframe with some
buttons that look like a standard confirmation but are not

Change-Id: I7854815542f05bec03ce950495dd675605916deb
2014-05-21 09:35:28 -07:00
Krenair 12d14b9e26 Allow extensions to add extra meta item checkboxes to the page settings dialog
Like this:

ve.ui.MWSettingsPage.static.addMetaCheckbox(
    'metaItemName', // e.g. 'mwDisambiguation'
    'checkboxLabel' // e.g. 'Disambiguation page'
);

Depending on 'ext.visualEditor.mwmeta'

Bug: 61073
Change-Id: I78dd68ff5aad20c7e66c4ce1528b6f1bbc74892d
2014-05-21 16:07:00 +00:00
jenkins-bot 8094a2f64c Merge "Unbind confirm dialog handlers after either of the events fires once" 2014-05-21 13:55:15 +00:00
Moriel Schottlender fad534ee4b Adjust newNode range and fallback in MWImageModel
When inserting a new node, get the proper fragment range and ask
for the node from within the search loop. Also added a fallback
for the case that the node wasn't found, and a caption cannot
be added.

Change-Id: Ic19d9b1cd2739435137f633de09a13b25a11a0cb
2014-05-21 05:56:37 +00:00
Moriel Schottlender 7d228673bb Fix MWImageModel's getImageNodeType()
* Fixing a typo in the getImageNodeType() method ('frame' was supposed
  to be 'frameless').
* Adding a check for type 'mwBlockImage' before editing/adding captions
* Using the node's getType() method instead of the model's where possible.
* Adjusting default alignment, so that when we check if it is set, it gives
  us the actual answer, which is always useful.

Bug: 65568
Change-Id: I1687d8c7430c723b52448a9e24641e2c30d85d6a
2014-05-21 00:01:02 -04:00
Roan Kattouw 293609e5d8 Unbind confirm dialog handlers after either of the events fires once
We weren't unbinding these handlers at all, and so the 'ok' or 'cancel'
handlers could run multiple times for one button click, and even worse,
you could get in a situation where clicking 'ok' in one confirm dialog
would also run the 'ok' handler for the other one. This happens because
the ConfirmDialog instance is recycled by the WindowSet.

The way the unbinding is done is ugly; we should either consolidate the
'ok' and 'cancel' events so we can use .once(), or come up with some other
way to automatically unbind the handlers.

Bug: 65557
Change-Id: Iabf0c0d0229add09cc775358fc5a4e5ae783db04
2014-05-20 19:11:45 -07:00
Translation updater bot 3871ba5a06 Localisation updates from https://translatewiki.net.
Change-Id: Ie610d0f236c9caf5863be9a8ef99b8848f6ac0b0
2014-05-20 19:05:32 +00:00
jenkins-bot 5798569c73 Merge "Image model and the media edit dialog" 2014-05-20 01:15:31 +00:00
Moriel Schottlender 37b3c07b26 Image model and the media edit dialog
Creating an MWImageModel that handles all image edit operations.
If the new attributes mean a change of image types from inline
to block or vice versa, the model will handle the creation and
insertion of the new node.

Change-Id: Ibe71bc8bd74e4ba5a024ac722432ccf0b8f65e71
2014-05-19 21:11:06 -04:00
jenkins-bot 8c95826338 Merge "Set flags for confirm dialog buttons for switching to source mode" 2014-05-19 21:56:38 +00:00
jenkins-bot 1d0e42a6ce Merge "Set flags for confirm dialog buttons" 2014-05-19 21:14:31 +00:00
jenkins-bot cd3264889c Merge "Use OOUI confirmation dialog rather than native confirm() for switching to source editing" 2014-05-19 20:50:31 +00:00
Roan Kattouw 96809998f2 Set flags for confirm dialog buttons for switching to source mode
"Yes, switch" isn't constructive; make it primary instead.
"No, cancel" isn't destructive; make it neutral (no flags) instead.

Change-Id: I841cbed4a81eaed679a8c7da89942c6b030a1217
2014-05-19 13:49:52 -07:00
Roan Kattouw 5b93980b68 Set flags for confirm dialog buttons
"Discard edits" isn't constructive, and "Continue editing" isn't destructive.
Instead, mark "Discard edits" as destructive, and make the continue
button neutral (no flags).

Change-Id: I7648555ad47be698e75b5019d7738b0afb8611aa
2014-05-19 13:46:36 -07:00
Translation updater bot c961ef503f Merge "Localisation updates from https://translatewiki.net." 2014-05-19 19:48:07 +00:00
Translation updater bot 91c62924e7 Localisation updates from https://translatewiki.net.
Change-Id: If053b4b94ad4a2e31fe6043c9d3df961ae762ecd
2014-05-19 19:47:31 +00:00