Bartosz Dziewoński has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/351022 )

Change subject: Do not depend on deprecated no-op modules
......................................................................

Do not depend on deprecated no-op modules

* es5-shim no longer does anything. MediaWiki requires ES5 support now.
* jquery.placeholder is just a wrapper for .attr( 'placeholder' ).

Change-Id: Ie0743ea084a2e23f07ffe6dc893c706095eed81d
---
M extension.json
M resources/ui/steps/uw.ui.Upload.js
2 files changed, 1 insertion(+), 6 deletions(-)


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

diff --git a/extension.json b/extension.json
index 16b87b4..5bb99c2 100644
--- a/extension.json
+++ b/extension.json
@@ -147,7 +147,6 @@
                        ],
                        "dependencies": [
                                "uw.base",
-                               "es5-shim",
                                "oojs"
                        ],
                        "targets": [ "desktop", "mobile" ],
@@ -167,7 +166,6 @@
                                "ext.uploadWizard.jquery.arrowSteps",
                                "jquery.client",
                                "jquery.spinner",
-                               "jquery.placeholder",
                                "jquery.makeCollapsible",
                                "mediawiki.icon",
                                "mediawiki.Uri",
@@ -195,7 +193,6 @@
                                "uw.controller.Tutorial",
                                "uw.controller.Upload",
                                "uw.units",
-                               "es5-shim",
                                "oojs",
                                "oojs-ui",
                                "oojs-ui.styles.icons",
diff --git a/resources/ui/steps/uw.ui.Upload.js 
b/resources/ui/steps/uw.ui.Upload.js
index f3037de..8b981b2 100644
--- a/resources/ui/steps/uw.ui.Upload.js
+++ b/resources/ui/steps/uw.ui.Upload.js
@@ -115,6 +115,7 @@
 
                        // The input that will hold a flickr URL entered by the 
user; will be appended to a form
                        this.$flickrInput = $( '<input 
id="mwe-upwiz-flickr-input" type="text" />' )
+                               .attr( 'placeholder', mw.message( 
'mwe-upwiz-flickr-input-placeholder' ).text() )
                                .prependTo( this.$flickrForm );
 
                        this.flickrButton = new OO.ui.ButtonInputWidget( {
@@ -533,9 +534,6 @@
                this.$flickrContainer.show();
                this.flickrSelectButton.$element.show();
                this.flickrButton.setDisabled( false );
-
-               // Add placeholder text to the Flickr URL input field
-               this.$flickrInput.placeholder( mw.message( 
'mwe-upwiz-flickr-input-placeholder' ).text() );
 
                // Insert form into the page
                this.$div.find( '#mwe-upwiz-files' ).prepend( 
this.$flickrContainer );

-- 
To view, visit https://gerrit.wikimedia.org/r/351022
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie0743ea084a2e23f07ffe6dc893c706095eed81d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to