author | Michael Krelin <hacker@klever.net> | 2006-09-28 19:40:39 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2006-09-28 19:40:39 (UTC) |
commit | 438c60c606a15792893c38415d0f405ae21e433d (patch) (unidiff) | |
tree | d8a56268d5ebedf8669587af7469fedbe1527154 /content/fireflix.js | |
parent | b62171950ffbbdae7826b1b8cdd4cfd0bde8cc93 (diff) | |
download | fireflix-438c60c606a15792893c38415d0f405ae21e433d.zip fireflix-438c60c606a15792893c38415d0f405ae21e433d.tar.gz fireflix-438c60c606a15792893c38415d0f405ae21e433d.tar.bz2 |
Better tracking of auth state, added possibility to sign off and reauth
git-svn-id: http://svn.klever.net/kin/fireflix/trunk@164 fe716a7a-6dde-0310-88d9-d003556173a8
-rw-r--r-- | content/fireflix.js | 52 |
1 files changed, 35 insertions, 17 deletions
diff --git a/content/fireflix.js b/content/fireflix.js index 9518480..82c7b0c 100644 --- a/content/fireflix.js +++ b/content/fireflix.js | |||
@@ -9,12 +9,19 @@ function splitascii(s) { | |||
9 | } | 9 | } |
10 | 10 | ||
11 | 11 | ||
12 | var fireflix = { | 12 | 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'); | ||
16 | this.cmd_auth_done = document.getElementById('cmd_auth_done'); | ||
17 | this.cmd_auth_unauth = document.getElementById('cmd_auth_unauth'); | ||
18 | this.menu_auth_done = document.getElementById('menu_auth_done'); | ||
19 | this.b_auth = document.getElementById('b_auth'); | ||
20 | this.b_auth_done = document.getElementById('b_auth_done'); | ||
21 | this.auth_info = document.getElementById('auth_info'); | ||
15 | this.loc_strings = document.getElementById('loc_strings'); | 22 | this.loc_strings = document.getElementById('loc_strings'); |
16 | this.build_menus(); | 23 | this.build_menus(); |
17 | this.cmd_set_props = document.getElementById('cmd_set_props'); | 24 | this.cmd_set_props = document.getElementById('cmd_set_props'); |
18 | this.foundphotos.init(this); | 25 | this.foundphotos.init(this); |
19 | this.photosets.init(this); | 26 | this.photosets.init(this); |
20 | this.photoset.init(this); | 27 | this.photoset.init(this); |
@@ -24,48 +31,61 @@ var fireflix = { | |||
24 | this.flickr.api_shs = '9c33c9e2f0f0cfd5'; | 31 | this.flickr.api_shs = '9c33c9e2f0f0cfd5'; |
25 | this.flickr.prefs_root = 'net.klever.kin.fireflix'; | 32 | this.flickr.prefs_root = 'net.klever.kin.fireflix'; |
26 | this.flickr.load_token(); | 33 | this.flickr.load_token(); |
27 | document.getElementById('setslist').view = this.photosets; | 34 | document.getElementById('setslist').view = this.photosets; |
28 | document.getElementById('setphotos').view = this.photoset; | 35 | document.getElementById('setphotos').view = this.photoset; |
29 | document.getElementById('uploadlist').view = this.uploads; | 36 | document.getElementById('uploadlist').view = this.uploads; |
30 | this.flickr.no_auth_info_label = document.getElementById('auth_info').value; | 37 | this.no_auth_info_label = this.auth_info.value; |
38 | this.set_auth_state(this.flickr.token,false); | ||
31 | if(this.flickr.token) { | 39 | if(this.flickr.token) { |
32 | this.refresh_stuff(); | 40 | this.refresh_stuff(); |
33 | document.getElementById('auth_info').value = | ||
34 | this.flickr.user.fullname+' ['+this.flickr.user.username+']'; | ||
35 | document.getElementById('auth_info').disabled = false; | ||
36 | document.getElementById('b_auth').hidden = true; | ||
37 | } | 41 | } |
38 | }, | 42 | }, |
39 | on_auth: function() { | 43 | set_auth_state: function(au,inp) { /* authorized, in progress */ |
44 | this.cmd_auth_unauth.disabled = !au; | ||
45 | this.b_auth.hidden = au || inp; | ||
46 | this.b_auth_done.hidden = !inp; | ||
47 | this.menu_auth_done.hidden = !inp; | ||
48 | this.cmd_auth_done.setAttribute('disabled',!inp); | ||
49 | this.auth_info.disabled = !au; | ||
50 | if(au) { | ||
51 | this.auth_info.value = this.flickr.user.fullname+' ['+this.flickr.user.username+']'; /* TODO: move to locale */ | ||
52 | }else{ | ||
53 | this.auth_info.value = this.no_auth_info_label; | ||
54 | } | ||
55 | }, | ||
56 | on_cmd_auth: function() { | ||
40 | var _this = this; | 57 | var _this = this; |
41 | this.flickr.authorize_0( | 58 | this.flickr.authorize_0( |
42 | function() { | 59 | function() { |
43 | document.getElementById('b_auth').hidden = true; | 60 | _this.set_auth_state(_this.flickr.token,true); |
44 | document.getElementById('b_auth_done').hidden = false; | ||
45 | }, function(x,s,c,m) { | 61 | }, function(x,s,c,m) { |
46 | _this.flickr_failure(x,s,c,m); | 62 | _this.flickr_failure(x,s,c,m); |
47 | } | 63 | } |
48 | ); | 64 | ); |
49 | }, | 65 | }, |
50 | on_auth_done: function() { | 66 | on_cmd_auth_done: function() { |
51 | document.getElementById('b_auth_done').hidden = true; | 67 | this.set_auth_state(this.flickr.token,false); |
52 | var _this = this; | 68 | var _this = this; |
53 | this.flickr.authorize_1( | 69 | this.flickr.authorize_1( |
54 | function() { | 70 | function() { |
55 | _this.flickr.save_token(); | 71 | _this.flickr.save_token(); |
56 | _this.refresh_stuff(); | 72 | _this.refresh_stuff(); |
57 | document.getElementById('auth_info').value = | 73 | _this.set_auth_state(_this.flickr.token,false); |
74 | _this.auth_info.value = | ||
58 | _this.flickr.user.fullname+' ['+_this.flickr.user.username+']'; | 75 | _this.flickr.user.fullname+' ['+_this.flickr.user.username+']'; |
59 | document.getElementById('auth_info').disabled = false; | ||
60 | }, function(x,s,c,m) { | 76 | }, function(x,s,c,m) { |
61 | document.getElementById('b_auth').hidden = false; | 77 | _this.set_auth_state(_this.flickr.token,false); /* XXX: no reset token? */ |
62 | _this.flickr_failure(x,s,c,m); | 78 | _this.flickr_failure(x,s,c,m); |
63 | } | 79 | } |
64 | ); | 80 | ); |
65 | }, | 81 | }, |
82 | on_cmd_auth_unauth: function() { | ||
83 | this.flickr.reset_token(); | ||
84 | this.set_auth_state(false,false); | ||
85 | }, | ||
66 | 86 | ||
67 | refresh_sets: function() { this.photosets.refresh_sets(); }, | 87 | refresh_sets: function() { this.photosets.refresh_sets(); }, |
68 | refresh_stuff: function() { | 88 | refresh_stuff: function() { |
69 | this.refresh_sets(); | 89 | this.refresh_sets(); |
70 | this.refresh_user_tags(); | 90 | this.refresh_user_tags(); |
71 | }, | 91 | }, |
@@ -863,16 +883,14 @@ var fireflix = { | |||
863 | return mp; | 883 | return mp; |
864 | }, | 884 | }, |
865 | 885 | ||
866 | flickr_failure: function(x,s,c,m) { | 886 | flickr_failure: function(x,s,c,m) { |
867 | if(c==98) { // Invalid auth token | 887 | if(c==98) { // Invalid auth token |
868 | this.flickr.reset_token(); | 888 | this.flickr.reset_token(); |
869 | document.getElementById('auth_info').value = this.no_auth_info_label; | 889 | this.set_auth_state(false,false); |
870 | document.getElementById('auth_info').disabled = true; | ||
871 | document.getElementById('b_auth').hidden = false; | ||
872 | return; | 890 | return; |
873 | } | 891 | } |
874 | // TODO: is that beauty | 892 | // TODO: is that beauty? |
875 | alert('flickr api call failed\n'+c+' '+m); | 893 | alert('flickr api call failed\n'+c+' '+m); |
876 | } | 894 | } |
877 | 895 | ||
878 | }; | 896 | }; |