Commit graph

2777 commits

Author SHA1 Message Date
Ed Sanders 85988c67ce Fix save dialog styling for MediaWiki theme
* Remove rounded corners.
* Change which borders are used as they change colour on focus.
* Fix margins.

Change-Id: I44f725dfeec5c26f95ba5368ca3848272d66e5be
2015-01-05 19:20:30 +00:00
jenkins-bot 178fdf284c Merge "Fix teardown order of MWAlienExtensionsInspector" 2015-01-05 18:18:54 +00:00
Ed Sanders 9a3c03b553 Fix teardown order of MWAlienExtensionsInspector
Local teardown process was jumping to the front of the queue
resulting in the attributeInputs being emptied before they
were read in updateMwData.

Bug: T85818
Change-Id: I24cb490996048e514895c359dedf5945acdecb0a
2015-01-05 17:58:31 +00:00
jenkins-bot d68c2daa86 Merge "Don't break "Edit source" link after VE has closed" 2015-01-05 13:28:42 +00:00
jenkins-bot 472e149e4b Merge "Update bugzilla links to phabricator" 2015-01-05 12:07:36 +00:00
Translation updater bot deaa5e5cd3 Localisation updates from https://translatewiki.net.
Change-Id: Ibdecb2cc7d096863ec5540b87e40c4516ff5ddd1
2015-01-04 21:52:03 +01:00
Translation updater bot 1653fcc5eb Localisation updates from https://translatewiki.net.
Change-Id: Ic7c6d5c09ff4ac961ee21ca8ce55a317576e4636
2015-01-03 23:06:07 +01:00
Translation updater bot 3ca91ba1d7 Localisation updates from https://translatewiki.net.
Change-Id: I1a2c3fd79e011161ee7895ef73708f8c1f37294b
2015-01-02 22:39:24 +01:00
Alex Monk b539bcd4af Update bugzilla links to phabricator
Bug: T75733
Change-Id: I4bf870b19feac0ee10677829daeb3d46eba3d9d6
2015-01-02 15:47:28 +00:00
Alex Monk 9600d28ebc Don't break "Edit source" link after VE has closed
Bug: T85552
Change-Id: I6db6fcff24110e749e3a0c1aa7c0528527b53d44
2014-12-30 21:07:04 +00:00
Translation updater bot 80b39cd2d1 Localisation updates from https://translatewiki.net.
Change-Id: I25f7afc115e59f7c84f2db939b6c8867206001d8
2014-12-30 21:15:14 +01:00
Amir E. Aharoni cd4bd7a73c Add classes to toolbar UI elements
This cleans up the selectors for the elements on the toolbar
so that they can be tested.

Class names in the form of ve-test-* are added to elements
that have words for labels: 'Paragraph', 'Cite', 'Insert'.
There is no other way to look up these elements in the DOM
except using the UI text, but it is different in different languages,
so this is unusable for the language_screenshots job,
which is multilingual by its nature.

Bug: T76143
Change-Id: Ib0cb67151d893a5d2efccf798d6b25d197ed34d2
2014-12-30 12:16:44 +00:00
Amir E. Aharoni 84629d1b6c Clarify a comment and correct its spelling
Change-Id: Idd1334d60822a1bfaae2354bca6cb277016f81f7
2014-12-28 00:51:52 +02:00
Translation updater bot cad2056fc9 Localisation updates from https://translatewiki.net.
Change-Id: I2071d84053b2d3465bc66018fc1cbd9bc603d769
2014-12-27 19:55:21 +01:00
Translation updater bot d8e22ca0a0 Localisation updates from https://translatewiki.net.
Change-Id: I48159d5b2b76b993e7308639a84759111e68284e
2014-12-26 09:48:42 +01:00
Translation updater bot 1d73f6b19f Localisation updates from https://translatewiki.net.
Change-Id: I1b29109b8a6ed00d52b7c46ca062394c9f792e57
2014-12-23 21:43:58 +01:00
Translation updater bot fc5451f68b Localisation updates from https://translatewiki.net.
Change-Id: If171c89cdcb8ae66743560d72833590ba4976034
2014-12-22 22:48:38 +01:00
Translation updater bot 0458bd4be3 Localisation updates from https://translatewiki.net.
Change-Id: I0bf3cc41c2cb942c30c9a2ff58744e3ee8253ae8
2014-12-20 22:29:34 +01:00
Cmcmahon 2ebbd0f038 [BrowserTest] This test is unreliable in any version of Chrome
The issue is that when running automatically, upon loading the
page to be edited a second and third time, the cursor ends up
in a random place within the existing text of the article.

