| -rw-r--r-- | content/fireflix.js | 4 | ||||
| -rw-r--r-- | content/flickr.js | 12 |
2 files changed, 6 insertions, 10 deletions
diff --git a/content/fireflix.js b/content/fireflix.js index 0f01d26..f180379 100644 --- a/content/fireflix.js +++ b/content/fireflix.js @@ -49,17 +49,19 @@ var fireflix = { this.auth_info.value = this.flickr.user.fullname+' ['+this.flickr.user.username+']'; /* TODO: move to locale */ }else{ this.auth_info.value = this.no_auth_info_label; } }, on_cmd_auth: function() { var _this = this; this.flickr.authorize_0( - function() { + 'delete', + function(x,f,u) { + _this.openTab(u); _this.set_auth_state(_this.flickr.token,true); }, function(x,s,c,m) { _this.flickr_failure(x,s,c,m); } ); }, on_cmd_auth_done: function() { this.set_auth_state(this.flickr.token,false); diff --git a/content/flickr.js b/content/flickr.js index add628a..b5bfa43 100644 --- a/content/flickr.js +++ b/content/flickr.js @@ -140,31 +140,25 @@ Flickr.prototype = { } return true; } x.send(null); return true; }, frob: null, - authorize_0: function(on_s, on_f) { + authorize_0: function(perms, on_s, on_f) { var _this = this; this.api_call( { method: 'flickr.auth.getFrob' }, function(x) { _this.frob = xp_str('/rsp/frob',x.responseXML); var u = _this.api_call_url( - { frob: _this.frob, perms: 'delete' }, _this.auth_url ); - var wm = Components.classes['@mozilla.org/appshell/window-mediator;1'].getService( - Components.interfaces.nsIWindowMediator ); - var bw = wm.getMostRecentWindow('navigator:browser'); - var b = bw.getBrowser(); - var t = b.addTab(u); - b.selectedTab = t; - if(on_s) on_s(); + { frob: _this.frob, perms: perms?perms:'delete' }, _this.auth_url ); + if(on_s) on_s(x,_this.frob,u); }, function(x,s,c,m) { if(on_f) on_f(x,s,c,m); } ); }, token: null, perms: null, user: null, |