Matthias Mullie has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/355201 )
Change subject: Don't use property before it's defined
......................................................................
Don't use property before it's defined
A recent performance improvement defers creation of a lot
of properties (mostly jQuery nodes) until we actually
need to display them. deedChooserDetailsField is one of
them, but - in the case of Flickr uploads - is being
used earlier.
Meanwhile also fixed some incorrect jsdoc.
Bug: T165930
Change-Id: Iec96eca6d9abe9e6357a02fcc489c3ca31c3bf87
---
M resources/controller/uw.controller.Details.js
M resources/mw.UploadWizardDetails.js
M tests/qunit/controller/uw.controller.Details.test.js
3 files changed, 4 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UploadWizard
refs/changes/01/355201/1
diff --git a/resources/controller/uw.controller.Details.js
b/resources/controller/uw.controller.Details.js
index 4f859d4..60447f3 100644
--- a/resources/controller/uw.controller.Details.js
+++ b/resources/controller/uw.controller.Details.js
@@ -66,10 +66,6 @@
controller.createDetails( upload );
- if ( upload.file.fromURL || ( upload.deedChooser &&
upload.deedChooser.deed.name === 'custom' ) ) {
- upload.details.useCustomDeedChooser();
- }
-
// restore earlier details (user may have started
inputting details,
// then went back some steps, and now got here again)
if ( serialized ) {
diff --git a/resources/mw.UploadWizardDetails.js
b/resources/mw.UploadWizardDetails.js
index 99a8afd..2f5cde5 100644
--- a/resources/mw.UploadWizardDetails.js
+++ b/resources/mw.UploadWizardDetails.js
@@ -360,9 +360,7 @@
},
/**
- * Given the API result pull some info into the form ( for
instance, extracted from EXIF, desired filename )
- *
- * @param {Object} result Upload API result object
+ * Pull some info into the form ( for instance, extracted from
EXIF, desired filename )
*/
populate: function () {
var thumbnailDiv = this.thumbnailDiv;
@@ -374,6 +372,9 @@
this.prefillTitle();
this.prefillDescription();
this.prefillLocation();
+ if ( this.upload.file.fromURL || (
this.upload.deedChooser && this.upload.deedChooser.deed.name === 'custom' ) ) {
+ this.useCustomDeedChooser();
+ }
},
/**
diff --git a/tests/qunit/controller/uw.controller.Details.test.js
b/tests/qunit/controller/uw.controller.Details.test.js
index 887399f..435287e 100644
--- a/tests/qunit/controller/uw.controller.Details.test.js
+++ b/tests/qunit/controller/uw.controller.Details.test.js
@@ -33,7 +33,6 @@
on: $.noop,
details: {
- useCustomDeedChooser: stubs.ucdc,
getSerialized: stubs.getSerialized,
SetSerialized: stubs.setSerialized
},
--
To view, visit https://gerrit.wikimedia.org/r/355201
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iec96eca6d9abe9e6357a02fcc489c3ca31c3bf87
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
