summaryrefslogtreecommitdiffabout
path: root/content
Side-by-side diff
Diffstat (limited to 'content') (more/less context) (ignore whitespace changes)
-rw-r--r--content/fireflix.js4
-rw-r--r--content/flickr.js12
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
@@ -45,25 +45,27 @@ var fireflix = {
this.menu_auth_done.hidden = !inp;
this.cmd_auth_done.setAttribute('disabled',!inp);
this.auth_info.disabled = !au;
if(au) {
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);
var _this = this;
this.flickr.authorize_1(
function() {
_this.flickr.save_token();
diff --git a/content/flickr.js b/content/flickr.js
index add628a..b5bfa43 100644
--- a/content/flickr.js
+++ b/content/flickr.js
@@ -136,39 +136,33 @@ Flickr.prototype = {
if(on_failure) on_failure(x,stat,ecode,emsg);
}
}else{
if(on_failure) on_failure(x);
}
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,
authorize_1: function(on_s, on_f) {
var _this = this;
this.api_call(
{ method: 'flickr.auth.getToken', frob: this.frob },