Commit graph

8071 commits

Author SHA1 Message Date
James D. Forrester 00145d495e Sync eg-iframe.html
Change-Id: I1ab760c9022108dfd3db1d078cf097fd2187e58b
2014-06-20 18:09:44 -07:00
jenkins-bot 839463f988 Merge "[BrowserTest] temporarily don't check for minor edit" 2014-06-20 22:43:52 +00:00
Cmcmahon 48189d9756 [BrowserTest] temporarily don't check for minor edit
The issue with the test user getting logged out unexpectedly
causes 'minor edit' to not appear.  The test still covers useful
features without this check.

Change-Id: If570d537824025100670e1195794efde17d5063f
2014-06-20 15:28:58 -07:00
Translation updater bot d33708cb2d Localisation updates from https://translatewiki.net.
Change-Id: I5fb330a1c0810712a95c9593c957ae6afd37797e
2014-06-20 19:52:36 +00:00
jenkins-bot 06e5cf0c02 Merge "Remove Math extension icon" 2014-06-19 22:48:15 +00:00
Ed Sanders 4b9c91f164 Fix fragment after inserting an image node
* Return the fragment as it may have been cloned in the process
* Do away with DM node tree traversal, we can do everything
  with offsets.

Bug: 65706
Bug: 65716
Change-Id: I9a44d562d9365d72adac199725b52555cf0a8009
2014-06-19 17:45:21 +01:00
Ed Sanders 258020506a Remove Math extension icon
Moved to Math extension with I33cdb6204.

