wikimedia/mediawiki-extensions-CodeEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/CodeEditor synced 2024-11-23 23:03:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Simplify modeloading"

Browse source
This commit is contained in:
jenkins-bot 2016-10-25 14:06:04 +00:00 committed by Gerrit Code Review
parent db2e20c7c7 c9d4d7663e
commit 99e6e25826
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
extension.json
View file

@ -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": {

10
modules/jquery.codeEditor.js
View file

@ -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