summaryrefslogtreecommitdiffabout
path: root/content
authorMichael Krelin <hacker@klever.net>2006-11-16 22:22:23 (UTC)
committer Michael Krelin <hacker@klever.net>2006-11-16 22:22:23 (UTC)
commitd98dfeb112f9db06c5e642e14ee9bbda4d90d0cb (patch) (side-by-side diff)
treedee166a9e25442a9043492f38104397fb748633b /content
parent4b21b4fc5248322c10ffb24edfd5ec78ebcce824 (diff)
downloadfireflix-d98dfeb112f9db06c5e642e14ee9bbda4d90d0cb.zip
fireflix-d98dfeb112f9db06c5e642e14ee9bbda4d90d0cb.tar.gz
fireflix-d98dfeb112f9db06c5e642e14ee9bbda4d90d0cb.tar.bz2
double click on photoset opens photoset in flickr now
git-svn-id: http://svn.klever.net/kin/fireflix/trunk@229 fe716a7a-6dde-0310-88d9-d003556173a8
Diffstat (limited to 'content') (more/less context) (ignore whitespace changes)
-rw-r--r--content/fireflix-panel.xul1
-rw-r--r--content/fireflix.js12
-rw-r--r--content/flickr.js4
3 files changed, 13 insertions, 4 deletions
diff --git a/content/fireflix-panel.xul b/content/fireflix-panel.xul
index b2ca7dc..af92d22 100644
--- a/content/fireflix-panel.xul
+++ b/content/fireflix-panel.xul
@@ -185,4 +185,5 @@
<tree id="setslist" rows="2" onselect="fireflix.photosets.on_select()"
flex="1" context="sets_menu"
+ ondblclick="fireflix.photosets.on_cmd_open_in_flickr(event)"
>
<treecols>
diff --git a/content/fireflix.js b/content/fireflix.js
index 24894df..48053c5 100644
--- a/content/fireflix.js
+++ b/content/fireflix.js
@@ -165,9 +165,7 @@ var fireflix = {
},
on_cmd_open: function(ev) {
- if(this.selection.currentIndex<0)
- return;
+ if(this.selection.currentIndex<0) return;
var p = this.photos[this.selection.currentIndex];
- if(!p.id)
- return;
+ if(!p.id) return;
this.fireflix.openTab(this.fireflix.flickr.make_photo_url(p,'p'));
}
@@ -237,4 +235,10 @@ var fireflix = {
this.fireflix.cmd_set_props.setAttribute('disabled','true');
}
+ },
+ on_cmd_open_in_flickr: function(ev) {
+ if(this.selection.currentIndex<0) return;
+ var p = this.sets[this.selection.currentIndex];
+ if(!p.id) return;
+ this.fireflix.openTab(this.fireflix.flickr.make_photoset_url(p));
}
},
diff --git a/content/flickr.js b/content/flickr.js
index 75d1a72..b8360c1 100644
--- a/content/flickr.js
+++ b/content/flickr.js
@@ -272,4 +272,8 @@ Flickr.prototype = {
return this.get_image_url(p,sfx);
},
+ make_photoset_url: function(ps) {
+ // TODO: allow for using someone else's photoset?
+ return this.photos_url+this.user.nsid+'/sets/'+ps.id;
+ },
upload_file: function(f,fa,on_success,on_failure) {