summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--content/fireflix.js14
1 files changed, 8 insertions, 6 deletions
diff --git a/content/fireflix.js b/content/fireflix.js
index 98b6d41..337354e 100644
--- a/content/fireflix.js
+++ b/content/fireflix.js
@@ -94,6 +94,7 @@ var fireflix = {
94 fireflix: null, 94 fireflix: null,
95 init: function(f) { 95 init: function(f) {
96 this.fireflix = f; 96 this.fireflix = f;
97 pull_elements(this,document,[ 'set_photo' ]);
97 }, 98 },
98 rowCount: 0, 99 rowCount: 0,
99 getCellText: function(r,c) { 100 getCellText: function(r,c) {
@@ -148,11 +149,11 @@ var fireflix = {
148 on_select: function() { 149 on_select: function() {
149 if(this.selection.count==1) { 150 if(this.selection.count==1) {
150 var p = this.photos[this.selection.currentIndex]; 151 var p = this.photos[this.selection.currentIndex];
151 document.getElementById('set_photo').src = 152 this.set_photo.src =
152 this.fireflix.flickr.get_photo_url(p.server,p.id,p.secret,'t'); 153 this.fireflix.flickr.get_photo_url(p.server,p.id,p.secret,'t');
153 document.getElementById('set_photo').hidden = false; 154 this.set_photo.hidden = false;
154 }else{ 155 }else{
155 document.getElementById('set_photo').hidden = true; 156 this.set_photo.hidden = true;
156 } 157 }
157 } 158 }
158 }, 159 },
@@ -310,7 +311,8 @@ var fireflix = {
310 this.fireflix=f; 311 this.fireflix=f;
311 pull_elements(this,document,[ 312 pull_elements(this,document,[
312 'upload_filename','upload_title','upload_file_preview', 313 'upload_filename','upload_title','upload_file_preview',
313 'upload_file_props','upload_progress','upload_tags' 314 'upload_file_props','upload_progress','upload_tags',
315 'cmd_uploads_upload'
314 ]); 316 ]);
315 }, 317 },
316 files: new Array(), 318 files: new Array(),
@@ -401,7 +403,7 @@ var fireflix = {
401 }, 403 },
402 upload_to: function(_this) { _this.upload_worker(); }, 404 upload_to: function(_this) { _this.upload_worker(); },
403 on_file_upload: function(f) { 405 on_file_upload: function(f) {
404 document.getElementById('cmd_uploads_upload').setAttribute('disabled','true'); 406 this.cmd_uploads_upload.setAttribute('disabled','true');
405 for(var fi in this.files) { 407 for(var fi in this.files) {
406 if(this.files[fi].file==f.file) { 408 if(this.files[fi].file==f.file) {
407 this.tree.ensureRowIsVisible(fi); 409 this.tree.ensureRowIsVisible(fi);
@@ -448,7 +450,7 @@ var fireflix = {
448 } 450 }
449 } 451 }
450 this.selection.clearSelection(); 452 this.selection.clearSelection();
451 document.getElementById('cmd_uploads_upload').setAttribute('disabled','false'); 453 this.cmd_uploads_upload.setAttribute('disabled','false');
452 this.upload_progress.setAttribute('hidden','true'); 454 this.upload_progress.setAttribute('hidden','true');
453 }, 455 },
454 456