[MediaWiki-commits] [Gerrit] mediawiki...CodeEditor[master]: Simplify modeloading

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Simplify modeloading
..


Simplify modeloading

Analogous to I82d278920695be12aa80a79548abf8b8ce5445fd, make sure that
we can lazy load any language that Ace supports. Not because we need
it, but because it's the nicer way to do it.

Change-Id: I19b8a31041814ac1273d62a24b5ed622fd91a7a8
---
M extension.json
M modules/jquery.codeEditor.js
2 files changed, 8 insertions(+), 5 deletions(-)

Approvals:
  Alex Monk: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/extension.json b/extension.json
index e890a7e..ef0b047 100644
--- a/extension.json
+++ b/extension.json
@@ -78,7 +78,8 @@
"ace/mode-json.js",
"ace/mode-css.js",
"ace/mode-lua.js",
-   "ace/ext-language_tools.js"
+   "ace/ext-language_tools.js",
+   "ace/ext-modelist.js"
]
},
"ext.codeEditor.ace.modes": {
diff --git a/modules/jquery.codeEditor.js b/modules/jquery.codeEditor.js
index 5e661ae..43584c4 100644
--- a/modules/jquery.codeEditor.js
+++ b/modules/jquery.codeEditor.js
@@ -324,7 +324,7 @@
 * Sets up the iframe in place of the textarea to allow 
more advanced operations
 */
setupCodeEditor: function () {
-   var box, lang, basePath, container, editdiv, 
session, AceLangMode;
+   var box, lang, basePath, container, editdiv, 
session;
 
box = context.$textarea;
lang = mw.config.get( 
'wgCodeEditorCurrentLanguage' );
@@ -388,9 +388,11 @@
 
mw.hook( 'codeEditor.configure' ).fire( 
session );
 
-   ace.config.loadModule( 'ace/mode/' + 
lang, function () {
-   AceLangMode = ace.require( 
'ace/mode/' + lang ).Mode;
-   session.setMode( new 
AceLangMode() );
+   ace.config.loadModule( 
'ace/ext/modelist', function ( modelist ) {
+   if ( !modelist || 
!modelist.modesByName[ lang ] ) {
+   lang = 'text';
+   }
+   session.setMode( 'ace/mode/' + 
lang );
} );
 
// Use jquery.ui.resizable so user can 
make the box taller too

-- 
To view, visit https://gerrit.wikimedia.org/r/316949
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I19b8a31041814ac1273d62a24b5ed622fd91a7a8
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/CodeEditor
Gerrit-Branch: master
Gerrit-Owner: TheDJ 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Brion VIBBER 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...CodeEditor[master]: Simplify modeloading

[TheDJ (Code Review)]

TheDJ has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/316949

Change subject: Simplify modeloading
..

Simplify modeloading

Analogous to I82d278920695be12aa80a79548abf8b8ce5445fd, make sure that
we can lazy load any language that Ace supports. Not because we need
it, but because it's the nicer way to do it.

Change-Id: I19b8a31041814ac1273d62a24b5ed622fd91a7a8
---
M extension.json
M modules/jquery.codeEditor.js
2 files changed, 7 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CodeEditor 
refs/changes/49/316949/1

diff --git a/extension.json b/extension.json
index e890a7e..ef0b047 100644
--- a/extension.json
+++ b/extension.json
@@ -78,7 +78,8 @@
"ace/mode-json.js",
"ace/mode-css.js",
"ace/mode-lua.js",
-   "ace/ext-language_tools.js"
+   "ace/ext-language_tools.js",
+   "ace/ext-modelist.js"
]
},
"ext.codeEditor.ace.modes": {
diff --git a/modules/jquery.codeEditor.js b/modules/jquery.codeEditor.js
index 5e661ae..e639a73 100644
--- a/modules/jquery.codeEditor.js
+++ b/modules/jquery.codeEditor.js
@@ -388,9 +388,11 @@
 
mw.hook( 'codeEditor.configure' ).fire( 
session );
 
-   ace.config.loadModule( 'ace/mode/' + 
lang, function () {
-   AceLangMode = ace.require( 
'ace/mode/' + lang ).Mode;
-   session.setMode( new 
AceLangMode() );
+   ace.config.loadModule( 
'ace/ext/modelist', function ( modelist ) {
+   if ( !modelist || 
!modelist.modesByName[ lang ] ) {
+   lang = 'text';
+   }
+   session.setMode( 'ace/mode/' + 
lang );
} );
 
// Use jquery.ui.resizable so user can 
make the box taller too

-- 
To view, visit https://gerrit.wikimedia.org/r/316949
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I19b8a31041814ac1273d62a24b5ed622fd91a7a8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CodeEditor
Gerrit-Branch: master
Gerrit-Owner: TheDJ 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits