Commit graph

1504 commits

Author SHA1 Message Date
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
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
jenkins-bot fefd3a5d72 Merge "Whitelist Opera 15+" 2014-05-19 19:42:59 +00:00
Timo Tijhof 37087f1f5f MWTransclusionDialog: Remove setMode() call from teardown()
teardown() runs after the dialog has been hidden (if you need it
to be visible, use close() instead).

However removing it instead of moving because it is obsolete,
this is something that should be done from setup() instead, and
already is.

Bug: 65373
Change-Id: Ib6b4ab49f191d1d339e69934453786a82d97380f
2014-05-19 20:44:38 +02:00
jenkins-bot 7f7619a9e5 Merge "[browser test] use css for Template selector" 2014-05-19 18:25:09 +00:00
jenkins-bot 3689512e7d Merge "Update wikitext-warning to refer to 'Switch to source editing'" 2014-05-19 18:24:52 +00:00
jenkins-bot bec824f1dd Merge "Update beta warning to refer to 'Switch to source editing'" 2014-05-19 18:24:21 +00:00
cmcmahon 37e01c67b2 [browser test] use css for Template selector
Change-Id: I288c8bb8a27a6eebbd550c533837787759ef2674
2014-05-19 11:21:32 -07:00
jenkins-bot d0ea265784 Merge "Fix styling on save dialog" 2014-05-19 17:53:33 +00:00
jenkins-bot a8910ca542 Merge "Remove edit tab from the DOM if it's hidden" 2014-05-19 17:51:12 +00:00
jenkins-bot 76a379b6cd Merge "On file pages, only replace the (local) image description when saving" 2014-05-19 17:51:08 +00:00
Ed Sanders ddf88a5633 Fix styling on save dialog
Apply styles directly to textarea instead of wrapper div

Change-Id: Id2340cb81dd343266b8a57ae91057fa3015a47e0
2014-05-19 18:41:06 +01:00
Ed Sanders bd3b5ffc4f Initialise save panel on 'ready' so focus works
Bug: 65222
Change-Id: I18a0191a3013332621e44455ea59d5f8d683117e
2014-05-19 17:23:38 +01:00
Translation updater bot d36f22e620 Localisation updates from https://translatewiki.net.
Change-Id: Id0ff995087d24b865ba7a888aeb3e4cb2b696852
2014-05-18 20:08:44 +00:00
Translation updater bot 825749a52f Localisation updates from https://translatewiki.net.
Change-Id: Ia2f6952cd6b1c97f6aa9846bd993433031f2b49b
2014-05-17 19:57:15 +00:00
Krenair a5dd438725 Use OOUI confirmation dialog rather than native confirm() for switching to source editing
Per TTO on bug 51655, the implementation of confirm() in most browsers is crappy and we
shouldn't use it.

Change-Id: I755085a253c05958e4b50af57b19dab90f2f0fb6
2014-05-17 18:24:04 +01:00
Krenair eb7b727a53 On file pages, only replace the (local) image description when saving
Instead of overwriting everything else on the page (including the thumbnail!)

Bug: 65349
Change-Id: Ib6c4928646d6d278e29fbe31ae1902b0dc3b146a
2014-05-17 17:53:15 +01:00
Krenair e7787db92d Remove edit tab from the DOM if it's hidden
Fixed bug 64142, works around bug 65292

Bug: 64142
Bug: 65292
Change-Id: I31d8f7b149d657a678ed6ebc56b92305934f34bc
2014-05-17 00:56:38 +01:00
jenkins-bot 191fb5e1f1 Merge "Hide 'no results found' once there's at least one result" 2014-05-16 23:16:19 +00:00
Moriel Schottlender 3a9faa44fc Hide 'no results found' once there's at least one result
Naturally, the 'no results found' should only appear as long as there
are actually no results found.

Bug: 52463
Change-Id: I0116b769b9e4995678975d43a74c54c4d426f672
2014-05-16 18:35:41 -04:00
Trevor Parscal 658d614fb8 Change Cite > Newspaper to Cite > News
As per request from talk page:

https://en.wikipedia.org/wiki/Wikipedia:VE/F#VE_citation_tool

Bug: 65207
Change-Id: I3eed54610f5283cab154213c511c56ebe9e19d8f
2014-05-16 22:15:56 +00:00
Krenair 033476d7a0 Update wikitext-warning to refer to 'Switch to source editing'
Bug: 57700
Change-Id: I130bef5f6e4405720ad732351def4635129fa9c0
2014-05-16 17:49:02 +01:00
Krenair 3121d841e6 Update beta warning to refer to 'Switch to source editing'
Bug: 57699
Change-Id: Ib3af5a67be4e23b2f4c7cbc464672ec4fe6372af
2014-05-16 17:40:54 +01:00
jenkins-bot 52d562a92a Merge "Remove MWCommandHelpDialogTool" 2014-05-15 20:58:35 +00:00
jenkins-bot b20a4cdb62 Merge "Set up edit notices for things like unknown browsers on each activation" 2014-05-15 20:45:26 +00:00
Translation updater bot d96ce9d2d1 Localisation updates from https://translatewiki.net.
Change-Id: Ib0d8ba18310a95a32e23751f620c81ce95fa2330
2014-05-15 20:33:32 +00:00
Krenair 411f0a7729 Set up edit notices for things like unknown browsers on each activation
The list is cleared on cancel

