Commit graph

6862 commits

Author SHA1 Message Date
jenkins-bot b13844b051 Merge "Add fallback template description with link to template page" 2014-03-12 23:25:23 +00:00
jenkins-bot 13811925b9 Merge "Update VE core submodule to master (8c017ae)" 2014-03-12 23:23:22 +00:00
Trevor Parscal ba2e316964 Add fallback template description with link to template page
Shown when there's no template data.

Someday in the future, we will support adding a description inline. Not
yet. Calm down.

Change-Id: I18c0a591b60de53bc124d82c688d71d30ad1d5dd
2014-03-12 23:21:29 +00:00
jenkins-bot 85b4f8c063 Merge "Keep label and disabled state of transclusion dialog apply button in sync" 2014-03-12 23:21:27 +00:00
Roan Kattouw 0072aeb9a1 Update VE core submodule to master (8c017ae)
Also update VE-MW for the comment changes in VE core

New changes:
4ad6a3d Add text direction to SA demo
89503e8 ve.ce.Node: Emphasise slug transition with increasing outline offset
864046e Update oojs to v1.0.8
65d1338 Localisation updates from https://translatewiki.net.
b66d482 Stop special-casing comments and recognize them as tagName='#comment' instead
09dda12 ve.ce.getDomText: Document node types and use .data instead of .nodeValue
b0a3b2a Make ve.dm.Converter assertions actually display message
ef791cc Make 'comment' its own metaitem type
d5ef0d7 ve.dm.Converter: Refer to nodes instead of elements where appropiate
c22c8af Fix JS error when pressing Enter with selection across multiple paragraphs
a26a708 Add ve.dm.Transaction.newFromReplacement
a9e136e Don't cause needless surface refreshes on overwriting.
6fd35ee Split part of getOpeningHtmlTag out to getHtmlAttributes
2c31f67 ve.ce.Surface: Document version number in focus workaround for Opera
e069e74 Add some more characters to the special character inserter

Change-Id: I859805fb261468e8fae9454c4992115369066b49
2014-03-12 16:15:54 -07:00
Timo Tijhof 37277c762f ve.ui.MWPopupTool: Simplify code complexity
* Add class to items container right at creation time.
* Do handling for individual items when we have a reference to the
  item. No need to query for children() afterwards.

Change-Id: I7f5eda3d514da6d7a931bc31090a08b1937ed3e7
2014-03-12 22:13:45 +00:00
Timo Tijhof 5f64ed64d8 mw.Target: Add class "mw-ve-editNotice" to edit notices
Follows-up I260059802379 which removed got rid of
the "ve-init-mw-viewPageTarget-toolbar-editNotices-notice" class
from notices and didn't add something generic in its place.

(There is "ve-ui-mwNoticesPopupTool-item" but that's more an
internal class we don't want gadgets and wiki stylesheets to
rely on.)

Bug: 43013
Change-Id: I8e1e383c2cb3199fe78f45f4feaa24a44126cf0b
2014-03-12 23:07:39 +01:00
Trevor Parscal 91f38fdaf2 Keep label and disabled state of transclusion dialog apply button in sync
* Use "Insert template" when adding a single template
* Use "Insert transclusion" when adding a multi-part template
* Use "Apply changes" when working with an existing tranclusion
* Use "Loading..." and disable while waiting for template data
* Disable when the transclusion has only a template placeholder

Bug: 50998
Change-Id: Ib2fb3d8711ed6d3ef41cc0db55740c95394dd3f9
2014-03-12 14:56:26 -07:00
jenkins-bot d91a8b21f5 Merge "Enable VisualEditor by default in NS_USER as well as $wgContentNamespaces" 2014-03-12 21:39:32 +00:00
Timo Tijhof c3f6a2f561 mw.ViewPageTarget: Tag our state changes and reject foreign states
Store a bit of data with the states we push or replace in the
history so that when the user navigates back to them, we know
for sure this is a state we pushed in the history.

This allows us to filter out popstate events triggered by the
user browsing to states create by other software, as well as
states triggered by the browser that have no state data at all
(Chrome is known to, in contrast with other browsers, trigger a
blank popstate event on load, which we were mistaking for a user
event where the user navigates back to veaction=edit).

Bug: 57901
Change-Id: I142777d0d2ae96d3afee224782f0d2d1522da1eb
2014-03-12 22:26:52 +01:00
jenkins-bot 9eea7240b7 Merge "Rename 'wasve' parameter to 'veswitched'" 2014-03-12 18:14:12 +00:00
jenkins-bot 8d46c0230f Merge "Fix fatal when user switches from VE to the old editor and makes a null edit" 2014-03-12 18:12:37 +00:00
jenkins-bot 38d16152d1 Merge "Deal with images whose size is smalled than default" 2014-03-12 18:10:50 +00:00
Krenair 6b2d30c259 Rename 'wasve' parameter to 'veswitched'
Per Krinkle's comment on I1426d300

