Commit graph

7381 commits

Author SHA1 Message Date
jenkins-bot eacf5e2ce5 Merge "ve.dm.MWImageNode: Fix indentation" 2015-02-17 16:12:26 +00:00
Ed Sanders b9addfc1da ve.dm.MWImageNode: Fix indentation
Change-Id: Ice223d19904f02709a64799cc6b81f8718a92a40
2015-02-17 16:10:33 +00:00
jenkins-bot 06e2ff3d0d Merge "[BrowserTest] Add parentheses to regexp parameters" 2015-02-17 15:13:36 +00:00
jenkins-bot a02e5d362a Merge "[BrowserTest] Fix ParenthesesAsGroupedExpression Rubocop failures" 2015-02-17 15:11:55 +00:00
jenkins-bot a1d337406a Merge "[BrowserTest] Remove an empty line to make Rubocop pass" 2015-02-17 14:19:52 +00:00
jenkins-bot 94e2bf3618 Merge "ce.MWTransclusionNode: Protect against race condition in GCN rendering" 2015-02-17 13:11:41 +00:00
Amir E. Aharoni efc8d0bcbd [BrowserTest] Add parentheses to regexp parameters
This fixes the AmbiguousRegexpLiteral Rubocop offenses.

Change-Id: Ief9e5e4904637b2cc863e7fd99404e0630fe0de3
2015-02-17 13:24:59 +02:00
Amir E. Aharoni 26763e7731 [BrowserTest] Fix ParenthesesAsGroupedExpression Rubocop failures
Change-Id: I7a6fbe0aefdd9abe3b0e7c42cc372487255f581b
2015-02-17 13:24:52 +02:00
Amir E. Aharoni 5a715d05ad [BrowserTest] Remove an empty line to make Rubocop pass
Change-Id: I110fef0f98ee7a2c5b74971b1e068bca0869e912
2015-02-17 10:20:12 +00:00
Amir E. Aharoni c37fe8fe5e [BrowserTest] Move screenshot taking functionality to a gem
* Screenshot taking logic and rspec tests are deleted from this repo
  and moved to
  https://rubygems.org/gems/screenshot
* Dependency on chunky_png is removed from VisualEditor
  (and added to the screenshot gem).
* The method calls are renamed accordingly.

Change-Id: I6a0e2cc770a07f36f63bc536db109b63d38a4fd2
2015-02-17 09:57:44 +00:00
Roan Kattouw ee886cd8f8 ce.MWTransclusionNode: Protect against race condition in GCN rendering
If an MWTransclusionNode is inserted, then immediately modified,
a race condition can occur where the GCN rendering arrives for the old
node, which is already detached and doesn't have a ModelHtmlDocument
any more. Protect against this happening so we don't cause a JS error
by passing null for the document parameter to ve.resolveUrl()

Change-Id: I1964baa3a9b294b130620e9b34a695584fc55143
2015-02-16 19:21:00 -08:00
jenkins-bot 13a978d413 Merge "Correct the license URL in the media dialog" 2015-02-16 23:29:08 +00:00
Moriel Schottlender a06df576b3 Correct the license URL in the media dialog
The license url read the response object instead of the response
value itself.

Bug: T89544
Change-Id: Ibb22e47e0097e012279e21211e1c7e2f1545f2b1
2015-02-16 14:49:12 -08:00
Translation updater bot e12431efbf Localisation updates from https://translatewiki.net.
Change-Id: I234c89aa7c844f248f30bd531a3688bbcee9bbe3
2015-02-16 21:58:33 +01:00
Roan Kattouw 9a4c192c44 Update VE core submodule to master (f86c97c)
New changes:
e325520 Create APIResultsProvider and APIResultsQueue and add tests
4ead645 Make newFromAnnotation test construct doc2 from data, not HTML
804fb17 Remove useless getDataElementFromDomElement / getDomElementsFromDataElement tests
c2fc6a0 DomFromModelTest: Call modify() on the document, not the data
1535331 Inline ve.ce.View#renderAttributes

Local changes:
Update modify callbacks to work on document instead of data.

Change-Id: Ia875d11627adc38f78dd5010f9ab03e8b083b448
2015-02-16 11:44:34 -08:00
Ed Sanders 7ff516d76c Fix clipboard DM for transclusion nodes starting with invisible tags
<link> and <meta> tags are thrown away by the clipboard so make sure the
data-mw element is converted to a span.

Bug: T86401
Change-Id: Ia2869b9496ea5ce4f474e254bb4125f85152c7cf
2015-02-16 16:52:07 +00:00
Ed Sanders ec4acecf33 Correctly tag clipboard DM from MWTransclusionNodes
Iff in clipboard mode:
* Set data-ve-no-generated-contents on the main element
  regardless of whether we are using orignal DOM elements.
