| Index: trunk/extensions/UploadWizard/resources/mw.UploadWizardDetails.js |
| — | — | @@ -247,31 +247,27 @@ |
| 248 | 248 | var _this = this; |
| 249 | 249 | // at least one description -- never mind, we are disallowing removal of first description |
| 250 | 250 | // all the descriptions -- check min & max length |
| | 251 | + // categories are assumed valid |
| | 252 | + // pop open the 'more-options' if the date is bad |
| | 253 | + // location? |
| 251 | 254 | |
| 252 | | - // the title |
| | 255 | + // make sure title is valid |
| 253 | 256 | var titleInputValid = $j( _this.titleInput ).data( 'valid' ); |
| 254 | 257 | if ( typeof titleInputValid == 'undefined' ) { |
| 255 | 258 | alert( "please wait, still checking the title for uniqueness..." ); |
| 256 | 259 | return false; |
| 257 | 260 | } |
| 258 | | - |
| | 261 | + |
| | 262 | + // make sure licenses are valid (needed for multi-file deed selection) |
| | 263 | + var deedValid = _this.upload.deedChooser.valid(); |
| | 264 | + |
| 259 | 265 | // all other fields validated with validator js |
| 260 | 266 | var formValid = _this.$form.valid(); |
| 261 | | - var deedValid = _this.upload.deedChooser.valid(); |
| 262 | | - return titleInputValid && formValid && deedValid; |
| 263 | 267 | |
| 264 | | - // categories are assumed valid |
| 265 | | - |
| 266 | | - // the license, if any |
| 267 | | - |
| 268 | | - // pop open the 'more-options' if the date is bad |
| 269 | | - // the date |
| 270 | | - |
| 271 | | - // location? |
| | 268 | + return titleInputValid && deedValid && formValid; |
| 272 | 269 | }, |
| 273 | 270 | |
| 274 | 271 | |
| 275 | | - |
| 276 | 272 | /** |
| 277 | 273 | * toggles whether we use the 'macro' deed or our own |
| 278 | 274 | */ |