The test expects the cursor to always be at the start of the
article text, and this happens in Firefox.

I did a cursory check and I could not reproduce the issue of random
cursor placement upon multiple edits to the same article. There
may be a bug here, but it is not trivial to reproduce.

So let's take this test out of the Jenkins builds in the service
of more reliable green tests.

Change-Id: Ie3dd76c5b40f3035d43e6f0a06327adb70900f60
2014-12-19 09:34:20 -07:00
Translation updater bot a5d417f43f Localisation updates from https://translatewiki.net.
Change-Id: I2f9bb82c98b8091a4150c2b457a815b0576da4ba
2014-12-18 23:24:17 +01:00
Ed Sanders f49bbf783a Update setupToolbar signature in mobile target
This method now takes arguments to make sure they are passed.

Bug: T78710
Change-Id: Ifba696c2a1b60690bdccd1b58d347c254dec5432
2014-12-18 11:25:34 +00:00
Alex Monk c5d927552a Fix Ia6bf604c: Update another caller to ve.init.mw.Target
MobileViewTarget.

Due to this being missed, pageName was getting set to a jQuery object,
which eventually got passed as a data value in a $.ajax call, causing
jQuery to emit a TypeError: Illegal invocation.

I guess this needs a MobileFrontend commit as well. Don't think it fixes
all the issues with loading VE mobile though.

Bug: T78710
Change-Id: I431a902563f608a7a33028cd60112f39c57000a4
2014-12-18 00:59:04 +00:00
Translation updater bot 9ee82f6e38 Localisation updates from https://translatewiki.net.
Change-Id: I0fe19c57399f18ac8707791b2dc272d8ffde3976
2014-12-17 21:52:20 +01:00
jenkins-bot f1103d2bf0 Merge "VE-MW fix commit for I4efbae614e" 2014-12-17 20:03:46 +00:00
Cmcmahon a479d04299 [BrowserTest] clear default text before entering search text
Change-Id: Ief375c95ebee65a1add2fdf1b7c45e600df181a3
2014-12-17 10:37:27 -07:00
Cmcmahon 4fbd141b49 [BrowserTest] update test for new selector
Change-Id: Ic3bc3b416bc7ddadef7a05699f6181c0b7b84cdd
2014-12-17 10:22:44 -07:00
Cmcmahon c34fd60a9b [BrowserTest] update general markup test
refactor for new locator

Change-Id: I089aebb64a9d67d01c1bfa4682927c0de2575051
2014-12-17 09:31:24 -07:00
Cmcmahon 30c3aa2242 [BrowserTest] update Links test
another iframe gone it seems

Change-Id: I33767706675bbdcd1cb45f33da109858ec36986e
2014-12-17 08:51:17 -07:00
jenkins-bot 4de775b4d4 Merge "[BrowserTest]Fixing options test Fixed the unique selector for failing cases Change-Id: I41bde7245328303fcc8c5afea8f7228c1d36b915" 2014-12-17 15:09:22 +00:00
ryasmeen@wikimedia.org 5eff6e8aa1 [BrowserTest]Fixing options test
Fixed the unique selector for failing cases
Change-Id: I41bde7245328303fcc8c5afea8f7228c1d36b915
2014-12-16 17:36:50 -08:00
jenkins-bot 9b3d3080ce Merge "Remove use of bind() for inline functions" 2014-12-17 00:13:22 +00:00
jenkins-bot b4bf8a11ca Merge "Update VE core submodule to master (fe2d908)" 2014-12-17 00:08:48 +00:00
Roan Kattouw 08bebc9b2b VE-MW fix commit for I4efbae614e
Local changes:
* Call bindHandlers()/unbindHandlers() in activate/deactivate
* Extend onDocumentKeyDown rather than overwriting it