* Set data-ve-ignore on siblings, again, regardless or
  where they came from.

Bug: T89658
Change-Id: I82ad60f0b90e0c6ce88c42737bd36d1a289bcf34
2015-02-16 16:52:04 +00:00
jenkins-bot f64b977eeb Merge "Rename test modules to stop confusing QUnit" 2015-02-14 00:23:04 +00:00
Roan Kattouw 3528aeb8d3 Rename test modules to stop confusing QUnit
Some modules had the same name as test modules in VE core,
and this broke expand/collapse behavior in QUnit.

Change-Id: I7fd0b454b3377b7c289ddebbf91146fcbe5945c4
2015-02-13 16:12:03 -08:00
Translation updater bot dd599c5ae3 Localisation updates from https://translatewiki.net.
Change-Id: I7740a73a2a5b1efbfb99d5abf73ef13a85fb5850
2015-02-13 22:23:04 +01:00
jenkins-bot e738abff3f Merge "Move svgMaxSize and namespacesWithSubpages to site config" 2015-02-13 18:44:25 +00:00
Moriel Schottlender d1ff9e125e Make sure category widget methods call parent class methods
Mouseover and click events in the category widget should also call
their parent method.

Depends on the ooui change Ie576f4422

Change-Id: I73b574b28a5a60e4f046f3008407dbf4b1323b58
2015-02-13 18:29:20 +00:00
Timo Tijhof 5bf0ac251a Move svgMaxSize and namespacesWithSubpages to site config
These are currently in page-specific mw.config. As these are
not related any page, they should be in the global export.

This is needed to have our tests (and code base) run error-free
without a MediaWiki page.

Bug: T89434
Change-Id: Ic42bcd14028772ff0c06e28c76ffaf156f8b985f
2015-02-13 08:20:26 +00:00
Translation updater bot d5530b87ff Localisation updates from https://translatewiki.net.
Change-Id: I3bf03d302d3731c98ce7f0c94a534e4f7510f231
2015-02-12 21:37:41 +01:00
Cmcmahon df1013b7da [BrowserTest] Remove unused steps and locators
No more iframes

Change-Id: I3d6420f2a017a132d5695921daa5efb5117f3176
2015-02-12 11:53:58 -07:00
Cmcmahon 5d03721bb7 [BrowserTest] Update transclusion test for better locator
Also remove unused step and element

Change-Id: If99cde6a3ec1f0fb87628e5d8600a83034e11ee1
2015-02-12 11:27:40 -07:00
Cmcmahon 7d3e8a8ac5 [BrowserTest] Cite message no longer in iframe
Change-Id: I027bf87c0eb91edb7dc6218c3bc8f66a8c1aa69e
2015-02-12 10:54:02 -07:00
jenkins-bot eaddd87020 Merge "Defend against empty file pages in media dialog search" 2015-02-12 17:01:23 +00:00
Trevor Parscal a65148d69e Update VE core submodule to master (9240a51)
New changes:
50ccb23 Localisation updates from https://translatewiki.net.
9240a51 Update OOjs UI to v0.7.0

Local changes:
* MWTemplateDialog: Stop waiting for removed loading promise to
  finish, as in OOjs UI I2bfa013 the loading promise is removed
  since iframes were the only reason we needed it.

Change-Id: I1500f480d40d06e417366014b9c2a76f7ce9c29b
2015-02-11 16:50:45 -08:00
Moriel Schottlender 65d0a9d7e7 Defend against empty file pages in media dialog search
Empty file pages are returned as results in search but have no
useful information, and, more importantly, no 'imageinfo' property.
Make sure these are skipped by the provider.

Bug: T89303
Change-Id: I3374f7373efc1f5751acb16819973594abf56a56
2015-02-11 23:23:38 +00:00
jenkins-bot 0d3bd68431 Merge "Display image uploader and artist correctly in the media dialog" 2015-02-11 21:50:17 +00:00
jenkins-bot 57bffa14c6 Merge "Support specifying reference contents with data-mw.body.id" 2015-02-11 20:18:11 +00:00
Moriel Schottlender a3973145d5 Display image uploader and artist correctly in the media dialog
Add the display for the actual uploader, and change the label
for the artist to "Artist" for differentiating the two roles.

Bug: T88835
Change-Id: Ie939572e7c1240321556f6f81ed9e67d792a339d
2015-02-11 11:14:43 -08:00
Ed Sanders 2b48c4991e Fix DOM structure on setup/teardown
* Ensure that the toolbar remains inside the target so that
  target triggers still work
* To keep the page title beneath the toolbar, move it inside
  the target on setup, and restore it on teardown
