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
@@ -93,8 +93,9 @@ var fireflix = {
   photos: new Array(),
   fireflix: null,
   init: function(f) {
    this.fireflix = f;
+   pull_elements(this,document,[ 'set_photo' ]);
   },
   rowCount: 0,
   getCellText: function(r,c) {
    var p = this.photos[r];
@@ -147,13 +148,13 @@ var fireflix = {
   },
   on_select: function() {
    if(this.selection.count==1) {
     var p = this.photos[this.selection.currentIndex];
-    document.getElementById('set_photo').src =
+    this.set_photo.src =
      this.fireflix.flickr.get_photo_url(p.server,p.id,p.secret,'t');
-    document.getElementById('set_photo').hidden = false;
+    this.set_photo.hidden = false;
    }else{
-    document.getElementById('set_photo').hidden = true;
+    this.set_photo.hidden = true;
    }
   }
  },
 
@@ -309,9 +310,10 @@ var fireflix = {
   init: function(f) {
    this.fireflix=f;
    pull_elements(this,document,[
     'upload_filename','upload_title','upload_file_preview',
-    'upload_file_props','upload_progress','upload_tags'
+    'upload_file_props','upload_progress','upload_tags',
+    'cmd_uploads_upload'
    ]);
   },
   files: new Array(),
   rowCount: 0,
@@ -400,9 +402,9 @@ var fireflix = {
    this.on_finish_upload();
   },
   upload_to: function(_this) { _this.upload_worker(); },
   on_file_upload: function(f) {
-   document.getElementById('cmd_uploads_upload').setAttribute('disabled','true');
+   this.cmd_uploads_upload.setAttribute('disabled','true');
    for(var fi in this.files) {
     if(this.files[fi].file==f.file) {
      this.tree.ensureRowIsVisible(fi);
      this.selection.rangedSelect(fi,fi,false);
@@ -447,9 +449,9 @@ var fireflix = {
      );
     }
    }
    this.selection.clearSelection();
-   document.getElementById('cmd_uploads_upload').setAttribute('disabled','false');
+   this.cmd_uploads_upload.setAttribute('disabled','false');
    this.upload_progress.setAttribute('hidden','true');
   },
 
   clear_list: function() {