jenkins-bot has submitted this change and it was merged.
Change subject: DesktopArticleTarget.init: Don't overwrite mw.libs.ve
......................................................................
DesktopArticleTarget.init: Don't overwrite mw.libs.ve
Extend it instead, if it already exists.
Bug: T107979
Change-Id: I70bce7c82dce8199cfe36f810629c5d22b583f0a
(cherry picked from commit ef2d23c36a2a5e085f83ee217bb209553c017c87)
---
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
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 527c15a..357ce10 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
@@ -574,7 +574,7 @@
// Most of mw.libs.ve is considered subject to change and private. The
exception is that
// mw.libs.ve.isAvailable is public, and indicates whether the VE
editor itself can be loaded
// on this page. See above for why it may be false.
- mw.libs.ve = init;
+ mw.libs.ve = $.extend( mw.libs.ve || {}, init );
if ( init.isAvailable && userPrefEnabled ) {
$( 'html' ).addClass( 've-available' );
--
To view, visit https://gerrit.wikimedia.org/r/229976
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I70bce7c82dce8199cfe36f810629c5d22b583f0a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: wmf/1.26wmf17
Gerrit-Owner: Krinkle <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