Change-Id: Ic99efe9488c98a7f6703142d6061bd2cdbac833b
2014-03-12 18:10:17 +00:00
Moriel Schottlender 499c672195 Deal with images whose size is smalled than default
When an image is smaller than the default size, the placeholder 'default'
value will be the image's actual size. This means that if a user selects
default thumb size for the image, it won't be changed unless the original
size is bigger than the default. Also adjusted so that default size limits
width only, and doesn't act as a bounding box on size change.

Bug: 62293
Change-Id: I8341776794843ff63a93bedeadf5921851c57a26
2014-03-12 18:07:38 +00:00
cmcmahon 9de8448e8b [Browser tests] Remove dumb stuff from steps.
This might improve the flakiness in the Sauce runs. I am not
certain of that though

Change-Id: I80dd0829aba278ccbda9a4f34a15cbb140ce9e7d
2014-03-12 17:30:01 +00:00
Krenair f8685d94a7 Fix fatal when user switches from VE to the old editor and makes a null edit
$revision can be null if the user makes a null edit, I have changed the doc
page to reflect that.

Change-Id: I40c1412dbd3f8e023bd4fa65d86d3d5092870ad4
2014-03-12 00:01:54 +00:00
Translation updater bot 355b59ffc2 Localisation updates from https://translatewiki.net.
Change-Id: Ie51cbdd596330c76dae46d41262460ab0813ec00
2014-03-11 20:47:59 +00:00
jenkins-bot c1ef22762e Merge "[Browser tests] Updates to transclusion tests should turn build green" 2014-03-11 18:24:29 +00:00
James D. Forrester d076d9e4a2 Enable VisualEditor by default in NS_USER as well as $wgContentNamespaces
Initially we were only deploying to $wgContentNamespaces, but it's highly likely
that users will want to edit their own user pages in VE anyway. Note that this is
how it's been deployed for Wikimedia for a year now.

Additionally, this helps fix a bug in the browser tests that assumed NS_USER was
a VE-able namespace when that was only true in production config, and not for new
wikis (such as created during automated setup).

Bug: 57104
Change-Id: Icebc24f82fb49e9e80388b6202efa366360ce33c
2014-03-10 17:13:50 -07:00
jenkins-bot ab426682f6 Merge "Followup 4bd80b62: fix JS error on page save" 2014-03-10 22:13:59 +00:00
Roan Kattouw 66a94861e6 Followup 4bd80b62: fix JS error on page save
Remove stray access to removed this.timings property.

Bug: 62508
Change-Id: I9a6fb802302bbc25ff3e9a657b983d98a0de7fd2
2014-03-10 22:12:07 +00:00
jenkins-bot cc0741a8be Merge "Enforce width-only default size only on larger images" 2014-03-10 21:32:02 +00:00
Translation updater bot ee1b33b8a1 Localisation updates from https://translatewiki.net.
Change-Id: I52d4ddd5a744bfb5ddda6969bbd293bde62774a6
2014-03-10 21:29:57 +00:00
Moriel Schottlender 2af27877bc Show/hide the magnify button on type change
Make sure the magnify button in the caption is properly shown or
hidden when image type changes. The magnify icon will always be
built, but will be shown and hidden using CSS rules.

Bug: 62139
Change-Id: Ib9a4569239ed70d16a153fb0823e283203fba1d4
2014-03-10 21:06:18 +00:00
Roan Kattouw 561927627e Rebuild eg-iframe.html for e1d8ebd in VE core
Change-Id: Ie6b708e19f970611320ae86dec47e97ce7133ba3
2014-03-10 14:00:13 -07:00
Roan Kattouw d75e31ac0b Update VE core submodule to master (a2ac637)
New changes:
2074a5d Fix application of slug focus classes
9f4ab6a Have Protected/ResizableNode respond to rerender event
9d7a290 Rerender focusedNode after slug collapse
de7d9ab Use en-us spelling 'focused'
7fae4c2 Add missing returns documentation to getSurfaceFragment
5177898 Remove unneeded assignment
a1c12c2 Localisation updates from https://translatewiki.net.
5648139 Localisation updates from https://translatewiki.net.
548728a Restore error box to VE demo page
684e55d Localisation updates from https://translatewiki.net.
3c4a081 ve.ce.Node: Change slug color from darker grey to lighter blue/grey

Change-Id: Icb20d78bb1fe65dd9107e43317148d4990bcfc6b
2014-03-10 13:48:33 -07:00
Moriel Schottlender 5f2ce173a0 Enforce width-only default size only on larger images
While the documentation is unclear, it seems that the 'thumbsize' in
$wgDefaultUserOptions is setting up width limit rather than a general
bounding box.

Things that are adapted in this fix:

* Only resize the image if the image is bigger than default and marked
  as default size.
* Only limit width, even if the image is tall.
* Add rounding to calculated height value.
* Make sure new images follow these rules as well on insertion.

Bug: 62293
Bug: 62279
Change-Id: I37525bf3480bb1da8b0538f9b38576616aabbfa6
2014-03-10 19:05:14 +00:00
jenkins-bot b3c7a1b591 Merge "Fix dead links in README.md and CONTRIBUTING.md" 2014-03-10 17:30:08 +00:00
Timo Tijhof 7599551aef Fix dead links in README.md and CONTRIBUTING.md
* CODING.md was renamed to CONTRIBUTING.md a while back.
* Fix link to upstream CONTRIBUTING.md (was pointing at itself,
  follows-up 902f1b7).

