http://www.mediawiki.org/wiki/Special:Code/MediaWiki/95793
Revision: 95793
Author: jeroendedauw
Date: 2011-08-30 16:41:08 +0000 (Tue, 30 Aug 2011)
Log Message:
-----------
fix point 3 from bug 30620
Modified Paths:
--------------
trunk/extensions/UploadWizard/resources/mw.UploadWizard.js
trunk/extensions/UploadWizard/resources/mw.UploadWizardDetails.js
Modified: trunk/extensions/UploadWizard/resources/mw.UploadWizard.js
===================================================================
--- trunk/extensions/UploadWizard/resources/mw.UploadWizard.js 2011-08-30
16:32:35 UTC (rev 95792)
+++ trunk/extensions/UploadWizard/resources/mw.UploadWizard.js 2011-08-30
16:41:08 UTC (rev 95793)
@@ -1170,31 +1170,44 @@
},
-
- // do some last minute prep before advancing to the DEEDS page
- prepareAndMoveToDeeds: function() {
- var _this = this;
+
+ /**
+ * Get the own work and third party licensing deeds if they are needed.
+ *
+ * @since 1.2
+ * @param {int|false} uploadsLength
+ * @return {Array}
+ */
+ getLicensingDeeds: function( uploadsLength ) {
var deeds = [];
- var hasChoice = mw.UploadWizard.config.ownWorkOption ==
'choice';
- if ( hasChoice ) {
+ if ( mw.UploadWizard.config.ownWorkOption == 'choice' ) {
// these deeds are standard
- deeds.push( new mw.UploadWizardDeedOwnWork(
_this.uploads.length ) );
- deeds.push( new mw.UploadWizardDeedThirdParty(
_this.uploads.length ) );
+ deeds.push( new mw.UploadWizardDeedOwnWork(
uploadsLength ) );
+ deeds.push( new mw.UploadWizardDeedThirdParty(
uploadsLength ) );
}
else {
if ( mw.UploadWizard.config.ownWorkOption == 'own' ) {
- deeds.push( new mw.UploadWizardDeedOwnWork(
_this.uploads.length ) );
+ deeds.push( new mw.UploadWizardDeedOwnWork(
uploadsLength ) );
}
else {
- deeds.push( new mw.UploadWizardDeedThirdParty(
_this.uploads.length ) );
+ deeds.push( new mw.UploadWizardDeedThirdParty(
uploadsLength ) );
}
}
+
+ return deeds;
+ },
+ // do some last minute prep before advancing to the DEEDS page
+ prepareAndMoveToDeeds: function() {
+ var _this = this;
+ var deeds = _this.getLicensingDeeds( _this.uploads.length );
+
this.shouldShowIndividualDeed = function() {
- if ( hasChoice ) return true;
-
- if ( mw.UploadWizard.config.ownWorkOption == 'own' ) {
+ if ( mw.UploadWizard.config.ownWorkOption == 'choice' )
{
+ return true;
+ }
+ else if ( mw.UploadWizard.config.ownWorkOption == 'own'
) {
var ownWork =
mw.UploadWizard.config.licensesOwnWork;
var licenseIsNotDefault = (
ownWork.licenses.length === 1 && ownWork.licenses[0] !== ownWork.defaults[0] );
return ownWork.licenses.length > 1 ||
licenseIsNotDefault;
Modified: trunk/extensions/UploadWizard/resources/mw.UploadWizardDetails.js
===================================================================
--- trunk/extensions/UploadWizard/resources/mw.UploadWizardDetails.js
2011-08-30 16:32:35 UTC (rev 95792)
+++ trunk/extensions/UploadWizard/resources/mw.UploadWizardDetails.js
2011-08-30 16:41:08 UTC (rev 95793)
@@ -350,12 +350,14 @@
var _this = this;
_this.copyrightInfoFieldset.show();
_this.upload.wizardDeedChooser = _this.upload.deedChooser;
+
_this.upload.deedChooser = new mw.UploadWizardDeedChooser(
_this.deedDiv,
- [ new mw.UploadWizardDeedOwnWork(),
- new mw.UploadWizardDeedThirdParty() ],
+ mw.UploadWizard.prototype.getLicensingDeeds(),
[ _this.upload ]
);
+
+ _this.upload.deedChooser.onLayoutReady();
},
/**
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
