jenkins-bot has submitted this change and it was merged. Change subject: Update VE core submodule to master (bc4355a) ......................................................................
Update VE core submodule to master (bc4355a) New changes: fe0bc6c Move most of ve.js to ve.utils.js 6be79d9 Remove and restore selection for non-isolated dialogs 2bf123d Localisation updates from https://translatewiki.net. d2c4d18 Fix missed conversion of inlineMenuWidget to dropdownWidget in demos bc4355a Localisation updates from https://translatewiki.net. Local changes: * ve.utils.js updates Change-Id: Ibb7d7483b23edcccbd83dc8fadd4407dca380a25 --- M .docs/eg-iframe.html M VisualEditor.php M lib/ve 3 files changed, 15 insertions(+), 2 deletions(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/.docs/eg-iframe.html b/.docs/eg-iframe.html index e999e3f..738f904 100644 --- a/.docs/eg-iframe.html +++ b/.docs/eg-iframe.html @@ -100,6 +100,7 @@ <!-- visualEditor.base.build --> <script src="lib/ve/src/ve.js"></script> + <script src="lib/ve/src/ve.utils.js"></script> <script src="lib/ve/src/ve.track.js"></script> <script src="lib/ve/src/init/ve.init.js"></script> <script src="lib/ve/src/init/ve.init.Platform.js"></script> diff --git a/VisualEditor.php b/VisualEditor.php index 4c6741f..dd0d014 100644 --- a/VisualEditor.php +++ b/VisualEditor.php @@ -168,6 +168,7 @@ 'mediawiki.Uri', 'mediawiki.util', 'user.options', + 'ext.visualEditor.track', ), 'messages' => array( 'accesskey-ca-editsource', @@ -254,11 +255,21 @@ 'targets' => array( 'mobile' ), ), + 'ext.visualEditor.ve' => $wgVisualEditorResourceTemplate + array( + 'scripts' => 'lib/ve/src/ve.js', + 'targets' => array( 'desktop', 'mobile' ), + ), + + 'ext.visualEditor.track' => $wgVisualEditorResourceTemplate + array( + 'scripts' => 'lib/ve/src/ve.track.js', + 'dependencies' => 'ext.visualEditor.ve', + 'targets' => array( 'desktop', 'mobile' ), + ), + 'ext.visualEditor.base' => $wgVisualEditorResourceTemplate + array( 'scripts' => array( // ve - 'lib/ve/src/ve.js', - 'lib/ve/src/ve.track.js', + 'lib/ve/src/ve.utils.js', // init 'lib/ve/src/init/ve.init.js', @@ -273,6 +284,7 @@ 'oojs-ui', 'unicodejs', 'rangefix', + 'ext.visualEditor.ve', ), 'targets' => array( 'desktop', 'mobile' ), ), diff --git a/lib/ve b/lib/ve index bb67705..bc4355a 160000 --- a/lib/ve +++ b/lib/ve -Subproject commit bb67705b0287988fad49796f73ff6cad38b7fb78 +Subproject commit bc4355ad372401ad70bbe92aaab7415d25af78b6 -- To view, visit https://gerrit.wikimedia.org/r/171498 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibb7d7483b23edcccbd83dc8fadd4407dca380a25 Gerrit-PatchSet: 5 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Catrope <[email protected]> Gerrit-Reviewer: Jforrester <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
