Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/276795
Change subject: Ace should use its own require method
......................................................................
Ace should use its own require method
Rather than assuming window.require is available whenever requiring
code in Ace it should use its own method defined at ace.require
Relying on window.require or require is not advisable.
It's hard to tell which of these are external libraries that we need
to upstream these changes to.
Bug: T127643
Change-Id: Iba7ff9705d75880b01bd49cb6cd53eeaab907f13
---
M modules/ace/ext-language_tools.js
A modules/ext.codeEditor.ace.js
M modules/jquery.codeEditor.js
3 files changed, 5 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CodeEditor
refs/changes/95/276795/1
diff --git a/modules/ace/ext-language_tools.js
b/modules/ace/ext-language_tools.js
index 33b886b..8a5a4d4 100644
--- a/modules/ace/ext-language_tools.js
+++ b/modules/ace/ext-language_tools.js
@@ -1,5 +1,6 @@
define("ace/snippets",["require","exports","module","ace/lib/oop","ace/lib/event_emitter","ace/lib/lang","ace/range","ace/anchor","ace/keyboard/hash_handler","ace/tokenizer","ace/lib/dom","ace/editor"],
function(require, exports, module) {
"use strict";
+var require = ace.require;
var oop = require("./lib/oop");
var EventEmitter = require("./lib/event_emitter").EventEmitter;
var lang = require("./lib/lang");
@@ -1932,6 +1933,6 @@
});
});
(function() {
- window.require(["ace/ext/language_tools"], function() {});
+ ace.require(["ace/ext/language_tools"], function() {});
})();
\ No newline at end of file
diff --git a/modules/ext.codeEditor.ace.js b/modules/ext.codeEditor.ace.js
new file mode 100644
index 0000000..fd4131b
--- /dev/null
+++ b/modules/ext.codeEditor.ace.js
@@ -0,0 +1 @@
+require = null;
diff --git a/modules/jquery.codeEditor.js b/modules/jquery.codeEditor.js
index 54ea498..b5224cb 100644
--- a/modules/jquery.codeEditor.js
+++ b/modules/jquery.codeEditor.js
@@ -389,7 +389,7 @@
mw.hook( 'codeEditor.configure' ).fire(
session );
ace.config.loadModule( 'ace/mode/' +
lang, function () {
- AceLangMode = require(
'ace/mode/' + lang ).Mode;
+ AceLangMode = ace.require(
'ace/mode/' + lang ).Mode;
session.setMode( new
AceLangMode() );
} );
@@ -486,7 +486,7 @@
nextAnnotation,
delayedUpdate,
editor = context.codeEditor,
- lang = require( 'ace/lib/lang' ),
+ lang = ace.require( 'ace/lib/lang' ),
$errors = $( '<span
class="codeEditor-status-worker-cell ace_gutter-cell ace_error">0</span>' ),
$warnings = $( '<span
class="codeEditor-status-worker-cell ace_gutter-cell ace_warning">0</span>' ),
$infos = $( '<span
class="codeEditor-status-worker-cell ace_gutter-cell ace_info">0</span>' ),
--
To view, visit https://gerrit.wikimedia.org/r/276795
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iba7ff9705d75880b01bd49cb6cd53eeaab907f13
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CodeEditor
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
