From d1c24ce226e017664ad4705e602d405603286517 Mon Sep 17 00:00:00 2001 From: "James D. Forrester" Date: Thu, 6 Apr 2017 14:02:18 -0700 Subject: [PATCH] Update VE core submodule to master (da9c49395) New changes: dc0cad28c tests: Factor out ve.dm.TestRebaseClient/Server into their own files 98061108b Convert RebaseServer tests to data provider 3e746a51b Update OOjs to v2.0.0 16231a812 [BREAKING CHANGE] Drop support for Internet Explorer 9 64daeb4b5 Localisation updates from https://translatewiki.net. 3310e876c Update DOMPurify to 0.8.5 579033a83 Follow-up 16231a81: Drop IE9 support in createDocumentFromHtmlUsingIframe Bug: T162277 Change-Id: If17c6a3fac0920db29f80069f344ffd6be46c3c9 --- .jsduck/categories.json | 4 +++- extension.json | 6 ++++++ lib/ve | 2 +- .../init/targets/ve.init.mw.DesktopArticleTarget.init.js | 6 +----- .../init/targets/ve.init.mw.DesktopArticleTarget.test.js | 4 ++-- 5 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.jsduck/categories.json b/.jsduck/categories.json index 14a4ea97f3..24ca660fdf 100644 --- a/.jsduck/categories.json +++ b/.jsduck/categories.json @@ -193,7 +193,9 @@ "ve.QUnit", "ve.QUnit.assert", "ve.ce.TestOffset", - "ve.ce.TestRunner" + "ve.ce.TestRunner", + "ve.dm.TestRebaseClient", + "ve.dm.TestRebaseServer" ] } ] diff --git a/extension.json b/extension.json index f12b8b0a33..e6106df577 100644 --- a/extension.json +++ b/extension.json @@ -79,6 +79,12 @@ 12 ] ], + "msie": [ + [ + "<", + 10 + ] + ], "blackberry": null, "silk": null }, diff --git a/lib/ve b/lib/ve index 19a6c389cc..da9c49395a 160000 --- a/lib/ve +++ b/lib/ve @@ -1 +1 @@ -Subproject commit 19a6c389cce3f69bd629140a193d382af42868d8 +Subproject commit da9c49395a31736338875aef9cd94f204d7f821f diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js index 7a0c625a99..42992c88d3 100644 --- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js +++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js @@ -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 ) diff --git a/modules/ve-mw/tests/init/targets/ve.init.mw.DesktopArticleTarget.test.js b/modules/ve-mw/tests/init/targets/ve.init.mw.DesktopArticleTarget.test.js index 4e162bc738..1280ef7b4b 100644 --- a/modules/ve-mw/tests/init/targets/ve.init.mw.DesktopArticleTarget.test.js +++ b/modules/ve-mw/tests/init/targets/ve.init.mw.DesktopArticleTarget.test.js @@ -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: [] },