wikimedia/mediawiki-extensions-CodeMirror
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/CodeMirror synced 2024-11-24 06:13:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Fix cursor position after extension loads"

Browse source
This commit is contained in:
jenkins-bot 2017-09-26 00:55:25 +00:00 committed by Gerrit Code Review
parent ae0077b8f8 e1eaac762d
commit 3f226d7223
1 changed files with 25 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
resources/ext.CodeMirror.js
View file

@ -328,23 +328,34 @@
* Enables or disables CodeMirror
*/
function switchCodeMirror() {
var scrollTop,
var selectionObj,
selectionStart,
selectionEnd,
scrollTop,
hasFocus,
$textbox1 = $( '#wpTextbox1' );
if ( codeMirror ) {
scrollTop = codeMirror.getScrollInfo().top;
selectionObj = codeMirror.doc.listSelections()[ 0 ];
selectionStart = codeMirror.doc.indexFromPos( selectionObj.head );
selectionEnd = codeMirror.doc.indexFromPos( selectionObj.anchor );
hasFocus = codeMirror.hasFocus();
setCodeEditorPreference( false );
codeMirror.save();
codeMirror.toTextArea();
codeMirror = null;
$.fn.textSelection = origTextSelection;
if ( hasFocus ) {
$textbox1.focus();
}
$textbox1.prop( 'selectionStart', selectionStart );
$textbox1.prop( 'selectionEnd', selectionEnd );
$textbox1.scrollTop( scrollTop );
} else {
scrollTop = $textbox1.scrollTop();
// eslint-disable-next-line no-use-before-define
enableCodeMirror();
setCodeEditorPreference( true );
codeMirror.scrollTo( 0, scrollTop );
}
updateToolbarButton();
}
@ -355,13 +366,16 @@
function enableCodeMirror() {
var config = mw.config.get( 'extCodeMirrorConfig' );
if ( codeMirror ) {
return;
}
mw.loader.using( config.pluginModules, function () {
var $codeMirror,
$textbox1 = $( '#wpTextbox1' );
$textbox1 = $( '#wpTextbox1' ),
selectionStart = $textbox1.prop( 'selectionStart' ),
selectionEnd = $textbox1.prop( 'selectionEnd' ),
scrollTop = $textbox1.scrollTop();
if ( codeMirror ) { // Already loaded
return;
}
codeMirror = CodeMirror.fromTextArea( $textbox1[ 0 ], {
mwConfig: config,
@ -381,6 +395,9 @@
$codeMirror = $( codeMirror.getWrapperElement() );
codeMirror.doc.setSelection( codeMirror.doc.posFromIndex( selectionEnd ), codeMirror.doc.posFromIndex( selectionStart ) );
codeMirror.scrollTo( null, scrollTop );
// HACK: <textarea> font size varies by browser (chrome/FF/IE)
$codeMirror.css( {
'font-size': $textbox1.css( 'font-size' ),