summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (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
@@ -56,3 +56,5 @@ var fireflix = {
this.flickr.authorize_0(
- function() {
+ 'delete',
+ function(x,f,u) {
+ _this.openTab(u);
_this.set_auth_state(_this.flickr.token,true);
diff --git a/content/flickr.js b/content/flickr.js
index add628a..b5bfa43 100644
--- a/content/flickr.js
+++ b/content/flickr.js
@@ -147,3 +147,3 @@ Flickr.prototype = {
frob: null,
- authorize_0: function(on_s, on_f) {
+ authorize_0: function(perms, on_s, on_f) {
var _this = this;
@@ -154,10 +154,4 @@ Flickr.prototype = {
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) {