[MediaWiki-commits] [Gerrit] mediawiki...UploadWizard[master]: Fix a weird ghost "or" for non-Flickr users

2016-10-14 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Fix a weird ghost "or" for non-Flickr users
..


Fix a weird ghost "or" for non-Flickr users

Just a confusing UI element that got included for non-upload_by_url users,
missed in the tests because I usually have that option turned on...

Change-Id: I05fa7f6dccf4031b18c3dd14cee7c69b7309d5bd
---
M resources/ui/steps/uw.ui.Upload.js
1 file changed, 35 insertions(+), 28 deletions(-)

Approvals:
  Bartosz Dziewoński: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/resources/ui/steps/uw.ui.Upload.js 
b/resources/ui/steps/uw.ui.Upload.js
index a9706c7..ae6489c 100644
--- a/resources/ui/steps/uw.ui.Upload.js
+++ b/resources/ui/steps/uw.ui.Upload.js
@@ -34,38 +34,14 @@
'file'
);
 
-   this.$uploadCenterDivide = $( '' )
-   .attr( 'id', 'mwe-upwiz-upload-ctr-divide' )
-   .text( mw.message( 'mwe-upwiz-add-flickr-or' ).text() );
-
-   this.$flickrAddFileContainer = $( '' )
-   .attr( 'id', 'mwe-upwiz-upload-ctrl-flickr-container' )
-   .append( this.$uploadCenterDivide );
-
this.$addFileContainer = $( '' )
.attr( 'id', 'mwe-upwiz-add-file-container' )
-   .addClass( 'mwe-upwiz-add-files-0' )
-   .append( this.$flickrAddFileContainer );
+   .addClass( 'mwe-upwiz-add-files-0' );
 
this.$uploadCtrl = $( '' )
.attr( 'id', 'mwe-upwiz-upload-ctrls' )
.addClass( 'mwe-upwiz-file ui-helper-clearfix' )
.append( this.$addFileContainer );
-
-   this.$flickrSelectList = $( '' )
-   .attr( 'id', 'mwe-upwiz-flickr-select-list' );
-
-   this.$flickrSelectListContainer = $( '' )
-   .attr( 'id', 'mwe-upwiz-flickr-select-list-container' )
-   .addClass( 'ui-corner-all' )
-   .append(
-   $( '' )
-   .text( mw.message(
-   'mwe-upwiz-multi-file-select2',
-   config.maxUploads
-   ) ),
-   this.$flickrSelectList
-   );
 
this.addFile = new OO.ui.ButtonWidget( {
id: 'mwe-upwiz-add-file',
@@ -73,9 +49,16 @@
flags: [ 'constructive', 'primary' ]
} );
 
-   this.$addFileContainer.prepend( this.addFile.$element );
+   this.$addFileContainer.append( this.addFile.$element );
 
