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

Wait for DOM ready before querying DOM

Browse source 
This avoids a race condition on loading.

Change-Id: I31c01f9c2b2025b4a46d5afc6ada5044f750eff7
This commit is contained in:
Fomafix 2019-02-23 19:04:17 +01:00
parent 7e059f7247
commit 4181729151
1 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
resources/ext.CodeMirror.js
View file

@ -1,5 +1,6 @@
( function () {
var useCodeMirror, codeMirror, api, originHooksTextarea, cmTextSelection,
$textbox1,
enableContentEditable = true;
if ( mw.config.get( 'wgCodeEditorCurrentLanguage' ) ) { // If the CodeEditor is used then just exit;
@ -106,7 +107,6 @@
mw.loader.using( config.pluginModules, function () {
var $codeMirror,
$textbox1 = $( '#wpTextbox1' ),
selectionStart = $textbox1.prop( 'selectionStart' ),
selectionEnd = $textbox1.prop( 'selectionEnd' ),
scrollTop = $textbox1.scrollTop();
@ -191,8 +191,7 @@
* Enables or disables CodeMirror
*/
function switchCodeMirror() {
var selectionObj, selectionStart, selectionEnd, scrollTop, hasFocus, $codeMirror,
$textbox1 = $( '#wpTextbox1' );
var selectionObj, selectionStart, selectionEnd, scrollTop, hasFocus, $codeMirror;
if ( codeMirror ) {
scrollTop = codeMirror.getScrollInfo().top;
@ -225,7 +224,7 @@
function addCodeMirrorToWikiEditor() {
var $codeMirrorButton;
$( '#wpTextbox1' ).wikiEditor(
$textbox1.wikiEditor(
'addToToolbar',
{
section: 'main',
@ -249,7 +248,7 @@
}
);
$codeMirrorButton = $( '#wpTextbox1' ).data( 'wikiEditor-context' ).modules.toolbar.$toolbar.find( '.tool[rel=CodeMirror]' );
$codeMirrorButton = $textbox1.data( 'wikiEditor-context' ).modules.toolbar.$toolbar.find( '.tool[rel=CodeMirror]' );
$codeMirrorButton
.attr( 'id', 'mw-editbutton-codemirror' );
@ -263,19 +262,24 @@
// They are using WikiEditor
mw.loader.using( 'ext.wikiEditor', function () {
// Add CodeMirror button to the enhanced editing toolbar.
// Add an additional $() to avoid a race condition with WikiEditor.
// FIXME: Solve this with an explicit dependency.
$( addCodeMirrorToWikiEditor );
} );
}
// If view is in edit mode, add the button to the toolbar.
if ( $( '#wpTextbox1' ).length ) {
addToolbarButton();
}
$( function () {
$textbox1 = $( '#wpTextbox1' );
// If view is in edit mode, add the button to the toolbar.
if ( $textbox1.length ) {
addToolbarButton();
}
// enable CodeMirror
if ( useCodeMirror ) {
$( '#wpTextbox1' ).on( 'wikiEditor-toolbar-doneInitialSections', enableCodeMirror.bind( this ) );
}
// enable CodeMirror
if ( useCodeMirror ) {
$textbox1.on( 'wikiEditor-toolbar-doneInitialSections', enableCodeMirror.bind( this ) );
}
} );
// Synchronize textarea with CodeMirror before leaving
window.addEventListener( 'beforeunload', function () {