Change-Id: I0739e71781c5140c54512ab421bdcb6d1df5fbbe
2014-12-16 15:42:27 -08:00
Timo Tijhof 2b7ae8c175 Remove use of bind() for inline functions
Follows-up b0e8900, 447e8de, d3f26e65.

Contrary to binding a reference, this-overiddes for inline
functions gets messy and fragile. There's also a minor
performance overhead that can be avoided. No separation of
concerns, eiter, as the object is held by the closure.

Also:
* Remove left-over instances of @method.
* Remove redundant '0' argument to setTimeout.
* Use null instead of $ for apply() on static methods like $.when.
* Use .empty().append() instead of .html(). Does the same but
  without additional overhead and without confusion association
  with "html" which isn't used (it doesn't serialise and re-parse
  or clone, it just appends when given one or more nodes).

Change-Id: I797a3667c67d52568150be9be5d043d149f22077
2014-12-16 23:27:53 +00:00
jenkins-bot 6ca0046599 Merge "[BrowserTest] changing the css paths for Cite options for fixing the tests" 2014-12-16 22:36:50 +00:00
ryasmeen@wikimedia.org aa77e8ab4f [BrowserTest] changing the css paths for Cite options for fixing the tests
Change-Id: Iea90e4bb656b30ec0839e6c843e30ba8ae1fd637
2014-12-16 15:33:37 -07:00
Bartosz Dziewoński 08654b4f60 Update VE core submodule to master (fe2d908)
New changes:
fd433fa Add getter for toolbarDialogs in ve.ui.Surface
00c3eb7 Add 'done' button to find and replace dialog
3642dc8 Localisation updates from https://translatewiki.net.
fe2d908 Update OOjs UI to v0.6.0

Local changes to ve.ui.MWFormatTool.css for OOjs UI breaking change.

Change-Id: I6bf98ea988b3e1deb4824189ef8e6d59387b6ffc
2014-12-16 13:27:43 -08:00
jenkins-bot ae8f07810d Merge "[BrowserTest] Adding tests for checking fields under Page Settings" 2014-12-16 21:14:28 +00:00
Translation updater bot a34a9c84b6 Localisation updates from https://translatewiki.net.
Change-Id: Ia0d711b180f8c463792416953365a6f71188f52c
2014-12-16 21:59:09 +01:00
jenkins-bot d71492731d Merge "Set 's' accesskey on save button inside save dialog" 2014-12-16 18:57:56 +00:00
jenkins-bot 0de05ea219 Merge "Edit/view source tab: Do not hijack middle click to display confirmation, only left click" 2014-12-16 07:57:26 +00:00
ryasmeen@wikimedia.org a8807c6af4 [BrowserTest] Adding tests for checking fields under Page Settings
Change-Id: I31d8d3327bd8abe6a7c5f3c4941174253104bbac
2014-12-15 21:37:42 +00:00
Translation updater bot 8133ef4aa8 Localisation updates from https://translatewiki.net.
Change-Id: Id6a2c0136078d95c537ef63e3d5d02d2b0fe581a
2014-12-15 22:20:53 +01:00
Alex Monk 0d0172d43b Set 's' accesskey on save button inside save dialog
Can be done much nicer than I expected last time I looked at this task

Bug: T76161
Change-Id: I9541cd9dac69330ed8a802f301617619221bc263
2014-12-15 21:07:54 +00:00
Alex Monk f9339d070b Edit/view source tab: Do not hijack middle click to display confirmation, only left click
Middle click is supposed to open the link in a new tab.

