moved setting of .view into corresponding init()s

git-svn-id: http://svn.klever.net/kin/fireflix/trunk@182 fe716a7a-6dde-0310-88d9-d003556173a8

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
@@ -6,51 +6,48 @@ function splitascii(s) {
    w&0xff, (w>>8)&0xff );
  }
  return rv;
 }
 
 
 var fireflix = {
  flickr: new Flickr(),
  init: function() {
   pull_elements(this,document,[
    'cmd_auth_auth','cmd_auth_done','cmd_auth_unauth',
    'menu_auth_done','b_auth','b_auth_done','auth_info',
    'loc_strings','cmd_set_props'
   ]);
   this.build_menus();
   this.foundphotos.init(this);
   this.photosets.init(this);
   this.photoset.init(this);
   this.uploads.init(this);
   this.uploadObserver.init(this);
   this.flickr.api_key = '9c43cd66947a57e6f29db1a9da3f72e3';
   this.flickr.api_shs = '9c33c9e2f0f0cfd5';
   this.flickr.prefs_root = 'net.klever.kin.fireflix';
   this.flickr.load_token();
-  document.getElementById('setslist').view = this.photosets;
-  document.getElementById('setphotos').view = this.photoset;
-  document.getElementById('uploadlist').view = this.uploads;
   this.no_auth_info_label = this.auth_info.value;
   this.set_auth_state(this.flickr.token,false);
   if(this.flickr.token) {
    this.refresh_stuff();
   }else{
    this.on_cmd_auth();
   }
  },
  set_auth_state: function(au,inp) { /* authorized, in progress */
   this.cmd_auth_unauth.disabled = !au;
   this.b_auth.hidden = au || inp;
   this.b_auth_done.hidden = !inp;
   this.menu_auth_done.hidden = !inp;
   this.cmd_auth_done.setAttribute('disabled',!inp);
   this.auth_info.disabled = !au;
   if(au) {
    this.auth_info.value = this.flickr.user.fullname+' ['+this.flickr.user.username+']'; /* TODO: move to locale */
   }else{
    this.auth_info.value = this.no_auth_info_label;
   }
  },
  on_cmd_auth: function() {
   var _this = this;
   this.flickr.authorize_0(
@@ -76,48 +73,49 @@ var fireflix = {
    }, function(x,s,c,m) {
     _this.set_auth_state(_this.flickr.token,false); /* XXX: no reset token? */
     _this.flickr_failure(x,s,c,m);
    }
   );
  },
  on_cmd_auth_unauth: function() {
   this.flickr.reset_token();
   this.set_auth_state(false,false);
  },
 
  refresh_sets: function() { this.photosets.refresh_sets(); },
  refresh_stuff: function() {
   this.refresh_sets();
   this.refresh_user_tags();
  },
 
  /* photoset treeview */
  photoset: {
   photos: new Array(),
   fireflix: null,
   init: function(f) {
    this.fireflix = f;
    pull_elements(this,document,[ 'set_photo' ]);
+   document.getElementById('setphotos').view = this;
   },
   rowCount: 0,
   getCellText: function(r,c) {
    var p = this.photos[r];
    if(c.id=='sp_title') return p.title;
    if(c.id=='sp_taken') return p.datetaken;
    if(c.id=='sp_upload') return p.dateupload; /* TODO: unixtime conversion */
    return c.id;
   },
   setTree: function(t) { this.tree = t },
   isContainer: function(r) { return false; },
   isSeparator: function(r) { return false; },
   isSorted: function(r) { return false; },
   getLevel: function(r) { return 0; },
   getImageSrc: function(r,c) { return null },
   getRowProperties: function(r,p) {},
   getCellProperties: function(cid,cel,p) {},
   getColumnProperties: function(cid,cel,p) { },
   cycleHeader: function(cid,e) { },
   getParentIndex: function(r) { return -1; },
   drop: function(r,o) { },
   canDropBeforeAfter: function(r,b) { return false },
 
   importXPR: function(xp) {
@@ -145,48 +143,49 @@ var fireflix = {
      _this.importXPR(xp);
     }, function(x,s,c,m) {
      _this.fireflix.flickr_failure(x,s,c,m);
     }
    );
   },
   on_select: function() {
    if(this.selection.count==1) {
     var p = this.photos[this.selection.currentIndex];
     this.set_photo.src =
      this.fireflix.flickr.get_photo_url(p.server,p.id,p.secret,'t');
     this.set_photo.hidden = false;
    }else{
     this.set_photo.hidden = true;
    }
   }
  },
 
  /* photosets treeview */
  photosets: {
   sets: new Array(),
   fireflix: null,
   init: function(f) {
    this.fireflix = f;
+   document.getElementById('setslist').view = this;
   },
   rowCount: 0,
   getCellText: function(r,c) {
    var s = this.sets[r];
    if(c.id=='sl_name') return s.title;
    if(c.id=='sl_photos') return s.photos;
    return c.id;
   },
   setTree: function(t) { this.tree = t },
   isContainer: function(r) { return false; },
   isSeparator: function(r) { return false; },
   isSorted: function() { return false; },
   getLevel: function(r) { return 0; },
   getImageSrc: function(r,c) { return null },
   getRowProperties: function(r,p) {},
   getCellProperties: function(cid,cel,p) { },
   getColumnProperties: function(cid,cel,p) { },
   cycleHeader: function(cid,e) { },
   getParentIndex: function(r) { return -1; },
   drop: function(r,o) { },
   canDropBeforeAfter: function(r,b) { return false },
 
   importXPR: function(xp) {
    this.tree.beginUpdateBatch();
@@ -295,48 +294,49 @@ var fireflix = {
      break;
     default: alert(d.flavour.contentType+':'+d.data); break;
    };
   },
   drop_urilist: function(ev,ul,s) {
    // TODO: check for being a file?
    var us = decodeURIComponent(ul).split(/[\r\n]/);
    for(var ui in us)
     if(/\S/.test(us[ui]))
      this.fireflix.uploads.add(us[ui]);
    document.getElementById('fireflix_tabs').selectedTab
     = document.getElementById('tab_upload');
   }
  },
 
  uploads: {
   fireflix: null,
   init: function(f) {
    this.fireflix=f;
    pull_elements(this,document,[
     'upload_filename','upload_title','upload_file_preview',
     'upload_file_props','upload_progress','upload_tags',
     'cmd_uploads_upload'
    ]);
+   document.getElementById('uploadlist').view = this;
   },
   files: new Array(),
   rowCount: 0,
   getCellText: function(r,c) {
    var f = this.files[r];
    if(c.id=='up_file') return f.file;
    if(c.id=='up_title') return f.title;
    if(c.id=='up_status') return f.state;
    return c.id;
   },
   setTree: function(t) { this.tree = t },
   isContainer: function(r) { return false; },
   isSeparator: function(r) { return false; },
   isSorted: function(r) { return false; },
   getLevel: function(r) { return 0; },
   getImageSrc: function(r,c) { return null },
   getRowProperties: function(r,p) {
    try {
     if(!Components) return;
    }catch(e) { return }
    var f = this.files[r];
    var as = Components.classes['@mozilla.org/atom-service;1'].
     getService(Components.interfaces.nsIAtomService);
    p.AppendElement(as.getAtom(f.state));