Change-Id: Ic8074be25bb1ada3cbb97469781090cf3dd4445c
2014-06-19 12:37:01 +01:00
jenkins-bot bc13097d2e Merge "Update VE core submodule to master (1f16037)" 2014-06-19 02:36:57 +00:00
jenkins-bot 9e7c60a4e4 Merge "Revert "Update displaytitle on save (try #2)"" 2014-06-19 00:36:19 +00:00
Alex Monk f84b880a54 Revert "Update displaytitle on save (try #2)"
This reverts commit b7401f838b.

Didn't break everything, but we should probably avoid this getting deployed until I can work out wtf is going wrong with it.

Change-Id: I048143239e998b30aba79fa395a0af1cb06c6a9b
2014-06-19 00:34:26 +00:00
jenkins-bot a045e5723e Merge "[BrowserTest] page content element is normal again" 2014-06-18 23:49:43 +00:00
Cmcmahon 04242ddeac [BrowserTest] page content element is normal again
Change-Id: I520fecad63c2d7ea69ca668877af4f1d2e10acc2
2014-06-18 16:47:23 -07:00
jenkins-bot 29d5bf6e51 Merge "Update displaytitle on save (try #2)" 2014-06-18 23:41:29 +00:00
Moriel Schottlender 82745fed46 Insert images at the start of paragraphs
If a block image is inserted in the middle of a paragraph, insert
the image at its beginning so the paragraph isn't broken.

Bug: 65883
Change-Id: I7b82c647d259a6712a771bb4243b269ecbb73c9c
2014-06-18 19:27:08 -04:00
James D. Forrester 44d025a198 Update VE core submodule to master (1f16037)
New changes:
1f16037 Update OOjs UI to v0.1.0-pre (7a0e222a75)

Change-Id: Iaad40a5e0fb764450fccff9e94d7e83f07eced09
2014-06-18 16:26:09 -07:00
Alex Monk b7401f838b Update displaytitle on save (try #2)
This reverts commit 5565ccca54.

I have no idea what is going wrong on deployment-prep to cause
the error in bug 66792. Let's try to find out.

Bug: 50341
Change-Id: I5041de838128bb55c57baddae01cdcb263626537
2014-06-19 00:04:51 +01:00
Ed Sanders c0bd7487f5 Fix selection after inserting nodes
Some surface fragment methods return a clone, so make sure
that is written back to this.fragment in dialogs, as this.fragment.select()
is called on teardown.

Functionally depends on If26cc0a2d in core.

Bug: 65706
Bug: 65716
Change-Id: Ia552b2a4c4c59ffc308a4acdecac78a7803a1c1f
2014-06-18 22:45:52 +00:00
Ed Sanders d505cc3763 Update VE core submodule to master (8809237)
Fix tests to include new insertion operation properties.

New changes:
afbd97e Localisation updates from https://translatewiki.net.
d90c212 [BREAKING CHANGE (ish)] Track original data position in insertion operations

Change-Id: Iac86f212bdb78f47f49c6984affe88feaf786765
2014-06-18 15:42:13 -07:00
jenkins-bot f8dbe1878c Merge "Show wikitext warnings in the reference and media caption dialogs" 2014-06-18 21:00:29 +00:00
Krenair 143c21999e Port MWSaveDialog to use ActionDialog
Relies on Id17d150d

Change-Id: I80dd89fa7ad55daa3ae7e9c01c4a78f6e54105ca
2014-06-18 20:43:45 +00:00
jenkins-bot c92285e75f Merge "Revert "Update displaytitle on save"" 2014-06-18 20:23:35 +00:00
Catrope 5565ccca54 Revert "Update displaytitle on save"
Causing HTTP 500 errors in ApiVisualEditorEdit.php (calling
getDisplayTitle() on a non-object).

This reverts commit dedc89b5ff.

Bug: 66792
Change-Id: Iaf438660f0623dc05f76294ad847b2fc5e25bed6
2014-06-18 20:21:10 +00:00
Translation updater bot 27f40dceed Localisation updates from https://translatewiki.net.
Change-Id: Id3c8cc5e54442ea50eb00b3aa6506235bc9a7225
2014-06-18 20:01:21 +00:00
James D. Forrester d15be3eb8e Update VE core submodule to master (33b43ec)
New changes:
8b51398 Catch rangy exception thrown in FF
69b2b72 Remove old, unused version of rangy
355be3e Prevent getOffset from return an offset inside a content node

Change-Id: Ib669b4fa03d253f8fcb42917d0c2a7e634d43a9f
2014-06-18 11:12:32 -07:00
Krenair 046979ae80 Show wikitext warnings in the reference and media caption dialogs
Bug: 56213
Change-Id: I9da0ae627a990864cc8b9466d97c4419f315f65e
2014-06-18 16:12:02 +00:00
jenkins-bot dc81adeb36 Merge "Update displaytitle on save" 2014-06-18 02:23:28 +00:00
jenkins-bot e9ad209592 Merge "Add more authors from git shortlog -s -n" 2014-06-18 02:14:59 +00:00
Roan Kattouw d9ae4447cf Update VE core submodule to master (52dc4e8)
New changes:
8420735 Test cases for annotating handles own children nodes
a3395ae Improve equalRange assertion and use in more places
52ee587 Block item drag and drop
dfe6d9f Drag and drop of arbitrary selections
11ffd9a Defer focusableNode selection fix until after native selection change

Change-Id: Iffebd8c7e8fbb7c17e25984d69e692b0c0980950
2014-06-17 18:47:44 -07:00
jenkins-bot f2c7788522 Merge "Use registered target, instead of ve.init.Target" 2014-06-18 01:45:01 +00:00
jenkins-bot 66834d2e97 Merge "Revert "Media search dialog: Only try to abort request if possible"" 2014-06-18 01:36:17 +00:00
Krinkle d16c615bb2 Revert "Media search dialog: Only try to abort request if possible"
Per bug 59604. The TypeError isn't coming from calling ".abort". That
method is always there and part of every jqXHR object, always.

This reverts commit c5dbc13c65.

Change-Id: I43bb53d8c98ca83688020c029d9a3db2c34d54ee
2014-06-18 01:34:15 +00:00
jenkins-bot 115c1b6be9 Merge "Remove display:inline-block highlight hacks" 2014-06-17 23:27:10 +00:00
Ed Sanders b7343b5e07 Update VE core submodule to master (4c599b0)
Fix ContentBranchNode tests for getClientRects change.

New changes:
9bbd259 Create highlight elements on demand
a711c6d Indent demo HTML
b1b6562 Use cached surfaceView
d4b48b1 Replace <cite> with <span rel="ve:Alien">
ee5b697 Shields are dead, long live getClientRects
4c599b0 Remove repositionOnly argument from update

Change-Id: Ifa65c46d09864f214ece9349b990f7d8c07d416b
2014-06-17 16:18:29 -07:00
jenkins-bot 970a39e74b Merge "Insert inline image inside list to the existing paragraph" 2014-06-17 19:49:36 +00:00
Ed Sanders c70d32c017 Use registered target, instead of ve.init.Target
Depends on I468d4eb4 in core.

Uses various hacks to trick the test runner into thinking
an MW target is in use, when in fact we still use SA targets.

Change-Id: If4611307d5d7aaee4af84f86ef82faf9078043b6
2014-06-17 20:41:01 +01:00
jenkins-bot 5c68803a58 Merge "Media search dialog: Only try to abort request if possible" 2014-06-17 17:29:56 +00:00
jenkins-bot f4bc61d9ee Merge "Followup 00af434: only tear down debug bar if it exists" 2014-06-17 17:19:37 +00:00
Krenair c5dbc13c65 Media search dialog: Only try to abort request if possible
Sometimes we have to load images in a way that we can't abort.
In that case, don't bother trying to abort, it just creates annoying console
messages.

Bug: 59604
Change-Id: Idb675f57284d9ffa1fe69c87806009a31711dabe
2014-06-17 17:07:00 +00:00
Cmcmahon d0ad8076a9 [BrowserTest] new locator for page content after Save
Change-Id: I1f9f9542cc5c7da40f0e219ccc393255f2233535
2014-06-17 06:59:01 -07:00
Roan Kattouw ee1bea701e Followup 00af434: only tear down debug bar if it exists
Bug: 66692
Change-Id: I3ec8cf9579da785327abbab5dd3618bb3f20895f
2014-06-16 15:54:12 -07:00
Ed Sanders 00af43495b Update VE core submodule to master (155f4ab)
Use new setupToolbar and setupDebugbar methods in base target.

New changes:
7ff523d Localisation updates from https://translatewiki.net.
3815224 [BREAKING CHANGE] Debug bar refactor
155f4ab Edit HTML mode in demo

Change-Id: I554ce51eae872ab0f741a913bf10394c2a8c3e52
2014-06-16 14:52:48 -07:00
jenkins-bot e085a963ea Merge "Update VE core submodule to master (89820e5)" 2014-06-16 20:11:29 +00:00
Ed Sanders 0688aa7b02 Update VE core submodule to master (89820e5)
Remove clickable node mixins.

New changes:
65e2e22 [BREAKING CHANGE] Make all focusable nodes clickable

Change-Id: I24403e12621e5b789e0b8c99f54f1d1b8fa802cc
2014-06-16 12:59:37 -07:00
Translation updater bot 142ba6a53e Merge "Localisation updates from https://translatewiki.net." 2014-06-16 19:58:04 +00:00
Translation updater bot ebafa4b5b3 Localisation updates from https://translatewiki.net.
Change-Id: I9bd537c311bc5d3c003d98550f1d907fb8091dd8
2014-06-16 19:56:42 +00:00
Roan Kattouw ac8bf28677 Update VE core submodule to b16dbb52
New changes:
c5d2909 Fix alien demo
c5fe8d7 Alien node styling
25c791a Localisation updates from https://translatewiki.net.
ff326d4 Localisation updates from https://translatewiki.net.
230800c Localisation updates from https://translatewiki.net.
91ec366 Remove margins from paragraphs inside table cells
fe72fdc Localisation updates from https://translatewiki.net.
97edf35 Fix shield CSS broken by Parsoid styles
21cddae Trigger endRelocation on focusable drag end
05d7d00 Revert "Fix shield CSS broken by Parsoid styles"

Change-Id: Ie33e187dfdacebb0dc399fbd1d78953cde72cc90
2014-06-16 12:46:17 -07:00
jenkins-bot ea9d65653e Merge "Don't use jQuery show() or toggle()" 2014-06-16 19:11:03 +00:00
Ed Sanders c761a20cef Don't use jQuery show() or toggle()
These set display explicitly to block, which overrides the CSS
style of display: table-caption.

Change-Id: Id987d6e8da9c875a120a4f07560fa8a97bef10b6
2014-06-16 20:05:36 +01:00
Ed Sanders 15bbcc6d63 Remove display:inline-block highlight hacks
With getClientRects these are no longer necessary.

Depends on I09f1c0850 in core.

Bug: 51708
Change-Id: I7e6c6528f4dd23aee7fa61ecb38eb658e11a8356
2014-06-16 11:52:37 +01:00
Translation updater bot bd97d0bd3d Localisation updates from https://translatewiki.net.
Change-Id: I098dbf6f5aa8000b05e8481f151578b8b425a0e5
2014-06-15 19:54:17 +00:00