From d98dfeb112f9db06c5e642e14ee9bbda4d90d0cb Mon Sep 17 00:00:00 2001 From: Michael Krelin Date: Thu, 16 Nov 2006 22:22:23 +0000 Subject: 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 --- diff --git a/NEWS b/NEWS index b44ece1..219a07f 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,7 @@ 0.0.5 () - Added toolbar button - Enter or double click on photo in set now opens photo in flickr + - Double click on photoset opens photoset in flickr 0.0.4 (November 13th, 2006) - Added button to remove linebreaks from generated HTML - Added the word 'sidebar' to the extension name so that you don't have to look hard for it diff --git a/NEWS.xml b/NEWS.xml index 79ccf1a..b8f1cf4 100644 --- a/NEWS.xml +++ b/NEWS.xml @@ -3,6 +3,7 @@ Added toolbar button Enter or double click on photo in set now opens photo in flickr + Double click on photoset opens photoset in flickr Added button to remove linebreaks from generated HTML 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 @@ -184,6 +184,7 @@ diff --git a/content/fireflix.js b/content/fireflix.js index 24894df..48053c5 100644 --- a/content/fireflix.js +++ b/content/fireflix.js @@ -164,11 +164,9 @@ 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')); } }, @@ -236,6 +234,12 @@ var fireflix = { }else{ 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 @@ -271,6 +271,10 @@ Flickr.prototype = { else 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) { try { -- cgit v0.9.0.2