author | Michael Krelin <hacker@klever.net> | 2006-12-18 13:22:11 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2006-12-18 13:22:11 (UTC) |
commit | 676ead33f615fbc2affb3cb979d1316f0676daef (patch) (unidiff) | |
tree | 06e7afff01a0c1df631c7f635618403d7989572a /content/fireflix.js | |
parent | b609e9157c1587b11f177edfa7fe65f6851e9706 (diff) | |
download | fireflix-676ead33f615fbc2affb3cb979d1316f0676daef.zip fireflix-676ead33f615fbc2affb3cb979d1316f0676daef.tar.gz fireflix-676ead33f615fbc2affb3cb979d1316f0676daef.tar.bz2 |
make file properties visible but readonly for non-pending downloads.
And while we're at it show failure reason for failed uploads.
git-svn-id: http://svn.klever.net/kin/fireflix/trunk@238 fe716a7a-6dde-0310-88d9-d003556173a8
-rw-r--r-- | content/fireflix.js | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/content/fireflix.js b/content/fireflix.js index 995ec5c..7291b68 100644 --- a/content/fireflix.js +++ b/content/fireflix.js | |||
@@ -329,13 +329,13 @@ var fireflix = { | |||
329 | fireflix: null, | 329 | fireflix: null, |
330 | init: function(f) { | 330 | init: function(f) { |
331 | this.fireflix=f; | 331 | this.fireflix=f; |
332 | pull_elements(this,document,[ | 332 | pull_elements(this,document,[ |
333 | 'upload_filename','upload_title','upload_file_preview', | 333 | 'upload_filename','upload_title','upload_file_preview', |
334 | 'upload_file_props','upload_progress','upload_tags', | 334 | 'upload_file_props','upload_progress','upload_tags', |
335 | 'cmd_uploads_upload' | 335 | 'cmd_uploads_upload', 'upload_failure' |
336 | ]); | 336 | ]); |
337 | document.getElementById('uploadlist').view = this; | 337 | document.getElementById('uploadlist').view = this; |
338 | }, | 338 | }, |
339 | files: new Array(), | 339 | files: new Array(), |
340 | rowCount: 0, | 340 | rowCount: 0, |
341 | getCellText: function(r,c) { | 341 | getCellText: function(r,c) { |
@@ -486,32 +486,41 @@ var fireflix = { | |||
486 | disableProps: function() { | 486 | disableProps: function() { |
487 | this.upload_filename.value=''; | 487 | this.upload_filename.value=''; |
488 | this.upload_filename.disabled = true; | 488 | this.upload_filename.disabled = true; |
489 | this.upload_title.value=''; | 489 | this.upload_title.value=''; |
490 | this.upload_title.disabled = true; | 490 | this.upload_title.disabled = true; |
491 | this.upload_file_preview.src = null; | 491 | this.upload_file_preview.src = null; |
492 | this.upload_file_props.hidden = true; | ||
493 | this.upload_tags.value=''; | 492 | this.upload_tags.value=''; |
494 | this.upload_tags.disabled = true; | 493 | this.upload_tags.disabled = true; |
494 | /* this.upload_file_props.hidden = true; */ | ||
495 | }, | 495 | }, |
496 | selToProps: function() { | 496 | selToProps: function() { |
497 | if(!this.selection.count) { | 497 | if(!this.selection.count) { |
498 | this.disableProps(); | 498 | this.disableProps(); |
499 | this.upload_file_props.hidden = true; | ||
499 | }else if(this.selection.count==1) { | 500 | }else if(this.selection.count==1) { |
500 | var f=this.files[this.selection.currentIndex]; | 501 | var f=this.files[this.selection.currentIndex]; |
501 | if(f==null || f.state!='pending') { | 502 | if(f==null) { |
502 | this.disableProps(); | 503 | this.disableProps(); |
504 | this.upload_file_props.hidden = true; | ||
503 | }else{ | 505 | }else{ |
506 | var inactives = f.state!='pending'; | ||
504 | this.upload_filename.value = f.file; | 507 | this.upload_filename.value = f.file; |
505 | this.upload_filename.disabled = false; | 508 | this.upload_filename.disabled = inactives; |
506 | this.upload_title.value = f.title; | 509 | this.upload_title.value = f.title; |
507 | this.upload_title.disabled = false; | 510 | this.upload_title.disabled = inactives; |
508 | this.upload_file_preview.src = 'file:///'+f.file; | 511 | this.upload_file_preview.src = 'file:///'+f.file; |
509 | this.upload_file_props.hidden = false; | ||
510 | this.upload_tags.value = f.tags; | 512 | this.upload_tags.value = f.tags; |
511 | this.upload_tags.disabled = false; | 513 | this.upload_tags.disabled = inactives; |
514 | if(f.state=='failed') { | ||
515 | this.upload_failure.textContent=f.flickr_errcode+': '+f.flickr_errmsg; | ||
516 | this.upload_failure.hidden = false; | ||
517 | }else{ | ||
518 | this.upload_failure.hidden = true; | ||
519 | } | ||
520 | this.upload_file_props.hidden = false; | ||
512 | } | 521 | } |
513 | }else{ | 522 | }else{ |
514 | var ftitle = null; var onetitle = true; | 523 | var ftitle = null; var onetitle = true; |
515 | var ftags = null; var onetag = true; | 524 | var ftags = null; var onetag = true; |
516 | var fs = 0; | 525 | var fs = 0; |
517 | for(var ff in this.files) { | 526 | for(var ff in this.files) { |
@@ -536,15 +545,17 @@ var fireflix = { | |||
536 | this.upload_title.value = ftitle; | 545 | this.upload_title.value = ftitle; |
537 | this.upload_title.disabled = false; | 546 | this.upload_title.disabled = false; |
538 | if(onetag) | 547 | if(onetag) |
539 | this.upload_tags.value = ftags; | 548 | this.upload_tags.value = ftags; |
540 | this.upload_tags.disabled = false; | 549 | this.upload_tags.disabled = false; |
541 | this.upload_file_preview.src = null; | 550 | this.upload_file_preview.src = null; |
551 | this.upload_failure.hidden = true; | ||
542 | this.upload_file_props.hidden = false; | 552 | this.upload_file_props.hidden = false; |
543 | }else | 553 | }else |
544 | this.disableProps(); | 554 | this.disableProps(); |
555 | this.upload_file_props.hidden = true; | ||
545 | } | 556 | } |
546 | }, | 557 | }, |
547 | propsToSel: function(prop) { | 558 | propsToSel: function(prop) { |
548 | if(this.selection.count<=0) return; | 559 | if(this.selection.count<=0) return; |
549 | for(var ff in this.files) { | 560 | for(var ff in this.files) { |
550 | if(this.selection.isSelected(ff) && this.files[ff].state=='pending') { | 561 | if(this.selection.isSelected(ff) && this.files[ff].state=='pending') { |