if ( this.isFlickrImportEnabled() ) {
+   this.$flickrAddFileContainer = $( '' )
+   .attr( 'id', 
'mwe-upwiz-upload-ctrl-flickr-container' );
+
+   this.$uploadCenterDivide = $( '' )
+   .attr( 'id', 'mwe-upwiz-upload-ctr-divide' )
+   .text( mw.message( 'mwe-upwiz-add-flickr-or' 
).text() );
+
this.addFlickrFile = new OO.ui.ButtonWidget( {
id: 'mwe-upwiz-add-flickr-file',
label: mw.message( 'mwe-upwiz-add-file-flickr' 
).text(),
@@ -84,7 +67,28 @@
upload.emit( 'flickr-ui-init' );
} );
 
-   this.$flickrAddFileContainer.append( 
this.addFlickrFile.$element );
+   this.$flickrAddFileContainer.append(
+   this.$uploadCenterDivide,
+   this.addFlickrFile.$element
+   );
+
+   this.$addFileContainer
+   .append( this.$flickrAddFileContainer );
+
+   this.$flickrSelectList = $( '' )
+   .attr( 'id', 'mwe-upwiz-flickr-select-list' );
+
+   this.$flickrSelectListContainer = $( '' )
+   .attr( 'id', 
'mwe-upwiz-flickr-select-list-container' )
+   .addClass( 'ui-corner-all' )
+   .append(
+   $( '' )
+   .text( mw.message(
+   
'mwe-upwiz-multi-file-select2',
+   config.maxUploads
+   ) ),
+   this.$flickrSelectList
+   );
 
this.$flickrSelect = $(

[MediaWiki-commits] [Gerrit] mediawiki...UploadWizard[master]: Fix a weird ghost "or" for non-Flickr users

2016-10-14 Thread MarkTraceur (Code Review) 
MarkTraceur has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/315974

Change subject: Fix a weird ghost "or" for non-Flickr users
..

Fix a weird ghost "or" for non-Flickr users

Just a confusing UI element that got included for non-upload_by_url users,
missed in the tests because I usually have that option turned on...

Change-Id: I05fa7f6dccf4031b18c3dd14cee7c69b7309d5bd
---
M resources/ui/steps/uw.ui.Upload.js
1 file changed, 35 insertions(+), 28 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UploadWizard 
refs/changes/74/315974/1

diff --git a/resources/ui/steps/uw.ui.Upload.js 
b/resources/ui/steps/uw.ui.Upload.js
index a9706c7..ae6489c 100644
--- a/resources/ui/steps/uw.ui.Upload.js
+++ b/resources/ui/steps/uw.ui.Upload.js
@@ -34,38 +34,14 @@
'file'
);
 
-   this.$uploadCenterDivide = $( '' )
-   .attr( 'id', 'mwe-upwiz-upload-ctr-divide' )
-   .text( mw.message( 'mwe-upwiz-add-flickr-or' ).text() );
-
-   this.$flickrAddFileContainer = $( '' )
-   .attr( 'id', 'mwe-upwiz-upload-ctrl-flickr-container' )
-   .append( this.$uploadCenterDivide );
-
this.$addFileContainer = $( '' )
.attr( 'id', 'mwe-upwiz-add-file-container' )
-   .addClass( 'mwe-upwiz-add-files-0' )
-   .append( this.$flickrAddFileContainer );
+   .addClass( 'mwe-upwiz-add-files-0' );
 
this.$uploadCtrl = $( '' )
.attr( 'id', 'mwe-upwiz-upload-ctrls' )
.addClass( 'mwe-upwiz-file ui-helper-clearfix' )
.append( this.$addFileContainer );
-
-   this.$flickrSelectList = $( '' )
-   .attr( 'id', 'mwe-upwiz-flickr-select-list' );
-
-   this.$flickrSelectListContainer = $( '' )
-   .attr( 'id', 'mwe-upwiz-flickr-select-list-container' )
-   .addClass( 'ui-corner-all' )
-   .append(
-   $( '' )
-   .text( mw.message(
-   'mwe-upwiz-multi-file-select2',
-   config.maxUploads
-   ) ),
-   this.$flickrSelectList
-   );
 
this.addFile = new OO.ui.ButtonWidget( {
id: 'mwe-upwiz-add-file',
@@ -73,9 +49,16 @@
flags: [ 'constructive', 'primary' ]
} );
 
-   this.$addFileContainer.prepend( this.addFile.$element );
+   this.$addFileContainer.append( this.addFile.$element );
 
if ( this.isFlickrImportEnabled() ) {
+   this.$flickrAddFileContainer = $( '' )
+   .attr( 'id', 
'mwe-upwiz-upload-ctrl-flickr-container' );
+
+   this.$uploadCenterDivide = $( '' )
+   .attr( 'id', 'mwe-upwiz-upload-ctr-divide' )
+   .text( mw.message( 'mwe-upwiz-add-flickr-or' 
).text() );
+
this.addFlickrFile = new OO.ui.ButtonWidget( {
id: 'mwe-upwiz-add-flickr-file',
label: mw.message( 'mwe-upwiz-add-file-flickr' 
).text(),
@@ -84,7 +67,28 @@
upload.emit( 'flickr-ui-init' );
} );
 
-   this.$flickrAddFileContainer.append( 
this.addFlickrFile.$element );
+   this.$flickrAddFileContainer.append(
+   this.$uploadCenterDivide,
+   this.addFlickrFile.$element
+   );
+
+   this.$addFileContainer
+   .append( this.$flickrAddFileContainer );
+
+   this.$flickrSelectList = $( '' )
+   .attr( 'id', 'mwe-upwiz-flickr-select-list' );
+
+   this.$flickrSelectListContainer = $( '' )
+   .attr( 'id', 
'mwe-upwiz-flickr-select-list-container' )
+   .addClass( 'ui-corner-all' )
+   .append(
+   $( '' )
+   .text( mw.message(
+   
'mwe-upwiz-multi-file-select2',
+   config.maxUploads
+   ) ),
+   this.$flickrSelectList
+   );