Merge "Update VE core submodule to master (da9c49395)"

This commit is contained in:
jenkins-bot 2017-04-10 16:49:13 +00:00 committed by Gerrit Code Review
commit c0361ab40e
5 changed files with 13 additions and 9 deletions

View file

@ -193,7 +193,9 @@
"ve.QUnit",
"ve.QUnit.assert",
"ve.ce.TestOffset",
"ve.ce.TestRunner"
"ve.ce.TestRunner",
"ve.dm.TestRebaseClient",
"ve.dm.TestRebaseServer"
]
}
]

View file

@ -79,6 +79,12 @@
12
]
],
"msie": [
[
"<",
10
]
],
"blackberry": null,
"silk": null
},

2
lib/ve

@ -1 +1 @@
Subproject commit 19a6c389cce3f69bd629140a193d382af42868d8
Subproject commit da9c49395a31736338875aef9cd94f204d7f821f

View file

@ -3,14 +3,12 @@
*
* This file must remain as widely compatible as the base compatibility
* for MediaWiki itself (see mediawiki/core:/resources/startup.js).
* Avoid use of: ES5, SVG, HTML5 DOM, ContentEditable etc.
* Avoid use of: SVG, HTML5 DOM, ContentEditable etc.
*
* @copyright 2011-2017 VisualEditor Team and others; see AUTHORS.txt
* @license The MIT License (MIT); see LICENSE.txt
*/
/* eslint-ecmaVersion 3 */
/**
* Platform preparation for the MediaWiki view page. This loads (when user needs it) the
* actual MediaWiki integration and VisualEditor library.
@ -138,8 +136,6 @@
} );
// Add modules specific to desktop (modules shared between desktop
// and mobile are already added by TargetLoader)
// Note: it's safe to use .forEach() (ES5) here, because this code will
// never be called if the browser doesn't support ES5
[ 'ext.visualEditor.desktopArticleTarget' ]
// Add requested plugins
.concat( plugins )

View file

@ -18,7 +18,7 @@ QUnit.test( 'compatibility', function ( assert ) {
{
msg: 'IE9',
userAgent: 'Mozilla/5.0 (Windows; U; MSIE 9.0; Windows NT 9.0; en-US)',
matches: []
matches: [ 'blacklist' ]
},
{
msg: 'IE10',
@ -146,7 +146,7 @@ QUnit.test( 'compatibility', function ( assert ) {
matches: [ 'blacklist' ]
},
{
msg: 'Opera 12',
msg: 'Opera 12.16',
userAgent: 'Opera/9.80 (Windows NT 5.1) Presto/2.12.388 Version/12.16',
matches: []
},