summaryrefslogtreecommitdiffabout
path: root/content
authorMichael Krelin <hacker@klever.net>2006-10-03 14:23:31 (UTC)
committer Michael Krelin <hacker@klever.net>2006-10-03 14:23:31 (UTC)
commit31fb78eac7c5799be1fb4547f3abab17ed88727f (patch) (unidiff)
tree5fcce66b161010926df346470e16e3230aa76f94 /content
parent5ebff6dee62ada9c0559f65381ccd92892911151 (diff)
downloadfireflix-31fb78eac7c5799be1fb4547f3abab17ed88727f.zip
fireflix-31fb78eac7c5799be1fb4547f3abab17ed88727f.tar.gz
fireflix-31fb78eac7c5799be1fb4547f3abab17ed88727f.tar.bz2
moved setting of .view into corresponding init()s
git-svn-id: http://svn.klever.net/kin/fireflix/trunk@182 fe716a7a-6dde-0310-88d9-d003556173a8
Diffstat (limited to 'content') (more/less context) (ignore whitespace changes)
-rw-r--r--content/fireflix.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/content/fireflix.js b/content/fireflix.js
index 966630c..63a4118 100644
--- a/content/fireflix.js
+++ b/content/fireflix.js
@@ -24,15 +24,12 @@ var fireflix = {
24 this.uploads.init(this); 24 this.uploads.init(this);
25 this.uploadObserver.init(this); 25 this.uploadObserver.init(this);
26 this.flickr.api_key = '9c43cd66947a57e6f29db1a9da3f72e3'; 26 this.flickr.api_key = '9c43cd66947a57e6f29db1a9da3f72e3';
27 this.flickr.api_shs = '9c33c9e2f0f0cfd5'; 27 this.flickr.api_shs = '9c33c9e2f0f0cfd5';
28 this.flickr.prefs_root = 'net.klever.kin.fireflix'; 28 this.flickr.prefs_root = 'net.klever.kin.fireflix';
29 this.flickr.load_token(); 29 this.flickr.load_token();
30 document.getElementById('setslist').view = this.photosets;
31 document.getElementById('setphotos').view = this.photoset;
32 document.getElementById('uploadlist').view = this.uploads;
33 this.no_auth_info_label = this.auth_info.value; 30 this.no_auth_info_label = this.auth_info.value;
34 this.set_auth_state(this.flickr.token,false); 31 this.set_auth_state(this.flickr.token,false);
35 if(this.flickr.token) { 32 if(this.flickr.token) {
36 this.refresh_stuff(); 33 this.refresh_stuff();
37 }else{ 34 }else{
38 this.on_cmd_auth(); 35 this.on_cmd_auth();
@@ -94,12 +91,13 @@ var fireflix = {
94 photoset: { 91 photoset: {
95 photos: new Array(), 92 photos: new Array(),
96 fireflix: null, 93 fireflix: null,
97 init: function(f) { 94 init: function(f) {
98 this.fireflix = f; 95 this.fireflix = f;
99 pull_elements(this,document,[ 'set_photo' ]); 96 pull_elements(this,document,[ 'set_photo' ]);
97 document.getElementById('setphotos').view = this;
100 }, 98 },
101 rowCount: 0, 99 rowCount: 0,
102 getCellText: function(r,c) { 100 getCellText: function(r,c) {
103 var p = this.photos[r]; 101 var p = this.photos[r];
104 if(c.id=='sp_title') return p.title; 102 if(c.id=='sp_title') return p.title;
105 if(c.id=='sp_taken') return p.datetaken; 103 if(c.id=='sp_taken') return p.datetaken;
@@ -163,12 +161,13 @@ var fireflix = {
163 /* photosets treeview */ 161 /* photosets treeview */
164 photosets: { 162 photosets: {
165 sets: new Array(), 163 sets: new Array(),
166 fireflix: null, 164 fireflix: null,
167 init: function(f) { 165 init: function(f) {
168 this.fireflix = f; 166 this.fireflix = f;
167 document.getElementById('setslist').view = this;
169 }, 168 },
170 rowCount: 0, 169 rowCount: 0,
171 getCellText: function(r,c) { 170 getCellText: function(r,c) {
172 var s = this.sets[r]; 171 var s = this.sets[r];
173 if(c.id=='sl_name') return s.title; 172 if(c.id=='sl_name') return s.title;
174 if(c.id=='sl_photos') return s.photos; 173 if(c.id=='sl_photos') return s.photos;
@@ -313,12 +312,13 @@ var fireflix = {
313 this.fireflix=f; 312 this.fireflix=f;
314 pull_elements(this,document,[ 313 pull_elements(this,document,[
315 'upload_filename','upload_title','upload_file_preview', 314 'upload_filename','upload_title','upload_file_preview',
316 'upload_file_props','upload_progress','upload_tags', 315 'upload_file_props','upload_progress','upload_tags',
317 'cmd_uploads_upload' 316 'cmd_uploads_upload'
318 ]); 317 ]);
318 document.getElementById('uploadlist').view = this;
319 }, 319 },
320 files: new Array(), 320 files: new Array(),
321 rowCount: 0, 321 rowCount: 0,
322 getCellText: function(r,c) { 322 getCellText: function(r,c) {
323 var f = this.files[r]; 323 var f = this.files[r];
324 if(c.id=='up_file') return f.file; 324 if(c.id=='up_file') return f.file;