Commit graph

7675 commits

Author SHA1 Message Date
Timo Tijhof 486e9cbbed grunt: Run grunt-build as part of grunt-test and grunt-watch
Especially the latter is nice, but might as well run it as part
of test.

Change-Id: I77b9e6be3adc57565390c9881165b462f0f34b56
2014-04-04 13:48:00 -07:00
Translation updater bot 2fb6b5662c Localisation updates from https://translatewiki.net.
Change-Id: I4b2ba5709553ad9bb5442d5fc238185ec28ea1a2
2014-04-04 20:26:09 +00:00
James D. Forrester a29e447e1c Update VE core submodule to 58c01b5
New changes:
58c01b5 Fix debug bar margins

Change-Id: I07ef4d9da5c325bd7a9918bcd1738f80bafe39ba
2014-04-04 12:33:48 -07:00
jenkins-bot b71e58c0f7 Merge "Give the edit tab <li> closest to the collapsed tabs menu class=collapsible" 2014-04-04 19:32:21 +00:00
jenkins-bot aeb4fabd2d Merge "Fix order of start and base timestamps when switching to the wikitext editor" 2014-04-04 19:31:58 +00:00
jenkins-bot 0610e7718d Merge "[browser test] maintenance, locator changed" 2014-04-04 19:31:07 +00:00
cmcmahon 9f57feff2f [browser test] maintenance, locator changed
Change-Id: I9d9f410afe6d4fd90489ba7816b9c0dec92460b0
2014-04-04 11:51:30 -07:00
James D. Forrester 33e21197ca Update VE core submodule to master (7f97fd8)
New changes:
7f97fd8 Update OOjs UI to v0.1.0-pre (eaa1b7f06d)

Change-Id: Icd448a81fe6330e264de58f3f1a83b7bd36339d2
2014-04-04 10:41:51 -07:00
Trevor Parscal 9556467595 Revert edit mode tool's onSelect method
Turns out surfaces don't have access to targets after all.

Bug: 63503
Change-Id: Ib14291ce4efe4b3dd5579cd270828936b6a175ae
2014-04-04 00:04:29 +00:00
Krenair 9dac9f2c04 Fix order of start and base timestamps when switching to the wikitext editor
These were backwards which was triggering edit conflict detection for all users.

Fortunately for logged in users, if Revision::userWasLastToEdit was given a bad
timestamp (e.g. when we submitted here), it would just return true, suppressing
the conflict. It always showed a conflict for anonymous users however.

Bug: 56835
Change-Id: Ib07f965238ca96e17bf59b34da8a8e789954da61
2014-04-03 23:06:41 +01:00
Translation updater bot f7067dca44 Localisation updates from https://translatewiki.net.
Change-Id: Ic032f178137196b0186ceb9682d7c3e2db12e234
2014-04-03 19:47:40 +00:00
Krenair e3b7827c44 Give the edit tab <li> closest to the collapsed tabs menu class=collapsible
Bug: 50225
Change-Id: Ib2e6237483338c8072d5f7919c6459bf7418946a
2014-04-03 02:16:13 +01:00
Ed Sanders 391e247c90 Show the debug bar in MW if ve.debug is set
Depends on Ide1487250e in core.

Change-Id: Ia31e498b565c4db79026e0e40f515a2b65bbbde2
2014-04-02 17:33:29 -07:00
Roan Kattouw 1a092a604e Update VE core submodule to master (8dd6a63)
New changes:
acdd445 Minor documentation fixes
79cd956 Update OOjs to v1.0.9
d5c53e1 Restore selection after ListAction too
4df22a0 Separate out debug bar for use outside the demo

Change-Id: Iba582a7f1027172828a7cf88976d1d37d05cd7e7
2014-04-02 17:33:29 -07:00
Trevor Parscal 793fbb0e24 Correctly insert or update citations based on template option
When using a tool that opens a citation or citation transclusion dialog,
the dialog shouldn't use edit mode unless the template in the node and the
template the tool would insert match.

Bug: 63452
Change-Id: I34a5a2da576247f4046da45f742bccc3cec22c5a
2014-04-02 16:38:34 -07:00
Roan Kattouw 03c5822b6b Update VE core submodule to master (c5f4f78)
Also update tools for changes in VE core.

New changes:
e4de14b Make tools use commands
e029817 Make getToolsForNode place primary commands first

