-rw-r--r-- | content/fireflix.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/content/fireflix.js b/content/fireflix.js index 0f01d26..f180379 100644 --- a/content/fireflix.js +++ b/content/fireflix.js | |||
@@ -33,49 +33,51 @@ var fireflix = { | |||
33 | this.no_auth_info_label = this.auth_info.value; | 33 | this.no_auth_info_label = this.auth_info.value; |
34 | this.set_auth_state(this.flickr.token,false); | 34 | this.set_auth_state(this.flickr.token,false); |
35 | if(this.flickr.token) { | 35 | if(this.flickr.token) { |
36 | this.refresh_stuff(); | 36 | this.refresh_stuff(); |
37 | }else{ | 37 | }else{ |
38 | this.on_cmd_auth(); | 38 | this.on_cmd_auth(); |
39 | } | 39 | } |
40 | }, | 40 | }, |
41 | set_auth_state: function(au,inp) { /* authorized, in progress */ | 41 | set_auth_state: function(au,inp) { /* authorized, in progress */ |
42 | this.cmd_auth_unauth.disabled = !au; | 42 | this.cmd_auth_unauth.disabled = !au; |
43 | this.b_auth.hidden = au || inp; | 43 | this.b_auth.hidden = au || inp; |
44 | this.b_auth_done.hidden = !inp; | 44 | this.b_auth_done.hidden = !inp; |
45 | this.menu_auth_done.hidden = !inp; | 45 | this.menu_auth_done.hidden = !inp; |
46 | this.cmd_auth_done.setAttribute('disabled',!inp); | 46 | this.cmd_auth_done.setAttribute('disabled',!inp); |
47 | this.auth_info.disabled = !au; | 47 | this.auth_info.disabled = !au; |
48 | if(au) { | 48 | if(au) { |
49 | this.auth_info.value = this.flickr.user.fullname+' ['+this.flickr.user.username+']'; /* TODO: move to locale */ | 49 | this.auth_info.value = this.flickr.user.fullname+' ['+this.flickr.user.username+']'; /* TODO: move to locale */ |
50 | }else{ | 50 | }else{ |
51 | this.auth_info.value = this.no_auth_info_label; | 51 | this.auth_info.value = this.no_auth_info_label; |
52 | } | 52 | } |
53 | }, | 53 | }, |
54 | on_cmd_auth: function() { | 54 | on_cmd_auth: function() { |
55 | var _this = this; | 55 | var _this = this; |
56 | this.flickr.authorize_0( | 56 | this.flickr.authorize_0( |
57 | function() { | 57 | 'delete', |
58 | function(x,f,u) { | ||
59 | _this.openTab(u); | ||
58 | _this.set_auth_state(_this.flickr.token,true); | 60 | _this.set_auth_state(_this.flickr.token,true); |
59 | }, function(x,s,c,m) { | 61 | }, function(x,s,c,m) { |
60 | _this.flickr_failure(x,s,c,m); | 62 | _this.flickr_failure(x,s,c,m); |
61 | } | 63 | } |
62 | ); | 64 | ); |
63 | }, | 65 | }, |
64 | on_cmd_auth_done: function() { | 66 | on_cmd_auth_done: function() { |
65 | this.set_auth_state(this.flickr.token,false); | 67 | this.set_auth_state(this.flickr.token,false); |
66 | var _this = this; | 68 | var _this = this; |
67 | this.flickr.authorize_1( | 69 | this.flickr.authorize_1( |
68 | function() { | 70 | function() { |
69 | _this.flickr.save_token(); | 71 | _this.flickr.save_token(); |
70 | _this.refresh_stuff(); | 72 | _this.refresh_stuff(); |
71 | _this.set_auth_state(_this.flickr.token,false); | 73 | _this.set_auth_state(_this.flickr.token,false); |
72 | _this.auth_info.value = | 74 | _this.auth_info.value = |
73 | _this.flickr.user.fullname+' ['+_this.flickr.user.username+']'; | 75 | _this.flickr.user.fullname+' ['+_this.flickr.user.username+']'; |
74 | }, function(x,s,c,m) { | 76 | }, function(x,s,c,m) { |
75 | _this.set_auth_state(_this.flickr.token,false); /* XXX: no reset token? */ | 77 | _this.set_auth_state(_this.flickr.token,false); /* XXX: no reset token? */ |
76 | _this.flickr_failure(x,s,c,m); | 78 | _this.flickr_failure(x,s,c,m); |
77 | } | 79 | } |
78 | ); | 80 | ); |
79 | }, | 81 | }, |
80 | on_cmd_auth_unauth: function() { | 82 | on_cmd_auth_unauth: function() { |
81 | this.flickr.reset_token(); | 83 | this.flickr.reset_token(); |