Bug: 65236
Change-Id: I96a1d95535ec0569e3e25adaa64625fc3a0c4b97
2014-05-15 21:01:30 +01:00
Timo Tijhof 2ef5468471 mw.ViewPageTarget.init: Remove redundant hasOwn check
Follows-up e3be4a6. Object properties default to undefined, no
need to check existance first. Looks like like an "isset()" in
PHP for preventing E_NOTICE.

Change-Id: I594b23e6caf1e17d6d5d37e6a5fd81152e78b3a6
2014-05-15 16:58:03 +00:00
Timo Tijhof 25d00cc777 build: Update jscs and jshint
jshint:
* Update to grunt-contrib-jshint v0.10.0 (jshint v2.5.0).
* Remove coding style options covered by jscs.
* Enable new option "freeze" (prohibits changing native prototypes).
  http://www.jshint.com/blog/new-in-jshint-oct-2013/#option-freeze
* Re-order to match http://www.jshint.com/docs/options/

jscs:
* Update to grunt-jscs-checker v0.4.4 (jscs v1.4.5).
* Format .jscsrc file in a more spacious way and order the
  properties less arbitrarily (using the jscs's readme order).
* Enforce more details of our coding style
* Get rid of the unsable "sticky" operator rules which have been
  deprecated in favour of using other rules instead that are able
  to enforce this more accurately.
  - disallowLeftStickedOperators: Remove deprecated rule.
    * Ternary covered by requireSpacesInConditionalExpression.
    * Rest covered by requireSpace{Before,After}BinaryOperators.

  - requireLeftStickedOperators: Remove deprecated rule.
     * Comma covered by disallowSpaceBeforeBinaryOperators.

  - requireRightStickedOperators: Remove deprecated rule.
    * Logical not (!) covered by disallowSpaceAfterPrefixUnaryOperators.

See also If46b94ce1, Ib731f11b1 and I0b0cadbc5 in oojs/core.

Also:
* Update grunt-contrib-watch to latest upstream version.
  Change log at https://github.com/gruntjs/grunt-contrib-watch/blob/v0.6.1/CHANGELOG#L1-L17

Change-Id: I6c5a34afea8b05a3dca617897c192594df06ca90
2014-05-15 16:52:34 +00:00
jenkins-bot f0d19359a6 Merge "Fire hook when VE activates/deactivates" 2014-05-14 23:29:34 +00:00
Krenair 28fb8c8d4c Fire hook when VE activates/deactivates
Bug: 65320
Change-Id: I3658d6cbe6dd81d8d143fce9659f2c8c4e25ba07
2014-05-15 00:26:36 +01:00
jenkins-bot fb4b6f0b0d Merge "Move shortcut keys help from "Page options" dropdown to "Help" popup" 2014-05-14 23:16:48 +00:00
Roan Kattouw 29fc9ea1b0 Remove MWCommandHelpDialogTool
Now unused. Also should have been a subclass of the (also unused)
CommandHelpDialogTool in VE core.

Change-Id: I865317aa41dbf93c98620c0f89b6d7ac92499022
2014-05-14 16:16:26 -07:00
jenkins-bot 95828d4ff1 Merge "If no media is found display a message in media insert dialog" 2014-05-14 23:10:23 +00:00
Moriel Schottlender 8f68e9f497 If no media is found display a message in media insert dialog
Add a message indicating to the user that no image results were
found in the media insert dialog in case no results are found.

Bug: 52463
Change-Id: I93aea897d864298bf891a90c2fb147f7d34df06d
2014-05-14 16:08:11 -07:00
jenkins-bot 0680c02aa7 Merge "Hide PageTriage curation toolbar while VE is open" 2014-05-14 23:04:03 +00:00
Krenair 204554a567 Swap from using native confirm() to using an OOUI dialog when cancelling
Relies on:
* I292fb34d in OOjs UI to add the confirmation dialog
** I67329820 in MediaWiki core to use the messages added in OOjs UI
** I38f5bb63 in VisualEditor core to register the confirmation dialog

Bug: 50955
Change-Id: I98f9a03d780556b360b57c018c05a27cc1b3862e
2014-05-14 23:00:35 +00:00