Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mediawiki.action.edit.preview: Assorted fixes

Browse source 
* Fix some typos
* Load mediawiki.action.history.diff as a RL dependency, not via
  mw.loader.load
* Get rid of inappropriate uses of .prop()

Change-Id: I4ff0fd1f946644ac651fe6c7b645236124d6d770
This commit is contained in:
MatmaRex 2013-07-29 02:33:43 +02:00 committed by Matmarex
parent 882f25af96
commit 6c87aeee69
2 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
resources/Resources.php
View file

@ -738,6 +738,7 @@ return array(
'dependencies' => array(
'jquery.form',
'jquery.spinner',
'mediawiki.action.history.diff',
),
),
'mediawiki.action.history' => array(

15
resources/mediawiki.action/mediawiki.action.edit.preview.js
View file

@ -78,8 +78,8 @@
} );
// Load new preview data.
// TODO: This should use the action=parse API instead of loading the entire page
// Though that requires figuring out how to convert that raw data into proper HTML.
// TODO: This should use the action=parse API instead of loading the entire page,
// although that requires figuring out how to convert that raw data into proper HTML.
$previewDataHolder.load( targetUrl + ' ' + copySelectors.join( ',' ), postData, function () {
var i, $from;
// Copy the contents of the specified elements from the loaded page to the real page.
@ -113,32 +113,29 @@
}
// The following elements can change in a preview but are not output
// by the server when they're empty until the preview reponse.
// by the server when they're empty until the preview response.
// TODO: Make the server output these always (in a hidden state), so we don't
// have to fish and (hopefully) put them in the right place (since skins
// can change where they are output).
if ( !document.getElementById( 'p-lang' ) && document.getElementById( 'p-tb' ) ) {
$( '#p-tb' ).after(
$( '<div>' ).prop( 'id', 'p-lang' )
$( '<div>' ).attr( 'id', 'p-lang' )
);
}
if ( !$( '.mw-summary-preview' ).length ) {
$( '.editCheckboxes' ).before(
$( '<div>' ).prop( 'className', 'mw-summary-preview' )
$( '<div>' ).addClass( 'mw-summary-preview' )
);
}
if ( !document.getElementById( 'wikiDiff' ) && document.getElementById( 'wikiPreview' ) ) {
$( '#wikiPreview' ).after(
$( '<div>' ).prop( 'id', 'wikiDiff')
$( '<div>' ).attr( 'id', 'wikiDiff')
);
}
// Make sure diff styles are loaded
mw.loader.load( 'mediawiki.action.history.diff' );
$( document.body ).on( 'click', '#wpPreview, #wpDiff', doLivePreview );
} );