Change-Id: I465642b842fb2724a57a5c4d93525a9bf46b39ca
2014-03-10 18:26:30 +01:00
Translation updater bot 302b98b873 Localisation updates from https://translatewiki.net.
Change-Id: I4aec7ba7825aeeaab1acfa74fb20b994c1fa8bb3
2014-03-09 20:39:23 +00:00
jenkins-bot fb483849e6 Merge "Abstract tracking and specify which target it came from" 2014-03-08 01:01:08 +00:00
jenkins-bot 0481d57b30 Merge "Make parameter search widget case insensitive" 2014-03-08 00:54:58 +00:00
jenkins-bot ee586bde61 Merge "Add required indicators to parameter pages" 2014-03-08 00:49:50 +00:00
cmcmahon 007538a520 [Browser tests] Updates to transclusion tests should turn build green
Change-Id: I9a504abff73f56535d26d3205a2a4345290ba987
2014-03-07 22:57:14 +00:00
Translation updater bot 7841df491e Localisation updates from https://translatewiki.net.
Change-Id: Ia23dd97664fdec1a254eecd8cda0e76c07ee58ee
2014-03-07 22:21:18 +00:00
jenkins-bot d86b6a0f02 Merge "Re-enable VisualEditor's toolbar icons on mobile." 2014-03-07 21:55:23 +00:00
Translation updater bot de3dbe60b7 Merge "Localisation updates from https://translatewiki.net." 2014-03-07 21:54:50 +00:00
Translation updater bot f5e843a3e1 Localisation updates from https://translatewiki.net.
Change-Id: I1635b2ef2d71cc241f36f04530394a1252bf9541
2014-03-07 21:47:53 +00:00
jrobson 2ea1eec10c Re-enable VisualEditor's toolbar icons on mobile.
The experience should be consistent between mobile and desktop.
We should explore re-styling these buttons to look like
Ib3c94d19231b018a509b78269001223ad0568795 in desktop as well
at a later date.

Change-Id: Ic9e4c5d12c3c75fcb195432c9155ec0a7eecac04
2014-03-07 10:59:09 -08:00
Trevor Parscal 8940bc1e69 Add required indicators to parameter pages
Change-Id: I235af5feb1e02805f7844e51c9b1608341336749
2014-03-06 23:03:20 +00:00
James D. Forrester 763c203821 Update VE core submodule to master (beb5e43)
New changes:
3349216 Bold/italic icons for fa
e1d8ebd Add oojs-ui-apex.css to modules.json
beb5e43 Update OOjs UI to v0.1.0-pre (8b13d2b7f7)

Change-Id: I6f46569ed7a95273c72f9629e02f7d7a3fbf4870
2014-03-06 14:45:00 -08:00
Trevor Parscal 066a471346 Make parameter search widget case insensitive
Also ignore pipe and bracket characters, since they are not allowed in parameter names.

Change-Id: If7378826f103d0b7f8d24edcdc83419879a0c1fe
2014-03-06 12:10:42 -08:00
Translation updater bot c4a65ffca8 Merge "Localisation updates from https://translatewiki.net." 2014-03-06 19:58:06 +00:00
Translation updater bot a5918feeea Localisation updates from https://translatewiki.net.
Change-Id: I694bc12253540e38a42fa66a79dd149062169e59
2014-03-06 19:57:21 +00:00
jenkins-bot b9f78ff15b Merge "Get item data from change event in select widget items" 2014-03-06 19:41:28 +00:00
Moriel Schottlender 7f180f0313 Get item data from change event in select widget items
Fix a bug in MediaEditDialog that resulted from sync issues when the
'select' event is fired for OO.ui.ButtonSelectWidget widgets.

Use the details of the selected item given from the event rather than
checking the state of the widget with getSelectedItem().

Change-Id: Ifbbf722ff374e10b680a6b55ab99f5fc86480c40
2014-03-06 13:37:17 -05:00
Rob Moen 4bd80b625e Abstract tracking and specify which target it came from
Split tracking out of the base target and from viewPageTarget

Primary reasons for this change:
 * Makes it possible to resolve an issue with tracking in mobile
 * Lets us reuse the viewPage save workflow tracking
 * Support existing and new targets with tracking
 * Simplification of target classes

Change-Id: I036e4f2129d929db0a3b9a4baa87c946a4b194a9
2014-03-06 09:50:11 -08:00
jenkins-bot c22ddb3463 Merge "mw.ViewPageTarget: Check elementsThatHadOurAccessKey before accessing" 2014-03-06 17:18:09 +00:00
Timo Tijhof 8735ea2ef9 mw.ViewPageTarget: Check elementsThatHadOurAccessKey before accessing
Follows-up I31d6b9ea065b3be85ed0.

Bug: 62329
Change-Id: I83a6f20cafd6193d64142914f72c1496d03294a5
2014-03-06 18:12:13 +01:00