Commit graph

7050 commits

Author SHA1 Message Date
jenkins-bot 1c84584d50 Merge "Clarified the default link for image insertion." 2014-03-17 18:44:58 +00:00
C. Scott Ananian 0128db1dec Clarified the default link for image insertion.
Bug: 61560
Bug: 49844
Change-Id: Iab37caf1b34906b9bb1be241aa869bd2d4877907
2014-03-17 14:38:29 -04:00
cmcmahon f0731084da [browser test] add when_present to link header check
I was surprised to find this missing, this was a mistake that
causes bogus failures

Change-Id: Iab38ef4db315993ca1f31c079f17be22ebf17d3c
2014-03-17 11:37:36 -07:00
cmcmahon 0a2f97d3b9 [browser test] dismissing beta 10X is overkill
Change-Id: Ic674bcb53d54948d6beb58338cbef030fc3e524f
2014-03-17 11:29:37 -07:00
jenkins-bot 99ece6e6d0 Merge "Re-sync toolbarGroups for MWMediaEdit and MWReference dialogs" 2014-03-17 17:23:37 +00:00
James D. Forrester 5e4af875c1 Update VE core submodule to master (aaad03a)
Also update ContentBranchNode test for changes in VE core

New changes:
bdf9a9f Merge two Properties blocks in DesktopContext
d3c22bb Make ContentBranchNode echo suppression work in CBNs that contain inline nodes
aaad03a Localisation updates from https://translatewiki.net.

Change-Id: I3e1757b42307c3bd52ba0571068eb1c6bfb5ab89
2014-03-16 16:53:53 -07:00
Translation updater bot 7821eb7bd3 Localisation updates from https://translatewiki.net.
Change-Id: Id1b163bd4eeaac35a61102c43c11c77cddfa65af
2014-03-15 20:13:20 +00:00
James D. Forrester b68c8d3819 Re-sync toolbarGroups for MWMediaEdit and MWReference dialogs
Change-Id: Ic42a57e0e7a1639242092dbe41e13c1b8586f841
2014-03-14 17:01:44 -07:00
jenkins-bot 7d90204b9b Merge "Rerun grunt to regenerate eg-iframe.html" 2014-03-14 22:54:32 +00:00
jenkins-bot fbdc55dc78 Merge "Table of contents widget" 2014-03-14 22:31:10 +00:00
Roan Kattouw 6b22f272e9 Rerun grunt to regenerate eg-iframe.html
Change-Id: I5f0d03407eadcdb811281b1406fe664d280504c3
2014-03-14 15:28:29 -07:00
Rob Moen eba7d58dd1 Table of contents widget
TOC Widget is created in the mw target view class.
Adding and removing a heading rebuilds the TOC Widget based
on the the order of the page heading nodes.

TOC Widget considers TOC page settings and displays in the default manor
unless forced or disabled.

TOC Widget still needs to be finalized by being placed in the surface.
This could be a problem until we have a CE node for it to live in or
have some DM work added.  Roan and I have discussed how to go forward.

To enable the widget you must add the following to LocalSettings.php:
$wgVisualEditorEnableTocWidget = true;

Change-Id: I488cfbbdb060e50d81f51e0f757e67d0114b8936
2014-03-14 15:20:19 -07:00
James D. Forrester 7f088cbc60 Update VE core submodule to master (cd00a93)
New changes:
a651f19 Style MobileContext as a dropdown drawer
cd00a93 Bring back localOverlayMenus, but only in DesktopSurface

Change-Id: Iec87b5b48f5441ef4ceec5a6e20fd4d407e18f60
2014-03-14 13:48:29 -07:00
Trevor Parscal 42ba981e27 Update VE core submodule to master (520299e)
New changes:
dd15f23 Split ve.ui.Surface into DesktopSurface and MobileSurface
16283f4 Add OOjs UI's sco.json i18n file
ef94038 Split ve.ui.Context into DesktopContext and MobileContext

Minor adjustments to point to desktop and mobile Surface or Context.

Change-Id: I7cf6f99a5a1216a28a7146afcd4deb68c7eac38e
2014-03-14 13:13:02 -07:00
James D. Forrester ae06f75a76 Replace semicolon with full-stop in two messages
This should make them more readable and consistent with other messages.

Change-Id: I0a26e0e784a37bce58751359cc48dff660d7737d
2014-03-14 11:44:28 -07:00
James D. Forrester 9d7eeddb7c Update VE core submodule to master (07923f7)
New changes:
05f775d Update OOjs UI to v0.1.0-pre (46ccd5b3a7)
2fc4673 Localisation updates from https://translatewiki.net.
07923f7 Update OOjs UI to v0.1.0-pre (ac0cc69508)

