From: Ed Sanders <esanders@wikimedia.org>
Date: Thu, 23 May 2019 11:55:42 +0000 (+0100)
Subject: ApiSandbox: Use CopyTextLayouts for snippets
X-Git-Tag: 1.34.0-rc.0~1612^2
X-Git-Url: http://git.cyclocoop.org/%22.%24h.%22?a=commitdiff_plain;h=7dbeeab314bafa2023cbf7f97cac1cb04893fc08;p=lhc%2Fweb%2Fwiklou.git

ApiSandbox: Use CopyTextLayouts for snippets

Change-Id: I1cdda7f5c1da9fed820ec9c39349457bb5060a7b
---

diff --git a/resources/Resources.php b/resources/Resources.php
index c0ece91e6e..1b8cffb28d 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -2043,6 +2043,7 @@ return [
 			'oojs-ui.styles.icons-editing-advanced',
 			'oojs-ui.styles.icons-interactions',
 			'oojs-ui.styles.icons-moderation',
+			'mediawiki.widgets',
 			'mediawiki.widgets.datetime',
 			'jquery.makeCollapsible',
 		],
diff --git a/resources/src/mediawiki.special.apisandbox/apisandbox.js b/resources/src/mediawiki.special.apisandbox/apisandbox.js
index e063a394c0..d31a109339 100644
--- a/resources/src/mediawiki.special.apisandbox/apisandbox.js
+++ b/resources/src/mediawiki.special.apisandbox/apisandbox.js
@@ -724,37 +724,32 @@
 		 * @return {OO.ui.MenuOptionWidget[]} Each item's data should be an OO.ui.FieldLayout
 		 */
 		formatRequest: function ( displayParams, rawParams ) {
-			var jsonInput,
+			var jsonLayout,
 				items = [
 					new OO.ui.MenuOptionWidget( {
 						label: Util.parseMsg( 'apisandbox-request-format-url-label' ),
-						data: new OO.ui.FieldLayout(
-							new OO.ui.TextInputWidget( {
-								readOnly: true,
-								value: mw.util.wikiScript( 'api' ) + '?' + $.param( displayParams )
-							} ), {
-								label: Util.parseMsg( 'apisandbox-request-url-label' )
-							}
-						)
+						data: new mw.widgets.CopyTextLayout( {
+							label: Util.parseMsg( 'apisandbox-request-url-label' ),
+							copyText: mw.util.wikiScript( 'api' ) + '?' + $.param( displayParams )
+						} )
 					} ),
 					new OO.ui.MenuOptionWidget( {
 						label: Util.parseMsg( 'apisandbox-request-format-json-label' ),
-						data: new OO.ui.FieldLayout(
-							jsonInput = new OO.ui.MultilineTextInputWidget( {
+						data: jsonLayout = new mw.widgets.CopyTextLayout( {
+							label: Util.parseMsg( 'apisandbox-request-json-label' ),
+							copyText: JSON.stringify( displayParams, null, '\t' ),
+							multiline: true,
+							textInput: {
 								classes: [ 'mw-apisandbox-textInputCode' ],
-								readOnly: true,
 								autosize: true,
-								maxRows: 6,
-								value: JSON.stringify( displayParams, null, '\t' )
-							} ), {
-								label: Util.parseMsg( 'apisandbox-request-json-label' )
+								maxRows: 6
 							}
-						).on( 'toggle', function ( visible ) {
+						} ).on( 'toggle', function ( visible ) {
 							if ( visible ) {
 								// Call updatePosition instead of adjustSize
 								// because the latter has weird caching
 								// behavior and the former bypasses it.
-								jsonInput.updatePosition();
+								jsonLayout.textInput.updatePosition();
 							}
 						} )
 					} )