summaryrefslogtreecommitdiffabout
path: root/content
authorMichael Krelin <hacker@klever.net>2006-09-30 18:21:31 (UTC)
committer Michael Krelin <hacker@klever.net>2006-09-30 18:21:31 (UTC)
commit4f5e775ff24baf34b3425e93bfeac4a436b4b525 (patch) (unidiff)
tree3dcde487352a9dd8bcef852adeb18f118cbe20c5 /content
parent74a277c2d7ac5416c3b55565e6d5e8e5a15b389d (diff)
downloadfireflix-4f5e775ff24baf34b3425e93bfeac4a436b4b525.zip
fireflix-4f5e775ff24baf34b3425e93bfeac4a436b4b525.tar.gz
fireflix-4f5e775ff24baf34b3425e93bfeac4a436b4b525.tar.bz2
minor code beauty/performance enhancements
git-svn-id: http://svn.klever.net/kin/fireflix/trunk@170 fe716a7a-6dde-0310-88d9-d003556173a8
Diffstat (limited to 'content') (more/less context) (ignore 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
@@ -89,16 +89,17 @@ var fireflix = {
89 }, 89 },
90 90
91 /* photoset treeview */ 91 /* photoset treeview */
92 photoset: { 92 photoset: {
93 photos: new Array(), 93 photos: new Array(),
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) {
100 var p = this.photos[r]; 101 var p = this.photos[r];
101 if(c.id=='sp_title') return p.title; 102 if(c.id=='sp_title') return p.title;
102 if(c.id=='sp_taken') return p.datetaken; 103 if(c.id=='sp_taken') return p.datetaken;
103 if(c.id=='sp_upload') return p.dateupload; /* TODO: unixtime conversion */ 104 if(c.id=='sp_upload') return p.dateupload; /* TODO: unixtime conversion */
104 return c.id; 105 return c.id;
@@ -143,21 +144,21 @@ var fireflix = {
143 }, function(x,s,c,m) { 144 }, function(x,s,c,m) {
144 _this.fireflix.flickr_failure(x,s,c,m); 145 _this.fireflix.flickr_failure(x,s,c,m);
145 } 146 }
146 ); 147 );
147 }, 148 },
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 },
159 160
160 /* photosets treeview */ 161 /* photosets treeview */
161 photosets: { 162 photosets: {
162 sets: new Array(), 163 sets: new Array(),
163 fireflix: null, 164 fireflix: null,
@@ -305,17 +306,18 @@ var fireflix = {
305 }, 306 },
306 307
307 uploads: { 308 uploads: {
308 fireflix: null, 309 fireflix: null,
309 init: function(f) { 310 init: function(f) {
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(),
317 rowCount: 0, 319 rowCount: 0,
318 getCellText: function(r,c) { 320 getCellText: function(r,c) {
319 var f = this.files[r]; 321 var f = this.files[r];
320 if(c.id=='up_file') return f.file; 322 if(c.id=='up_file') return f.file;
321 if(c.id=='up_title') return f.title; 323 if(c.id=='up_title') return f.title;
@@ -396,17 +398,17 @@ var fireflix = {
396 return; 398 return;
397 } 399 }
398 } 400 }
399 dump('uploading done\n'); 401 dump('uploading done\n');
400 this.on_finish_upload(); 402 this.on_finish_upload();
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);
408 this.selection.rangedSelect(fi,fi,false); 410 this.selection.rangedSelect(fi,fi,false);
409 this.selection.currentIndex = fi; 411 this.selection.currentIndex = fi;
410 this.selToProps(); 412 this.selToProps();
411 break; 413 break;
412 } 414 }
@@ -443,17 +445,17 @@ var fireflix = {
443 ); 445 );
444 }, function(x,s,c,m) { 446 }, function(x,s,c,m) {
445 _this.fireflix.flickr_failure(x,s,c,m); 447 _this.fireflix.flickr_failure(x,s,c,m);
446 } 448 }
447 ); 449 );
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
455 clear_list: function() { 457 clear_list: function() {
456 this.tree.beginUpdateBatch(); 458 this.tree.beginUpdateBatch();
457 this.rowCount = 0; 459 this.rowCount = 0;
458 this.files = new Array(); 460 this.files = new Array();
459 this.tree.endUpdateBatch(); 461 this.tree.endUpdateBatch();