-rw-r--r-- | content/fireflix.js | 36 |
1 files changed, 14 insertions, 22 deletions
diff --git a/content/fireflix.js b/content/fireflix.js index daf4929..98b6d41 100644 --- a/content/fireflix.js +++ b/content/fireflix.js | |||
@@ -13,14 +13,10 @@ var fireflix = { | |||
13 | flickr: new Flickr(), | 13 | flickr: new Flickr(), |
14 | init: function() { | 14 | init: function() { |
15 | this.cmd_auth_auth = document.getElementById('cmd_auth_auth'); | 15 | pull_elements(this,document,[ |
16 | this.cmd_auth_done = document.getElementById('cmd_auth_done'); | 16 | 'cmd_auth_auth','cmd_auth_done','cmd_auth_unauth', |
17 | this.cmd_auth_unauth = document.getElementById('cmd_auth_unauth'); | 17 | 'menu_auth_done','b_auth','b_auth_done','auth_info', |
18 | this.menu_auth_done = document.getElementById('menu_auth_done'); | 18 | 'loc_strings','cmd_set_props' |
19 | this.b_auth = document.getElementById('b_auth'); | 19 | ]); |
20 | this.b_auth_done = document.getElementById('b_auth_done'); | ||
21 | this.auth_info = document.getElementById('auth_info'); | ||
22 | this.loc_strings = document.getElementById('loc_strings'); | ||
23 | this.build_menus(); | 20 | this.build_menus(); |
24 | this.cmd_set_props = document.getElementById('cmd_set_props'); | ||
25 | this.foundphotos.init(this); | 21 | this.foundphotos.init(this); |
26 | this.photosets.init(this); | 22 | this.photosets.init(this); |
@@ -313,10 +309,8 @@ var fireflix = { | |||
313 | init: function(f) { | 309 | init: function(f) { |
314 | this.fireflix=f; | 310 | this.fireflix=f; |
315 | this.upload_filename = document.getElementById('upload_filename'); | 311 | pull_elements(this,document,[ |
316 | this.upload_title = document.getElementById('upload_title'); | 312 | 'upload_filename','upload_title','upload_file_preview', |
317 | this.upload_file_preview = document.getElementById('upload_file_preview'); | 313 | 'upload_file_props','upload_progress','upload_tags' |
318 | this.upload_file_props = document.getElementById('upload_file_props'); | 314 | ]); |
319 | this.upload_progress = document.getElementById('upload_progress'); | ||
320 | this.upload_tags = document.getElementById('upload_tags'); | ||
321 | }, | 315 | }, |
322 | files: new Array(), | 316 | files: new Array(), |
@@ -692,12 +686,10 @@ var fireflix = { | |||
692 | init: function(f) { | 686 | init: function(f) { |
693 | this.fireflix = f; | 687 | this.fireflix = f; |
694 | this.search_for = document.getElementById('search_for'); | 688 | pull_elements(this,document,[ |
695 | this.search_tags= document.getElementById('search_tags'); | 689 | 'search_for','search_tags','search_mine', |
696 | this.search_mine = document.getElementById('search_mine'); | 690 | 'searchresult_props','search_photo', |
691 | 'searchresult_title','searchresult_description' | ||
692 | ]); | ||
697 | document.getElementById('searchresults').view = this; | 693 | document.getElementById('searchresults').view = this; |
698 | this.searchresult_props = document.getElementById('searchresult_props'); | ||
699 | this.search_photo = document.getElementById('search_photo'); | ||
700 | this.searchresult_title = document.getElementById('searchresult_title'); | ||
701 | this.searchresult_description = document.getElementById('searchresult_description'); | ||
702 | }, | 694 | }, |
703 | photos: new Array(), | 695 | photos: new Array(), |