| -rw-r--r-- | content/fireflix.js | 36 | ||||
| -rw-r--r-- | content/util.js | 9 |
2 files changed, 23 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 @@ -14,12 +14,8 @@ var fireflix = { init: function() { - this.cmd_auth_auth = document.getElementById('cmd_auth_auth'); - this.cmd_auth_done = document.getElementById('cmd_auth_done'); - this.cmd_auth_unauth = document.getElementById('cmd_auth_unauth'); - this.menu_auth_done = document.getElementById('menu_auth_done'); - this.b_auth = document.getElementById('b_auth'); - this.b_auth_done = document.getElementById('b_auth_done'); - this.auth_info = document.getElementById('auth_info'); - this.loc_strings = document.getElementById('loc_strings'); + 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.cmd_set_props = document.getElementById('cmd_set_props'); this.foundphotos.init(this); @@ -314,8 +310,6 @@ var fireflix = { this.fireflix=f; - this.upload_filename = document.getElementById('upload_filename'); - this.upload_title = document.getElementById('upload_title'); - this.upload_file_preview = document.getElementById('upload_file_preview'); - this.upload_file_props = document.getElementById('upload_file_props'); - this.upload_progress = document.getElementById('upload_progress'); - this.upload_tags = document.getElementById('upload_tags'); + pull_elements(this,document,[ + 'upload_filename','upload_title','upload_file_preview', + 'upload_file_props','upload_progress','upload_tags' + ]); }, @@ -693,10 +687,8 @@ var fireflix = { this.fireflix = f; - this.search_for = document.getElementById('search_for'); - this.search_tags= document.getElementById('search_tags'); - this.search_mine = document.getElementById('search_mine'); + pull_elements(this,document,[ + 'search_for','search_tags','search_mine', + 'searchresult_props','search_photo', + 'searchresult_title','searchresult_description' + ]); document.getElementById('searchresults').view = this; - this.searchresult_props = document.getElementById('searchresult_props'); - this.search_photo = document.getElementById('search_photo'); - this.searchresult_title = document.getElementById('searchresult_title'); - this.searchresult_description = document.getElementById('searchresult_description'); }, diff --git a/content/util.js b/content/util.js index 5af0978..c4af09e 100644 --- a/content/util.js +++ b/content/util.js @@ -61 +61,10 @@ function xp_node(xp,x) { +/* + * pull in elements into documents as a member variables + */ +function pull_elements(th,d,els) { + for(var e in els) { + var en=els[e]; + th[en] = d.getElementById(en); + } +} |