summaryrefslogtreecommitdiffabout
path: root/content/fireflix.js
Side-by-side diff
Diffstat (limited to 'content/fireflix.js') (more/less context) (ignore whitespace changes)
-rw-r--r--content/fireflix.js4
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
@@ -9,97 +9,99 @@ function splitascii(s) {
}
var fireflix = {
flickr: new Flickr(),
init: function() {
pull_elements(this,document,[
'cmd_auth_auth','cmd_auth_done','cmd_auth_unauth',
'menu_auth_done','b_auth','b_auth_done','auth_info',
'loc_strings','cmd_set_props'
]);
this.build_menus();
this.foundphotos.init(this);
this.photosets.init(this);
this.photoset.init(this);
this.uploads.init(this);
this.uploadObserver.init(this);
this.flickr.api_key = '9c43cd66947a57e6f29db1a9da3f72e3';
this.flickr.api_shs = '9c33c9e2f0f0cfd5';
this.flickr.prefs_root = 'net.klever.kin.fireflix';
this.flickr.load_token();
document.getElementById('setslist').view = this.photosets;
document.getElementById('setphotos').view = this.photoset;
document.getElementById('uploadlist').view = this.uploads;
this.no_auth_info_label = this.auth_info.value;
this.set_auth_state(this.flickr.token,false);
if(this.flickr.token) {
this.refresh_stuff();
}else{
this.on_cmd_auth();
}
},
set_auth_state: function(au,inp) { /* authorized, in progress */
this.cmd_auth_unauth.disabled = !au;
this.b_auth.hidden = au || inp;
this.b_auth_done.hidden = !inp;
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();
_this.refresh_stuff();
_this.set_auth_state(_this.flickr.token,false);
_this.auth_info.value =
_this.flickr.user.fullname+' ['+_this.flickr.user.username+']';
}, function(x,s,c,m) {
_this.set_auth_state(_this.flickr.token,false); /* XXX: no reset token? */
_this.flickr_failure(x,s,c,m);
}
);
},
on_cmd_auth_unauth: function() {
this.flickr.reset_token();
this.set_auth_state(false,false);
},
refresh_sets: function() { this.photosets.refresh_sets(); },
refresh_stuff: function() {
this.refresh_sets();
this.refresh_user_tags();
},
/* photoset treeview */
photoset: {
photos: new Array(),
fireflix: null,
init: function(f) {
this.fireflix = f;
pull_elements(this,document,[ 'set_photo' ]);
},
rowCount: 0,
getCellText: function(r,c) {
var p = this.photos[r];
if(c.id=='sp_title') return p.title;
if(c.id=='sp_taken') return p.datetaken;
if(c.id=='sp_upload') return p.dateupload; /* TODO: unixtime conversion */
return c.id;