Change-Id: I7a959bc500a7dbf69305985de43b7814cd010838
2014-03-14 11:24:30 -07:00
James D. Forrester ba71dadd26 Add new ve.dm.CommentMetaItem.js to .docs/eg-iframe.html
Change-Id: I31906c45356820591cbedf1ab0111706dd109575
2014-03-13 15:49:20 -07:00
jenkins-bot e4904071cb Merge "Fix regression bug 'default size' change on alignment" 2014-03-13 21:09:18 +00:00
jenkins-bot 49bf9b3595 Merge "[browser test] Navigate different path through template" 2014-03-13 17:10:03 +00:00
cmcmahon 5da22148e8 [browser test] Navigate different path through template
Change-Id: I8f16353c6493ddac41b0856b4909c29a595f48d7
2014-03-13 10:06:57 -07:00
Translation updater bot 49aa7a7c0f Merge "Localisation updates from https://translatewiki.net." 2014-03-13 15:50:52 +00:00
Translation updater bot f362141f33 Localisation updates from https://translatewiki.net.
Change-Id: I6eb2a1a6e36fa63c6ec2616b540f1402c922675d
2014-03-13 15:46:43 +00:00
cmcmahon 806f29a79b [browser test] "Apply changes" is now "Insert template"
Change-Id: I2aaa88ade12a9f68d65b2025c79c93840177670c
2014-03-13 07:55:16 -07:00
Moriel Schottlender 1948ed8403 Fix regression bug 'default size' change on alignment
* Corrected the condition that set default size only if the image
  wasn't smaller than the default.
* Added a couple of sanity check conditions for the OO.Compare
  condition

Bug: 62586
Bug: 62581
Change-Id: I4db996cec33ac9d53ef485b53568100e3912c4ae
2014-03-13 00:00:46 -04:00
jenkins-bot 4c67908f97 Merge "Create remaining meta items in DM" 2014-03-13 02:12:52 +00:00
James D. Forrester e85d840d64 Create remaining meta items in DM
Add meta items for the four remaining mwPageProp behavioural flags from Parsoid
that are added by MediaWiki core. These are each waiting for UX implementation,
based on the lack of context information in MWMetaDialog about the page, or
about the wiki:

* __NOGALLERY__
* __HIDDENCAT__

  — These only make sense in a Category: page.

* __NOTITLECONVERT__ // __NOTC__
* __NOCONTENTCONVERT__ // __NOCC__

  — These only make sense on wikis that have content or title conversion.

Change-Id: I752705f65cfbd79c7f3f71270659793996868aff
2014-03-13 01:57:48 +00:00
jenkins-bot 3316a0ac62 Merge "Add createSurface() to Target" 2014-03-13 00:57:58 +00:00
jenkins-bot 5825389447 Merge "Fix JS error trying to access this.saveDialog from switch to source mode code path" 2014-03-13 00:56:09 +00:00
jenkins-bot 3a378ccc6c Merge "More gracefully handle situations where Parsoid returns a timeout failure code (HTTP 504)" 2014-03-13 00:54:29 +00:00
Krenair e04099b63d More gracefully handle situations where Parsoid returns a timeout failure code (HTTP 504)
Bug: 50475
Change-Id: I36d0dc2c44a509d4e40ecadcfb5e3df81e01bca9
2014-03-13 00:44:39 +00:00
jenkins-bot af41547327 Merge "Adding a comment explaining where the i18n messages are" 2014-03-13 00:43:57 +00:00
kaldari 0c870e10ce Adding a comment explaining where the i18n messages are
Change-Id: I0e01f8d21575ffaa77bac0d79dc1f5e1c2883438
2014-03-12 17:41:42 -07:00
James D. Forrester da5d8847ea Make the reference dialog medium, not large
Change-Id: Iada77f7f61ee70a33c77f25b34a2cb6e612da6a6
2014-03-12 17:38:05 -07:00
Roan Kattouw aae2fb09de Actually make the save dialog grow when showing a diff
There was code doing it, but its effects were undone by a switch-case fall-through.

Change-Id: I59abc1bbbf086eb29bda86f15bfac3acec3b0950
2014-03-12 17:31:02 -07:00
James D. Forrester 744886ac1a Re-sort the i18n files alphabetically
Change-Id: Icbe7b26bf3a6d59e40113675bbae88d32a5b2460
2014-03-13 00:18:34 +00:00
James D. Forrester e68e93ed59 Make references list dialog small, and vary 'insert' vs. 'apply' button text
Change-Id: I4bbe60ae6a978e73ca55bf55cddbdaca05c56414
2014-03-12 17:01:03 -07:00
jenkins-bot b13844b051 Merge "Add fallback template description with link to template page" 2014-03-12 23:25:23 +00:00
jenkins-bot 13811925b9 Merge "Update VE core submodule to master (8c017ae)" 2014-03-12 23:23:22 +00:00
Trevor Parscal ba2e316964 Add fallback template description with link to template page
Shown when there's no template data.

Someday in the future, we will support adding a description inline. Not
yet. Calm down.

