http://www.mediawiki.org/wiki/Special:Code/MediaWiki/95056

Revision: 95056
Author:   jeroendedauw
Date:     2011-08-19 23:19:46 +0000 (Fri, 19 Aug 2011)
Log Message:
-----------
fu r93608

Modified Paths:
--------------
    trunk/extensions/UploadWizard/resources/mw.UploadWizard.js
    trunk/extensions/UploadWizard/resources/mw.UploadWizardDeed.js

Modified: trunk/extensions/UploadWizard/resources/mw.UploadWizard.js
===================================================================
--- trunk/extensions/UploadWizard/resources/mw.UploadWizard.js  2011-08-19 
23:19:26 UTC (rev 95055)
+++ trunk/extensions/UploadWizard/resources/mw.UploadWizard.js  2011-08-19 
23:19:46 UTC (rev 95056)
@@ -1196,7 +1196,8 @@
                        
                        if ( mw.UploadWizard.config.ownWorkOption == 'own' ) {
                                var ownWork = 
mw.UploadWizard.config.licensesOwnWork;
-                               return ownWork.licenses.length > 1 || ( 
ownWork.licenses.length == 1 && ownWork.licenses[0] != ownWork.defaults[0] );
+                               var licenseIsNotDefault = ( 
ownWork.licenses.length == 1 && ownWork.licenses[0] != ownWork.defaults[0] );
+                               return ownWork.licenses.length > 1 || 
licenseIsNotDefault;
                        }
                        else {
                                return true; // TODO: might want to have 
similar behaviour here

Modified: trunk/extensions/UploadWizard/resources/mw.UploadWizardDeed.js
===================================================================
--- trunk/extensions/UploadWizard/resources/mw.UploadWizardDeed.js      
2011-08-19 23:19:26 UTC (rev 95055)
+++ trunk/extensions/UploadWizard/resources/mw.UploadWizardDeed.js      
2011-08-19 23:19:46 UTC (rev 95056)
@@ -56,7 +56,8 @@
                .addClass( 'mwe-upwiz-sign' );
 
        var ownWork = mw.UploadWizard.config.licensesOwnWork;
-       _this.showCustomDiv = ownWork.licenses.length > 1 || ( 
ownWork.licenses.length == 1 && ownWork.licenses[0] != ownWork.defaults[0] );
+       var licenseIsNotDefault = ( ownWork.licenses.length == 1 && 
ownWork.licenses[0] != ownWork.defaults[0] );
+       _this.showCustomDiv = ownWork.licenses.length > 1 || 
licenseIsNotDefault;
 
        if ( _this.showCustomDiv ) {
                var licenseInputDiv = $j( '<div 
class="mwe-upwiz-deed-license"></div>' );


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

Reply via email to