Bug: T78546
Change-Id: I594f1dff072d54c0a8d7112a1eaa0c1c84d0ffc1
2014-12-15 20:24:11 +00:00
Translation updater bot 706413c211 Localisation updates from https://translatewiki.net.
Change-Id: Iff486cf59d6adef1cc9ccc4c5ce4c8e4f85e53aa
2014-12-14 22:25:34 +01:00
Translation updater bot 44514b947e Localisation updates from https://translatewiki.net.
Change-Id: I3422f33ebcd78c2a40c93d93684768b84f5dbd5e
2014-12-13 22:39:50 +01:00
jenkins-bot e6997350ba Merge "Check for stopped propagation before showing close dialog" 2014-12-13 00:52:57 +00:00
Ed Sanders 9459e4e240 Check for stopped propagation before showing close dialog
Various VE elements use escape to perform tasks. Particularly
difficult are OOUI dialogs which listen to the document and thus
fire after this target's listener, so defer and check if the
event was previously stopped.

Bug: T78201
Change-Id: Ie335f199766923833588202626c3af8e4cbcb9b5
2014-12-12 22:38:40 +00:00
Bartosz Dziewoński 29ff7b737e Rename some things for my sanity
Change-Id: I101943fa027947e73f7f7559bd706faadad90e95
2014-12-12 20:49:00 +00:00
Bartosz Dziewoński 16e8255f69 Update VE core submodule to master (b5e2b87)
New changes:
96d0936 Mark primary buttons as progressive as well
68f184c Localisation updates from https://translatewiki.net.
b96c9dc [BREAKING CHANGE] Rename method cmpOffsetPaths to compareOffsetPaths
862f31d Convenience compareDocumentOrder method
b5e2b87 Update OOjs UI to v0.5.0

Local fixes to correct for breaking change I32608c7f in OOjs UI.

Change-Id: I64f5e2f6ccc0056bfa9eda5e65e87789b97b8ad5
2014-12-12 12:29:05 -08:00
Translation updater bot a423784963 Merge "Localisation updates from https://translatewiki.net." 2014-12-11 22:59:37 +00:00
jenkins-bot 87143d4c36 Merge "Mark primary buttons as progressive as well" 2014-12-11 22:59:04 +00:00
Translation updater bot a76f1eff93 Localisation updates from https://translatewiki.net.
Change-Id: I5061faa84a867f5ff99a871aab597280d048ab38
2014-12-11 23:57:57 +01:00
James D. Forrester 57a68d082b Mark primary buttons as progressive as well
Also make save button primary.

In anticipation of Iee91d2c6 in OOjs UI

Change-Id: I123044bfaba631866ad32a35643f23686a17a16f
2014-12-11 22:55:16 +00:00
jenkins-bot fcdae1deba Merge "Fix image alignment in media dialog search" 2014-12-11 22:25:46 +00:00
Moriel Schottlender fbb6cd92b4 Fix image alignment in media dialog search
Make the image results align to the full width of the dialog. This
fix uses dynamic values of the width of the container rather than
a hard-coded value so it should work properly on all themes.

Bug: T78050
Change-Id: I05bb0d8a8b13c246840382b12e098d0579180016
2014-12-11 17:15:25 -05:00
Ed Sanders 45518019eb Update VE core submodule to master (9ac8136)
New changes:
9929b6d [BREAKING CHANGE] Make ve.init.target an OO.ui.Element

Local changes:
* Fix target constructors now they generate this.$element

Change-Id: Ia6bf604c67305834a3f73863a10336cfbb83fa77
2014-12-11 14:00:28 -08:00
Ed Sanders d6067d5718 Update VE core submodule to master (cf1e167)
New changes:
776e801 Delimit text nodes in debug observations
72643bc Remove debug bar hiding now it is handled by the surface
cf1e167 [BREAKING CHANGE] Multiple surface support and demo

