jenkins-bot has submitted this change and it was merged. Change subject: AceEditorWidget: Use namespaced 'require' ......................................................................
AceEditorWidget: Use namespaced 'require' The un-namespaced version will soon be removed to fix RL issues. Bug: T127643 Change-Id: Iaf4ed23d88cb955b8f8f61725f9effa6180de5bf (cherry picked from commit 5d5d5419c6e40c922760a42034e9cbd59515fea3) --- M modules/ve-mw/ui/widgets/ve.ui.MWAceEditorWidget.js 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWAceEditorWidget.js b/modules/ve-mw/ui/widgets/ve.ui.MWAceEditorWidget.js index 72ce4f6..53694aa 100644 --- a/modules/ve-mw/ui/widgets/ve.ui.MWAceEditorWidget.js +++ b/modules/ve-mw/ui/widgets/ve.ui.MWAceEditorWidget.js @@ -4,7 +4,7 @@ * @copyright 2011-2016 VisualEditor Team and others; see http://ve.mit-license.org */ -/* global ace, require */ +/* global ace */ /** * Text input widget which use an Ace editor instance when available @@ -319,6 +319,8 @@ ve.ui.MWAceEditorWidget.prototype.setLanguage = function ( lang ) { var widget = this; this.loadingPromise.done( function () { + // TODO: Just use ace.require once T127643 is resolved + var require = ace.require || require; widget.editor.getSession().setMode( 'ace/mode/' + ( require( 'ace/mode/' + lang ) ? lang : 'text' ) ); } ); return this; -- To view, visit https://gerrit.wikimedia.org/r/277283 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iaf4ed23d88cb955b8f8f61725f9effa6180de5bf Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: wmf/1.27.0-wmf.16 Gerrit-Owner: Jforrester <[email protected]> Gerrit-Reviewer: Esanders <[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
