summaryrefslogtreecommitdiffabout
path: root/content/fireflix.js
Side-by-side diff
Diffstat (limited to 'content/fireflix.js') (more/less context) (show whitespace changes)
-rw-r--r--content/fireflix.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/content/fireflix.js b/content/fireflix.js
index 48053c5..328e9e2 100644
--- a/content/fireflix.js
+++ b/content/fireflix.js
@@ -72,49 +72,49 @@ var fireflix = {
_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' ]);
+ pull_elements(this,document,[ 'set_photo', 'set_photo_props' ]);
document.getElementById('setphotos').view = this;
},
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') {
var du = new Date(p.dateupload*1000);
var rv = du.getFullYear()+'-'+(du.getMonth()+1)+'-'+du.getDate()
+' '+
du.getHours()+':'+du.getMinutes()+':'+du.getSeconds();
return rv.replace(/(\D)(\d)(\D)/,'$10$2$3');
}
return c.id;
},
setTree: function(t) { this.tree = t },
isContainer: function(r) { return false; },
isSeparator: function(r) { return false; },
isSorted: function(r) { return false; },
getLevel: function(r) { return 0; },
getImageSrc: function(r,c) { return null },
getRowProperties: function(r,p) {},
getCellProperties: function(cid,cel,p) {},
@@ -137,51 +137,51 @@ var fireflix = {
load_photos: function(psid) {
var _this = this;
this.fireflix.flickr.api_call(
{
method: 'flickr.photosets.getPhotos',
auth_token: 'default',
photoset_id: psid,
extras: 'license,date_upload,date_taken,owner_name,icon_server,original_format,last_update'
}, function(xr) {
var x = xr.responseXML;
var xp = x.evaluate(
'/rsp/photoset/photo', x, null,
XPathResult.ORDERED_NODE_ITERATOR_TYPE, null );
_this.importXPR(xp);
}, function(x,s,c,m) {
_this.fireflix.flickr_failure(x,s,c,m);
}
);
},
on_select: function() {
if(this.selection.count==1) {
var p = this.photos[this.selection.currentIndex];
this.set_photo.src =
this.fireflix.flickr.get_photo_url(p.server,p.id,p.secret,'t');
- this.set_photo.hidden = false;
+ this.set_photo_props.hidden = false;
}else{
- this.set_photo.hidden = true;
+ this.set_photo_props.hidden = true;
}
},
on_cmd_open: function(ev) {
if(this.selection.currentIndex<0) return;
var p = this.photos[this.selection.currentIndex];
if(!p.id) return;
this.fireflix.openTab(this.fireflix.flickr.make_photo_url(p,'p'));
}
},
/* photosets treeview */
photosets: {
sets: new Array(),
fireflix: null,
init: function(f) {
this.fireflix = f;
document.getElementById('setslist').view = this;
},
rowCount: 0,
getCellText: function(r,c) {
var s = this.sets[r];
if(c.id=='sl_name') return s.title;
if(c.id=='sl_photos') return s.photos;
return c.id;