Change-Id: I18c0a591b60de53bc124d82c688d71d30ad1d5dd
2014-03-12 23:21:29 +00:00
jenkins-bot 85b4f8c063 Merge "Keep label and disabled state of transclusion dialog apply button in sync" 2014-03-12 23:21:27 +00:00
Roan Kattouw 0072aeb9a1 Update VE core submodule to master (8c017ae)
Also update VE-MW for the comment changes in VE core

New changes:
4ad6a3d Add text direction to SA demo
89503e8 ve.ce.Node: Emphasise slug transition with increasing outline offset
864046e Update oojs to v1.0.8
65d1338 Localisation updates from https://translatewiki.net.
b66d482 Stop special-casing comments and recognize them as tagName='#comment' instead
09dda12 ve.ce.getDomText: Document node types and use .data instead of .nodeValue
b0a3b2a Make ve.dm.Converter assertions actually display message
ef791cc Make 'comment' its own metaitem type
d5ef0d7 ve.dm.Converter: Refer to nodes instead of elements where appropiate
c22c8af Fix JS error when pressing Enter with selection across multiple paragraphs
a26a708 Add ve.dm.Transaction.newFromReplacement
a9e136e Don't cause needless surface refreshes on overwriting.
6fd35ee Split part of getOpeningHtmlTag out to getHtmlAttributes
2c31f67 ve.ce.Surface: Document version number in focus workaround for Opera
e069e74 Add some more characters to the special character inserter

Change-Id: I859805fb261468e8fae9454c4992115369066b49
2014-03-12 16:15:54 -07:00
Timo Tijhof 37277c762f ve.ui.MWPopupTool: Simplify code complexity
* Add class to items container right at creation time.
* Do handling for individual items when we have a reference to the
  item. No need to query for children() afterwards.

Change-Id: I7f5eda3d514da6d7a931bc31090a08b1937ed3e7
2014-03-12 22:13:45 +00:00
Timo Tijhof 5f64ed64d8 mw.Target: Add class "mw-ve-editNotice" to edit notices
Follows-up I260059802379 which removed got rid of
the "ve-init-mw-viewPageTarget-toolbar-editNotices-notice" class
from notices and didn't add something generic in its place.

(There is "ve-ui-mwNoticesPopupTool-item" but that's more an
internal class we don't want gadgets and wiki stylesheets to
rely on.)

Bug: 43013
Change-Id: I8e1e383c2cb3199fe78f45f4feaa24a44126cf0b
2014-03-12 23:07:39 +01:00
Trevor Parscal 91f38fdaf2 Keep label and disabled state of transclusion dialog apply button in sync
* Use "Insert template" when adding a single template
* Use "Insert transclusion" when adding a multi-part template
* Use "Apply changes" when working with an existing tranclusion
* Use "Loading..." and disable while waiting for template data
* Disable when the transclusion has only a template placeholder

Bug: 50998
Change-Id: Ib2fb3d8711ed6d3ef41cc0db55740c95394dd3f9
2014-03-12 14:56:26 -07:00
jenkins-bot d91a8b21f5 Merge "Enable VisualEditor by default in NS_USER as well as $wgContentNamespaces" 2014-03-12 21:39:32 +00:00
Timo Tijhof c3f6a2f561 mw.ViewPageTarget: Tag our state changes and reject foreign states
Store a bit of data with the states we push or replace in the
history so that when the user navigates back to them, we know
for sure this is a state we pushed in the history.

This allows us to filter out popstate events triggered by the
user browsing to states create by other software, as well as
states triggered by the browser that have no state data at all
(Chrome is known to, in contrast with other browsers, trigger a
blank popstate event on load, which we were mistaking for a user
event where the user navigates back to veaction=edit).

Bug: 57901
Change-Id: I142777d0d2ae96d3afee224782f0d2d1522da1eb
2014-03-12 22:26:52 +01:00
Roan Kattouw 7cdaa2a290 Fix JS error trying to access this.saveDialog from switch to source mode code path
The switch to source mode code path was causing onSerializeComplete to
be called, which accesses this.saveDialog because it assumes it's being
called from onSaveDialogReview.

In fact, onSaveDialogReview was calling it twice, once as the callback
it passes to serialize() and once in response to the serializeComplete
event. Cleaned this up by renaming the function and removing the
event binding, so it's now only called once and only for reviewing
changes to new pages, not in the switch to source mode code path.

Bug: 62544
Change-Id: I86eea57806a20408c8dc89a234c39cae1d969bca
2014-03-12 12:05:02 -07:00
jenkins-bot 9eea7240b7 Merge "Rename 'wasve' parameter to 'veswitched'" 2014-03-12 18:14:12 +00:00
jenkins-bot 8d46c0230f Merge "Fix fatal when user switches from VE to the old editor and makes a null edit" 2014-03-12 18:12:37 +00:00
jenkins-bot 38d16152d1 Merge "Deal with images whose size is smalled than default" 2014-03-12 18:10:50 +00:00