From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Wed, 9 Aug 2017 20:55:58 +0000 (+0000)
Subject: Merge "Live Preview: Cope with the edit summary being an OOjs UI widget"
X-Git-Tag: 1.31.0-rc.0~2433
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=1e8f417f3d6d648e19c03465890b58a331514362;hp=-c

Merge "Live Preview: Cope with the edit summary being an OOjs UI widget"
---

1e8f417f3d6d648e19c03465890b58a331514362
diff --combined resources/Resources.php
index d8ab7d7a45,a89fb42241..f004d62052
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@@ -1379,7 -1379,6 +1379,7 @@@ return 
  		]
  	],
  	'mediawiki.util' => [
 +		'class' => 'ResourceLoaderMediaWikiUtilModule',
  		'scripts' => 'resources/src/mediawiki/mediawiki.util.js',
  		'dependencies' => [
  			'jquery.accessKeyLabel',
@@@ -1453,6 -1452,7 +1453,7 @@@
  			'mediawiki.diff.styles',
  			'mediawiki.util',
  			'mediawiki.jqueryMsg',
+ 			'oojs-ui-core',
  		],
  		'messages' => [
  			// Keep the uses message keys in sync with EditPage#setHeaders
@@@ -1815,7 -1815,6 +1816,7 @@@
  			'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.MenuSelectWidget.less',
  			'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.ViewSwitchWidget.less',
  			'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.ValuePickerWidget.less',
 +			'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.ChangesLimitPopupWidget.less',
  			'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.DatePopupWidget.less',
  			'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterWrapperWidget.less',
  			'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.ChangesListWrapperWidget.less',
@@@ -1836,8 -1835,6 +1837,8 @@@
  		'messages' => [
  			'rcfilters-activefilters',
  			'rcfilters-advancedfilters',
 +			'rcfilters-group-results-by-page',
 +			'rcfilters-grouping-title',
  			'rcfilters-limit-title',
  			'rcfilters-limit-shownum',
  			'rcfilters-days-title',
@@@ -1881,14 -1878,11 +1882,14 @@@
  			'rcfilters-tag-prefix-tags',
  			'rcfilters-exclude-button-off',
  			'rcfilters-exclude-button-on',
 +			'rcfilters-view-advanced-filters-label',
  			'rcfilters-view-tags',
  			'rcfilters-view-namespaces-tooltip',
  			'rcfilters-view-tags-tooltip',
  			'rcfilters-view-return-to-default-tooltip',
  			'rcfilters-liveupdates-button',
 +			'rcfilters-liveupdates-button-title-on',
 +			'rcfilters-liveupdates-button-title-off',
  			'rcfilters-other-review-tools',
  			'blanknamespace',
  			'namespaces',
diff --combined resources/src/mediawiki.action/mediawiki.action.edit.preview.js
index 706e1feaa9,ec572afd2c..c26d9153a2
--- a/resources/src/mediawiki.action/mediawiki.action.edit.preview.js
+++ b/resources/src/mediawiki.action/mediawiki.action.edit.preview.js
@@@ -3,12 -3,14 +3,14 @@@
   */
  ( function ( mw, $ ) {
  
+ 	var oojsuieditform;
+ 
  	/**
  	 * @ignore
  	 * @param {jQuery.Event} e
  	 */
  	function doLivePreview( e ) {
- 		var isDiff, api, parseRequest, diffRequest, postData, copySelectors, section,
+ 		var isDiff, api, parseRequest, diffRequest, postData, copySelectors, section, summary,
  			$wikiPreview, $wikiDiff, $editform, $textbox, $summary, $copyElements, $spinner, $errorBox;
  
  		isDiff = ( e.target.name === 'wpDiff' );
@@@ -16,7 -18,13 +18,13 @@@
  		$wikiDiff = $( '#wikiDiff' );
  		$editform = $( '#editform' );
  		$textbox = $editform.find( '#wpTextbox1' );
- 		$summary = $editform.find( '#wpSummary' );
+ 
+ 		if ( oojsuieditform ) {
+ 			summary = OO.ui.infuse( $( '#wpSummaryWidget' ) );
+ 		} else {
+ 			$summary = $editform.find( '#wpSummary' );
+ 		}
+ 
  		$spinner = $( '.mw-spinner-preview' );
  		$errorBox = $( '.errorbox' );
  		section = $editform.find( '[name="wpSection"]' ).val();
@@@ -78,7 -86,7 +86,7 @@@
  			formatversion: 2,
  			action: 'parse',
  			title: mw.config.get( 'wgPageName' ),
- 			summary: $summary.textSelection( 'getContents' ),
+ 			summary: oojsuieditform ? summary.getValue() : $summary.val(),
  			prop: ''
  		};
  
@@@ -150,7 -158,7 +158,7 @@@
  					newList.push(
  						$( '<div>' )
  							.addClass( 'mw-indicator' )
 -							.attr( 'id', mw.util.escapeId( 'mw-indicator-' + name ) )
 +							.attr( 'id', mw.util.escapeIdForAttribute( 'mw-indicator-' + name ) )
  							.html( indicator )
  							.get( 0 ),
  						// Add a whitespace between the <div>s because
@@@ -281,6 -289,8 +289,8 @@@
  	}
  
  	$( function () {
+ 		oojsuieditform = $( '#editform' ).hasClass( 'mw-editform-ooui' );
+ 
  		// Do not enable on user .js/.css pages, as there's no sane way of "previewing"
  		// the scripts or styles without reloading the page.
  		if ( $( '#mw-userjsyoucanpreview' ).length || $( '#mw-usercssyoucanpreview' ).length ) {
@@@ -307,7 -317,7 +317,7 @@@
  		}
  
  		if ( !$( '.mw-summary-preview' ).length ) {
- 			$( '#wpSummary' ).after(
+ 			$( oojsuieditform ? '#wpSummaryWidget' : '#wpSummary' ).after(
  				$( '<div>' ).addClass( 'mw-summary-preview' )
  			);
  		}