Change-Id: I66575ee6d49e6b2f5a5f789978da98bb55e6dc5e
2014-04-02 16:30:12 -07:00
Roan Kattouw 39f8019c47 Update VE core submodule to master (9484b81)
New changes:
b045c0c Localisation updates from https://translatewiki.net.
3221c45 Introduce ve.ui.Tool
c3a2a85 Detect document focus properly and allow null selection in model
03fed20 Localisation updates from https://translatewiki.net.
07dfc7d Actually use getRelative[Content|Structural]Offset wrappers
8fced5f Show VE demo error in VE
547e3d2 Localisation updates from https://translatewiki.net.
d6316f5 Fix handlesOwnChildren check in getRelativeOffset
e23f1ab Style link inspector on mobile
5968559 Localisation updates from https://translatewiki.net.
4bce90c Bump jscs to 0.4.1
7e39f49 Disable certain tools when surface has no range
edde8ca Emit event when insertion annotations change
2a89173 Update OOjs UI to v0.1.0-pre (8986c46d35)
103c4b9 Support null ranges in the demo debug bar
9eb3810 Adjust loop counters in word break detection when removing item
914e002 Skip over handlesOwnChildren nodes in newFromAnnotation
ef6096a Improve hasFocus check to compare the anchorNode to the parent
18171bf Revert "Improve hasFocus check to compare the anchorNode to the parent"
3950cef Revert "Detect document focus properly and allow null selection in model"
1c4cac4 Revert "Fix handlesOwnChildren check in getRelativeOffset"

Change-Id: Ic3054c668866307a5cfbb74f23efd82ceb2f0ee3
2014-04-02 16:15:01 -07:00
cmcmahon 85abbf7b4e [browser test] extend timeout waiting for edit surface to appear
Bug 63447

Change-Id: I0be4142817251147400ea34ebdb04bba760f2161
2014-04-02 14:37:46 -07:00
Translation updater bot b677d97069 Localisation updates from https://translatewiki.net.
Change-Id: I0e2a93f0ee66f7ab625295179a71e43c10c6e20b
2014-04-02 19:15:31 +00:00
James D. Forrester 66d8fc9d9f Add missing VE core themes/apex/ve.ui.Inspector.css to .docs/eg-iframe.html
Follows-up I4af6c0341.

Change-Id: Ia0d2c22aa647ea1ee6cca8a38d99a8eb14aa3c87
2014-04-01 23:23:32 +00:00
jenkins-bot 68157a195e Merge "Bump jscs to 0.4.1" 2014-04-01 23:22:13 +00:00
Ed Sanders 803a6aff9c Convert double quotes to single quotes in VisualEditor.php
Change-Id: I5ed5624a15606616bf596e56153a69e8c85a700a
2014-04-01 14:54:35 -07:00
James D. Forrester bf9f17d9b9 Bump jscs to 0.4.1
Change-Id: I12f65f48ea86b2496de295be1b61d69d3c727d2a
2014-04-01 14:39:03 -07:00
Translation updater bot 700850150f Localisation updates from https://translatewiki.net.
Change-Id: I51371fb8ddfe773b91f58be80dbf071fc568ec7e
2014-04-01 19:53:37 +00:00
Trevor Parscal 9e38cafc9f Remove constructive flag from return to save form button
It doesn't create anything, so it shouldn't be constructive.

Change-Id: I97d6fc3c5f992033e55ee6cde48245b1e96ddc16
2014-03-31 15:31:43 -07:00
Translation updater bot 9c7c75851e Localisation updates from https://translatewiki.net.
Change-Id: I2f51ea9f1cd6d32d5124c5e732619528f8463355
2014-03-31 20:18:09 +00:00
Translation updater bot ea6b563036 Localisation updates from https://translatewiki.net.
Change-Id: Ife10e6bf2b80daed9e9f6b71be79a7812a1e51ea
2014-03-30 20:16:19 +00:00
Translation updater bot d57207abe4 Localisation updates from https://translatewiki.net.
Change-Id: Icbaa80974a70e6456c51940a6a60aef423710820
2014-03-29 21:20:19 +00:00
James D. Forrester f1471a59f3 MWMediaSearchWidget: Bump media search result size to 20
At 15 the new, taller dialog means we never get to search for more…

Change-Id: I255d93b8230f962579e1a07840b7cc209577876b
2014-03-29 00:08:59 +00:00
jenkins-bot cd391966de Merge "Update VE core submodule to master (e972bb7)" 2014-03-28 20:13:44 +00:00
James D. Forrester e56b425120 Update VE core submodule to master (e972bb7)
New changes:
e972bb7 Split-up theme-specific styles

Local changes:
* Split-up theme-specific styles

Change-Id: I4af6c03413d49cb05031d439caf340ddef996355
2014-03-28 12:56:19 -07:00
Translation updater bot 63506cc9c9 Merge "Localisation updates from https://translatewiki.net." 2014-03-28 19:42:57 +00:00
Translation updater bot 90d7f62722 Localisation updates from https://translatewiki.net.
Change-Id: I68c366d30386faadca1de6d7442a2bb398c88a41
2014-03-28 19:41:28 +00:00
jenkins-bot 7a3c4ecaaa Merge "Rename CSS file to relate to actual style names" 2014-03-28 18:58:52 +00:00
Trevor Parscal 7e80d5dfa8 Rename CSS file to relate to actual style names
Change-Id: Iece39a7cb34ea4a51e5aba10df60ea870bf912f8
2014-03-28 11:56:02 -07:00
James D. Forrester 6acac41490 Update VE core submodule to master (5a86ff9)
New changes:
6b1d082 Update OOjs UI to v0.1.0-pre (e9e435be5e)
24eec6f Fix ClickableNode documentation comment to add a missing period
d2fb10f Localisation updates from https://translatewiki.net.
5a86ff9 Update OOjs UI to v0.1.0-pre (23fb1b6144)

Change-Id: I167138e92ca502ca198692fcdd443b42d19ec1f0
2014-03-27 14:51:28 -07:00
Translation updater bot bd00517709 Localisation updates from https://translatewiki.net.
Change-Id: I0481610b68222928b745b664edd6c90d9748b03f
2014-03-27 20:33:09 +00:00
jenkins-bot 797430e9ef Merge "Kill $wgVisualEditorEditNotices" 2014-03-27 18:34:39 +00:00
cmcmahon c83ef84cdc [browser test] updates for no beta warning to dismiss
See https://gerrit.wikimedia.org/r/#/c/119217/

Change-Id: If3b6f7c9b9a7ce3a4d4c5d8b822d123b50d3c106
2014-03-27 17:24:12 +01:00
Roan Kattouw c06a86587c Deal with Parsoid's protocol-relative <base> tags in a DOMParser world
Protocol-relative <base> tags are fine when the iframe trick is used
because the iframe inherits a default base URL from the parent document,
so if the <base> is relative it can be resolved against that. However,
a document created with DOMParser (or document.implementation, oops!)
won't inherit anything, so anything other than a fully absolute <base>
will just break.

To make Parsoid's relative <base> work anyway, resolve it in the
context of the main document, then write the resolved version
back into the <base> tag.

Change-Id: I7261bd5dbe9ec1f4077a4e5a00bd2a03ac237ca0
2014-03-26 21:56:23 -07:00
James D. Forrester c149b1c071 Update VE core submodule to master (9c19df0)
New changes:
0318f64 Fix copyright year range for one file not updated to 2011-2014
4dbd57e Add <base> for relative URLs in tests
554cde9 Localisation updates from https://translatewiki.net.
c32448a Update OOjs UI to v0.1.0-pre (1c7875205a)
8f675c8 Localisation updates from https://translatewiki.net.
4fb929c Add a <base> to every test document by default
09c404c Protect against invalid/absent <base> in ve.resolveUrl()
05924db Use DOMParser in ve.createDocumentFromHtml() if available
9c19df0 Update OOjs UI to v0.1.0-pre (e697490c9b)

Local changes:
Use ve.dm.example.base for link tests in mwExample

Change-Id: I384e2a2edeebe9379de4910889a61670d9f734f5
2014-03-26 21:33:52 -07:00
jenkins-bot b55d28bd24 Merge "Show blockedtext message in edit notices" 2014-03-26 23:02:24 +00:00
jenkins-bot fc5b995ee9 Merge "Hack around Parsoid's href prefixing in rendering new links" 2014-03-26 22:56:02 +00:00
jenkins-bot 50f9f2b983 Merge "Fix copyright year range for fourteen files not updated to 2011-2014" 2014-03-26 22:55:08 +00:00
jenkins-bot 464064e14d Merge "Switch Beta Features hook to use new ltr/rtl screenshot style" 2014-03-26 22:54:33 +00:00
jenkins-bot 927d24968d Merge "Make cite transclusion tools actually work" 2014-03-26 22:48:54 +00:00
Trevor Parscal ca95923d73 Make cite transclusion tools actually work
The transclusion tools shown in the toolbar in the reference dialog
passed a template to open with to the transclusion dialog, but it
didn't take that config parameter.

Moved this parameter up from CitationDialog to TransclusionDialog,
and moved its logic into the setup function.

Bug: 63037
Change-Id: I9249c845a5ae7cca2ec4d75d69e1236f7755d246
2014-03-26 22:42:30 +00:00
Roan Kattouw c0f47ec725 Bring CommandHelpDialog CSS back
It was renamed but the new file was never added to VisualEditor.php?!?

Bug: 63018
Change-Id: I057992f1a4245d7b2bb5be6f3923414013746760
2014-03-26 15:32:29 -07:00
Krenair f1afe2fb48 Kill $wgVisualEditorEditNotices
Global that isn't used outside of this function.

Change-Id: Ie967523df5d61491e0042ed159c59e45439bf19e
2014-03-26 22:23:58 +00:00
jenkins-bot d9741aef73 Merge "Update use of newarticletext for added parameter" 2014-03-26 22:00:43 +00:00