Local changes:
Account for detachable toolbars in core being setup in a different order.

Change-Id: I29156948711d55ba5f6dd4f6c35ca0e4cca32373
2014-12-11 12:49:29 -08:00
jenkins-bot 5a3c81db4f Merge "Surfaces should have parent document direction" 2014-12-11 19:04:13 +00:00
jenkins-bot eacb364ed1 Merge "Add timing data for the first transaction" 2014-12-11 03:06:14 +00:00
Roan Kattouw 49b26f886e Add timing data for the first transaction
This doesn't quite tell us about the user's first interaction with
VE (if they open a dialog, for instance, it could be minutes before
that results in a transaction), but it's a good start.

Bug: T76524
Change-Id: I6bac987332802d7363ed65a471b2b1ece67086d8
2014-12-11 03:02:11 +00:00
jenkins-bot 1aa30e0864 Merge "Update VE core submodule to master (3feadb2)" 2014-12-11 00:45:48 +00:00
jenkins-bot edf1ed3dbc Merge "Bump command help dialog height again" 2014-12-11 00:45:06 +00:00
Ed Sanders 34a82928c1 Update VE core submodule to master (3feadb2)
New changes:
fc4af20 Fix filibuster expansion bug
3feadb2 [BREAKING CHANGE] Refactor for multiple surfaces

Local changes:
* Use target.getSurface now that targets can have multiple surfaces
* Remove debug bar code now surfaces manage their own
* Remove import rules code now implemented in base target

Change-Id: I18d6f9f2f36431959d31347b4c1952a1aca1350e
2014-12-10 16:39:10 -08:00
Roan Kattouw e68dd9c7c1 Bump command help dialog height again
Change-Id: I348ce317b46f040bc8a2d70e4392ce0dfe24611c
2014-12-10 16:24:14 -08:00
Cmcmahon 122099fda8 [BrowserTest] issues with Chrome at SauceLabs causes test to fail
This is one of several VE tests that do not work well with older
versions of Chrome

Change-Id: Id7afc51689557d9e86e67a07dc840a8e6ca8303e
2014-12-10 15:00:05 -07:00
Moriel Schottlender e0894b807f Surfaces should have parent document direction
Make sure all surface widgets have documents that are initialized
with the direction of the parent document, so the alignment is set up
correctly.

Bug: T71969
Change-Id: I6e5f003e18a9c5808d9a4b148eddf0d0f7e29e67
2014-12-10 16:46:16 -05:00
Translation updater bot 70e8633c05 Localisation updates from https://translatewiki.net.
Change-Id: I3c4f3b3115aa8daa8b7fb3c4c800b4907e6fd564
2014-12-10 22:11:36 +01:00
jenkins-bot f51cc6f2ea Merge "ve.ui.MWParameter*: Use the destructive flag for all four remove buttons" 2014-12-10 02:04:33 +00:00
Roan Kattouw a032ea039e Move from legacy TimingData schema to new statsd API
This API doesn't have the ability to track any other data
in addition to a name and a duration in milliseconds, so
we add the target name ('mwTarget' or 'mobile') to the
event name and discard all other data.

Change-Id: I25ae0243f8983142d7755b65b05c18d5df36a253
2014-12-10 00:25:42 +00:00
jenkins-bot ed22cbffea Merge "Prefer localStorage to store ve-beta-welcome-dialog" 2014-12-09 22:39:09 +00:00
James D. Forrester eac5aabeb3 ve.ui.MWParameter*: Use the destructive flag for all four remove buttons
Previously we were only doing it for one of the four.

Bug: T78033
Change-Id: Ib0091052a5c858dfd37b8755b6e3b84406b7c745
2014-12-09 14:28:40 -08:00
Alex Monk 51b091b9cd Prefer localStorage to store ve-beta-welcome-dialog
Bug: 62884
Change-Id: I3fe45e890c29aaa8d28edfb6986dc8c7541861c7
2014-12-09 21:04:13 +00:00
Translation updater bot 2edf5a7104 Localisation updates from https://translatewiki.net.
Change-Id: Ifc36f5299dfc91692e2357cb4ba2c2909477e658
2014-12-09 21:59:30 +01:00
Roan Kattouw 29995d806b Remove IEHacks.css in favor of .ve-init-target-ie class
Move reference style hack to MWReferenceNode.css, and move
heading style hack to ve.init.mw.Target.css

Change-Id: Icbd53f8df998c9f7bcc701b7c29dc226dfc5c05f
2014-12-08 15:45:23 -08:00
Roan Kattouw 3321261e98 Split up ve.init.mw.ViewPageTarget.css
* Move styles that apply to all targets to ve.init.mw.Target.css
* Move styles for MWPopupTool subclasses to ve.ui.MWPopupTool.css

Change-Id: I34c8a6200ee337debf00c4e432948f1b86f1b60a
2014-12-08 15:42:19 -08:00
jenkins-bot 09bfc0cb9c Merge "Followup 1c04d32d: release saveDialog reference even if closed" 2014-12-08 23:06:37 +00:00
Roan Kattouw dad06ef495 Followup 1c04d32d: release saveDialog reference even if closed
It's good that we're not trying to close the save dialog
if it's not open, but we still need to release our reference
to it in that case, otherwise trying to open the save dialog
in a new incarnation of the editor will fail.

If you opened VE, opened the save dialog, closed it,
went back to read mode, opened VE again, and tried to open the
save dialog again, it would fail because it tried to open
the cached reference to the previous editor's save dialog.

Bonus: prevent JS errors in this case by only attaching an
onClose handler if the dialog actually opened successfully.
If opening the dialog failed, the callback parameter isn't
a promise but an OO.ui.Error, and calling .always() causes
a JS error.

Change-Id: I62d6d3e7cd3df2c29a0c99e2e23bf1aac5187a12
2014-12-08 14:49:39 -08:00
Translation updater bot 4c3a6e55ee Localisation updates from https://translatewiki.net.
Change-Id: I771f43da908ad0d352ff74c622dea4cbcbd2bb42
2014-12-08 23:24:37 +01:00
Cmcmahon 978308ee1f [BrowserTest] update Cite tests
Seems that a set of invisible textareas have appeared

Change-Id: I2ee81c782220c632393d2bbdc66ca66a5c8bf667
2014-12-08 10:43:35 -07:00
Translation updater bot 381c0bd5a0 Localisation updates from https://translatewiki.net.
Change-Id: I1ba254f3d7e22a6264703f65f7fa0f78b0a22ef9
2014-12-07 21:57:36 +01:00
jenkins-bot 9d1b8fdded Merge "Fix href parsing in transclusion nodes when on alternative (e.g. mobile) domains/paths" 2014-12-06 21:41:13 +00:00
Timo Tijhof ee954cbdd5 Use String#slice instead of discouraged String#substr
Aside from the confusion and differences between substr() and
substring() and IE8 bugs with substr(), substr() was removed from
the spec as of ECMAScript 5. It's been standardised in the
optional Annex B section of ES5.

Change-Id: I221ef6ae6956ce20dd9bb74510500f747d04c3b1
2014-12-06 21:26:20 +00:00
James D. Forrester baffe9d7e1 Update VE core submodule to master (32397d8)
New changes:
5e60f12 Ensure clipboard key is removed from paste target
32397d8 Update OOjs UI to v0.4.0

Local changes to compensate for new OOUI version, and updated wfUseMW call.

Change-Id: I005f7b23a36e04f1305d4aa037c19a5c7db9a699
2014-12-06 12:28:07 -08:00
Alex Monk fc6eaf6825 Don't re-enable apply changes in reference dialog if the changes have been undone
Per Roan on Ib5229bdc