* Have teardownToolBar/DebugBar return promises so we know
  when teardown is completely finished.

Change-Id: If2a9ce9a653aed51d21c8e8dd7795f2533d54f70
2015-02-10 16:59:43 -08:00
jenkins-bot 7ac177c02e Merge "Template dialog: Disable 'Apply changes' until a change is made" 2015-02-10 23:17:01 +00:00
jenkins-bot 01d64773ae Merge "[BrowserTest] Bring references test up to date." 2015-02-10 23:01:06 +00:00
Cmcmahon 924e738652 [BrowserTest] Bring references test up to date.
This addresses some old technical debt.

We also shifted the re-use reference test to the cite.feature where
it belongs in the current architecture.

Paired with Rummana for the update

Change-Id: Ie50ac5bffec0d0ab6bcad704c323639f8e8553f0
2015-02-10 15:57:44 -07:00
jenkins-bot ae155b3616 Merge "Use ve.ui.AlignWidget in media dialog" 2015-02-10 22:51:10 +00:00
Translation updater bot 7a29587a6c Localisation updates from https://translatewiki.net.
Change-Id: Icda658e25c2db1066a7633a2551f87db7097fcba
2015-02-10 22:17:32 +01:00
Ed Sanders d6818c558d Use ve.ui.AlignWidget in media dialog
Change-Id: I70579971a22c5bfee1e373b57ba7fe24a46ef406
2015-02-10 10:49:53 +00:00
jenkins-bot 31e4fbec90 Merge "[BrowserTest] Update the definition of formula_image element" 2015-02-10 09:41:30 +00:00
ryasmeen@wikimedia.org 0245af2047 [BrowserTest] Fix only Media Test
The media test was passing against garbage wikitext markup match.
Fixed the steps so that it fails when it should.

Change-Id: I3d8dbc959c6244968dd9ac58af663b81cb115dc6
2015-02-09 15:41:42 -08:00
jenkins-bot 94f581b04f Merge "Update VE core submodule to master (83a526a)" 2015-02-09 20:55:42 +00:00
Roan Kattouw 26e5a885bc Support specifying reference contents with data-mw.body.id
If data-mw.body.html is not set, search for the element
whose ID matches data-mw.body.id and use its contents.

.body.html is still used for new content: new references
use .body.html, and if a reference using .body.id is
changed, the changed HTML is output in .body.html.

Bug: T88650
Change-Id: I5d614927256d59a3ab20b0bd6e882b5cb8fcda20
2015-02-09 20:54:50 +00:00
Translation updater bot a7faafda0e Localisation updates from https://translatewiki.net.
Change-Id: Iad86b251f2c6077be11060ba6976dffe2b01f84e
2015-02-09 21:38:24 +01:00
Roan Kattouw 396eb606a6 Update VE core submodule to master (83a526a)
New changes:
23a9e11 Localisation updates from https://translatewiki.net.
9f1350f Update UnicodeJS to v0.1.3
f869803 Localisation updates from https://translatewiki.net.
ce11fb3 Use css class rather than jQuery show/hide
0d4584c Fix definition of ve.Range#containsRange
8a5c7d9 Fix rangeInsideOneLeafNode
8ce5f60 Localisation updates from https://translatewiki.net.
d2104aa Track originalHtml in internalItems
9823624 Localisation updates from https://translatewiki.net.

Local changes:
Update tests for internalItem originalHtml change

Bug: T88650
Change-Id: Ie7532cade7e3006e1bf39c12c97962da415ab993
2015-02-09 11:29:43 -08:00
Cmcmahon 3db521ce41 [BrowserTest] make References test pass
Somehow the Insert element got removed from the page object. Fixeded.

Change-Id: I970d4824ebeed817f621b09714e0d58d99bee573
2015-02-09 10:36:44 -07:00
Cmcmahon 18679b74ba [BrowserTest] Make media tests pass
Like in the Cite tests, need a sleep to make the tests pass
locally.

Updated a locator also

Change-Id: Idd962e110fd7191325bdac7e641960858de1db9e
2015-02-09 10:24:12 -07:00
Cmcmahon dd671b4843 [BrowserTest] update Cite test to pass
I'm hoping the sleep() calls here are temporary. VE seems to be
loading an intermediate page before showing the diff view, or
sending an invalid onload event or some such.

Also updated the locator for the Basic text input

Change-Id: I73795f6b1ff0da42f8afd92598ab6786c9a0b88b
2015-02-09 10:00:41 -07:00
Translation updater bot b5fa02b843 Localisation updates from https://translatewiki.net.
Change-Id: I810b5128799e416aabde17769fa2f7bdaa03bb57
2015-02-08 21:50:43 +01:00