From c4b335f71306e84bcae4763e56af99899849c272 Mon Sep 17 00:00:00 2001
From: Prateek Saxena <prtksxna@gmail.com>
Date: Thu, 11 Feb 2016 10:44:58 +0530
Subject: [PATCH] UploadBooklet: Switch on showDropTarget in the
 SelectFileWidget

Bug: T115721
Change-Id: I026cc2d52fb1cb9ff4632d1c977ba23047c6b653
---
 languages/i18n/en.json                                     | 1 -
 languages/i18n/qqq.json                                    | 1 -
 resources/Resources.php                                    | 3 ++-
 .../mediawiki.ForeignStructuredUpload.BookletLayout.js     | 7 ++++---
 resources/src/mediawiki/mediawiki.Upload.BookletLayout.js  | 6 ++++--
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 1c5251ad72..5e9b1860aa 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -1497,7 +1497,6 @@
 	"upload-dialog-button-done": "Done",
 	"upload-dialog-button-save": "Save",
 	"upload-dialog-button-upload": "Upload",
-	"upload-form-label-select-file": "Select file",
 	"upload-form-label-infoform-title": "Details",
 	"upload-form-label-infoform-name": "Name",
 	"upload-form-label-infoform-name-tooltip": "A unique descriptive title for the file, which will serve as a filename. You may use plain language with spaces. Do not include the file extension.",
diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json
index 39f20bde90..1584b29fb4 100644
--- a/languages/i18n/qqq.json
+++ b/languages/i18n/qqq.json
@@ -1672,7 +1672,6 @@
 	"upload-dialog-button-done": "Button to close the dialog once upload is complete\n{{Identical|Done}}",
 	"upload-dialog-button-save": "Button to save the file after upload finishes and metadata is filled out, part 2 of a multi-step upload form\n{{Identical|Save}}",
 	"upload-dialog-button-upload": "Button to initiate upload, part 1 of a multi-step upload form\n{{Identical|Upload}}",
-	"upload-form-label-select-file": "Label for the select file widget\n{{Identical|Select file}}",
 	"upload-form-label-infoform-title": "Title for the information form\n{{Identical|Detail}}",
 	"upload-form-label-infoform-name": "Label for the file name input\n{{Identical|Name}}",
 	"upload-form-label-infoform-name-tooltip": "The tooltip documenting the title field for the file - used as the filename on-wiki.\n\nIdentical to {{msg-mw|mwe-upwiz-tooltip-title}}.",
diff --git a/resources/Resources.php b/resources/Resources.php
index 9c6ab5f278..60d4142496 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1184,13 +1184,14 @@ return array(
 		),
 		'dependencies' => array(
 			'oojs-ui',
+			'oojs-ui.styles.icons-content',
+			'oojs-ui.styles.icons-editing-advanced',
 			'mediawiki.Title',
 			'mediawiki.user',
 			'mediawiki.Upload',
 			'mediawiki.jqueryMsg',
 		),
 		'messages' => array(
-			'upload-form-label-select-file',
 			'upload-form-label-infoform-title',
 			'upload-form-label-infoform-name',
 			'upload-form-label-infoform-name-tooltip',
diff --git a/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.js b/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.js
index e467ac10f6..d8aa22fc7a 100644
--- a/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.js
+++ b/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.js
@@ -114,7 +114,9 @@
 		);
 		$ownWorkMessage.add( $notOwnWorkMessage ).find( 'a' ).attr( 'target', '_blank' );
 
-		this.selectFileWidget = new OO.ui.SelectFileWidget();
+		this.selectFileWidget = new OO.ui.SelectFileWidget( {
+			showDropTarget: true
+		} );
 		this.messageLabel = new OO.ui.LabelWidget( {
 			label: $notOwnWorkMessage
 		} );
@@ -125,8 +127,7 @@
 		fieldset = new OO.ui.FieldsetLayout();
 		fieldset.addItems( [
 			new OO.ui.FieldLayout( this.selectFileWidget, {
-				align: 'top',
-				label: mw.msg( 'upload-form-label-select-file' )
+				align: 'top'
 			} ),
 			new OO.ui.FieldLayout( this.ownWorkCheckbox, {
 				align: 'inline',
diff --git a/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js b/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js
index 30f3e597d3..b2f1981d50 100644
--- a/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js
+++ b/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js
@@ -385,8 +385,10 @@
 	mw.Upload.BookletLayout.prototype.renderUploadForm = function () {
 		var fieldset;
 
-		this.selectFileWidget = new OO.ui.SelectFileWidget();
-		fieldset = new OO.ui.FieldsetLayout( { label: mw.msg( 'upload-form-label-select-file' ) } );
+		this.selectFileWidget = new OO.ui.SelectFileWidget( {
+			showDropTarget: true
+		} );
+		fieldset = new OO.ui.FieldsetLayout();
 		fieldset.addItems( [ this.selectFileWidget ] );
 		this.uploadForm = new OO.ui.FormLayout( { items: [ fieldset ] } );
 
-- 
2.20.1