wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-11-12 09:09:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Allow AceEditorWidget to accept autocomplete word list"

Browse source
This commit is contained in:
jenkins-bot 2017-01-12 02:00:14 +00:00 committed by Gerrit Code Review
parent 46c01316c5 fc61fb9be0
commit a4543a7336
1 changed files with 24 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
modules/ve-mw/ui/widgets/ve.ui.MWAceEditorWidget.js
View file

@ -27,12 +27,15 @@
* @cfg {string} [autocomplete='none'] Symbolic name of autocomplete * @cfg {string} [autocomplete='none'] Symbolic name of autocomplete
* mode: 'none', 'basic' (requires the user to press Ctrl-Space) or * mode: 'none', 'basic' (requires the user to press Ctrl-Space) or
* 'live' (shows a list of suggestions as the user types) * 'live' (shows a list of suggestions as the user types)
* @cfg {Array} [autocompleteWordList=null] List of words to
* autocomplete to
*/ */
ve.ui.MWAceEditorWidget = function VeUiMWAceEditorWidget( config ) { ve.ui.MWAceEditorWidget = function VeUiMWAceEditorWidget( config ) {
// Configuration // Configuration
config = config || {}; config = config || {};
this.autocomplete = config.autocomplete || 'none'; this.autocomplete = config.autocomplete || 'none';
this.autocompleteWordList = config.autocompleteWordList || null;
this.$ace = $( '<div dir="ltr">' ); this.$ace = $( '<div dir="ltr">' );
this.editor = null; this.editor = null;
@ -99,7 +102,9 @@ ve.ui.MWAceEditorWidget.prototype.teardown = function () {
* @fires resize * @fires resize
*/ */
ve.ui.MWAceEditorWidget.prototype.setupEditor = function () { ve.ui.MWAceEditorWidget.prototype.setupEditor = function () {
var basePath = mw.config.get( 'wgExtensionAssetsPath', '' ); var completer, widget = this,
basePath = mw.config.get( 'wgExtensionAssetsPath', '' );
if ( basePath.slice( 0, 2 ) === '//' ) { if ( basePath.slice( 0, 2 ) === '//' ) {
// ACE uses web workers, which have importScripts, which don't like relative links. // ACE uses web workers, which have importScripts, which don't like relative links.
basePath = window.location.protocol + basePath; basePath = window.location.protocol + basePath;
@ -109,10 +114,28 @@ ve.ui.MWAceEditorWidget.prototype.setupEditor = function () {
this.$input.addClass( 'oo-ui-element-hidden' ); this.$input.addClass( 'oo-ui-element-hidden' );
this.editor = ace.edit( this.$ace[ 0 ] ); this.editor = ace.edit( this.$ace[ 0 ] );
this.setMinRows( this.minRows ); this.setMinRows( this.minRows );
// Autocompletion
this.editor.setOptions( { this.editor.setOptions( {
enableBasicAutocompletion: this.autocomplete !== 'none', enableBasicAutocompletion: this.autocomplete !== 'none',
enableLiveAutocompletion: this.autocomplete === 'live' enableLiveAutocompletion: this.autocomplete === 'live'
} ); } );
if ( this.autocompleteWordList ) {
completer = {
getCompletions: function( editor, session, pos, prefix, callback ) {
var wordList = widget.autocompleteWordList;
callback( null, wordList.map( function( word ) {
return {
caption: word,
value: word,
meta: 'static'
};
} ) );
}
};
ace.require( 'ace/ext/language_tools' ).addCompleter( completer );
}
this.editor.getSession().on( 'change', this.onEditorChange.bind( this ) ); this.editor.getSession().on( 'change', this.onEditorChange.bind( this ) );
this.editor.renderer.on( 'resize', this.onEditorResize.bind( this ) ); this.editor.renderer.on( 'resize', this.onEditorResize.bind( this ) );
this.setEditorValue( this.getValue() ); this.setEditorValue( this.getValue() );