Bug: T57976
Change-Id: I0450ab59ea8aa2e3130eb9124de74e67ffc0497f
2014-12-05 23:50:57 +00:00
jenkins-bot 7a0e11ed0c Merge "Disable Apply Changes in reference dialog until changes have been made" 2014-12-05 22:46:26 +00:00
Alex Monk a7b9b89479 Fix href parsing in transclusion nodes when on alternative (e.g. mobile) domains/paths
Use model HTMLDocument when parsing transclusion nodes and their link hrefs

As well as mobile, this also covers the issue I found in /w/index.php?veaction=edit

See also T76374

Bug: T76379
Change-Id: I07c9ba0adbcee32f7eb2ca280d3a1d46e963d28f
2014-12-05 22:23:09 +00:00
Translation updater bot a9e939649e Localisation updates from https://translatewiki.net.
Change-Id: I7dc624ec5d93b6ee5be968cd5d744e81f2e0dab9
2014-12-05 23:16:32 +01:00
Bartosz Dziewoński d39dfaa837 MWCategoryInputWidget: Don't explode on invalid titles
canonicalQueryValue can be null at this point, so let's not insert it
into an array that contains strings.

Bug: T76868
Change-Id: I8096a9c1017e883d28124bf807d2d375ae98452a
2014-12-05 21:07:57 +01:00
Alex Monk b0b53befdc Fix call to mw.log.warning
Should be mw.log.warn

Added by I111176b8

Change-Id: I58b78e89a7f5a21fe050e2a90bf856c388f7213d
2014-12-03 23:35:51 +00:00
Translation updater bot fd8f9463aa Localisation updates from https://translatewiki.net.
Change-Id: I9bcf93cd047e84c80a50d0ef34b7474bcdb6486f
2014-12-03 22:30:16 +01:00
James D. Forrester e722c1726f Update VE core submodule to master (0229301)
New changes:
5eb7294 Find and replace
123a6ad Find and replace tool
557f70f Go backwards through find and replace results on shift enter
4a4ed81 Allow language widget to filter on available languages

Local changes to adjust.

Change-Id: I15e14d6d3c7ee60e465baf3a4df7572851cbca3e
2014-12-03 10:36:39 -08:00
Roan Kattouw dbf232a7dc Clean up deactivate mess
Both onDocumentKeyDown and onViewTabClick would check
this.activating and invoke deactivate() differently depending
on its value. That's ugly, so incorporate the "don't show a dialog
if deactivating during activation" logic into deactivate() itself.

Rename the override parameter to noDialog, and fix the broken
logic around it (it overrode too much).

Also move setting this.activating = false; out of these event
handlers into cancel(), where it clearly belongs because
activatingDeferred is being rejected there.

Change-Id: I6c040c74d36f829128a175f00d4e712dd19d31a7
2014-12-02 16:50:36 -08:00
jenkins-bot 45e98c7699 Merge "Cancel VE when escape key pressed" 2014-12-03 00:33:19 +00:00
Alex Monk c0fd5e616d Cancel VE when escape key pressed
Or at least open the confirmation dialog about it.

Relies on I0047bd9d to not break stuff on the second try.

Bug: T52868
Change-Id: Id178a2a0aad2f4bf5f589d66efde61aaa6fae498
2014-12-02 16:29:15 -08:00
jenkins-bot 77b507dfc7 Merge "[Browsertest]Tests for options under Advanced Settings panel" 2014-12-02 23:03:37 +00:00
ryasmeen@wikimedia.org 416d62df4f [Browsertest]Tests for options under Advanced Settings panel
Change-Id: I21765e9e3d7a004d24dd620dd0da35978632d02a
2014-12-02 15:00:33 -08:00
jenkins-bot d7f954b1b5 Merge "Make LinkCache fail more gracefully when given undefined" 2014-12-02 22:45:08 +00:00
jenkins-bot 63e09d4659 Merge "Handle encoding of links in transclusion nodes properly when determining existence" 2014-12-02 22:22:15 +00:00