TheDJ has submitted this change and it was merged. Change subject: mediawiki.action.edit.preview: Assorted fixes ......................................................................
mediawiki.action.edit.preview: Assorted fixes * 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 --- M resources/Resources.php M resources/mediawiki.action/mediawiki.action.edit.preview.js 2 files changed, 7 insertions(+), 9 deletions(-) Approvals: TheDJ: Looks good to me, approved jenkins-bot: Verified diff --git a/resources/Resources.php b/resources/Resources.php index 6352843..508aabf 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -738,6 +738,7 @@ 'dependencies' => array( 'jquery.form', 'jquery.spinner', + 'mediawiki.action.history.diff', ), ), 'mediawiki.action.history' => array( diff --git a/resources/mediawiki.action/mediawiki.action.edit.preview.js b/resources/mediawiki.action/mediawiki.action.edit.preview.js index 0566a87..ca71a99 100644 --- a/resources/mediawiki.action/mediawiki.action.edit.preview.js +++ b/resources/mediawiki.action/mediawiki.action.edit.preview.js @@ -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,31 +113,28 @@ } // 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 ); } ); -- To view, visit https://gerrit.wikimedia.org/r/76457 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4ff0fd1f946644ac651fe6c7b645236124d6d770 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Matmarex <matma....@gmail.com> Gerrit-Reviewer: Krinkle <krinklem...@gmail.com> Gerrit-Reviewer: TheDJ <hartman.w...@gmail.com> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits