summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--NEWS1
-rw-r--r--NEWS.xml1
-rw-r--r--content/fireflix-panel.xul1
-rw-r--r--content/fireflix.js12
-rw-r--r--content/flickr.js4
5 files changed, 15 insertions, 4 deletions
diff --git a/NEWS b/NEWS
index b44ece1..219a07f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
10.0.5 () 10.0.5 ()
2 - Added toolbar button 2 - Added toolbar button
3 - Enter or double click on photo in set now opens photo in flickr 3 - Enter or double click on photo in set now opens photo in flickr
4 - Double click on photoset opens photoset in flickr
40.0.4 (November 13th, 2006) 50.0.4 (November 13th, 2006)
5 - Added button to remove linebreaks from generated HTML 6 - Added button to remove linebreaks from generated HTML
6 - Added the word 'sidebar' to the extension name so that you don't have to look hard for it 7 - 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 @@
3 <version version="0.0.5"> 3 <version version="0.0.5">
4 <ni>Added toolbar button</ni> 4 <ni>Added toolbar button</ni>
5 <ni>Enter or double click on photo in set now opens photo in flickr</ni> 5 <ni>Enter or double click on photo in set now opens photo in flickr</ni>
6 <ni>Double click on photoset opens photoset in flickr</ni>
6 </version> 7 </version>
7 <version version="0.0.4" date="November 13th, 2006"> 8 <version version="0.0.4" date="November 13th, 2006">
8 <ni>Added button to remove linebreaks from generated HTML</ni> 9 <ni>Added button to remove linebreaks from generated HTML</ni>
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 @@
184 <vbox flex="1"> 184 <vbox flex="1">
185 <tree id="setslist" rows="2" onselect="fireflix.photosets.on_select()" 185 <tree id="setslist" rows="2" onselect="fireflix.photosets.on_select()"
186 flex="1" context="sets_menu" 186 flex="1" context="sets_menu"
187 ondblclick="fireflix.photosets.on_cmd_open_in_flickr(event)"
187 > 188 >
188 <treecols> 189 <treecols>
189 <treecol id="sl_name" label="&panel.sets.name.label;" flex="4" crop="end" align="start" tooltiptext="&panel.sets.name.tip;"/> 190 <treecol id="sl_name" label="&panel.sets.name.label;" flex="4" crop="end" align="start" tooltiptext="&panel.sets.name.tip;"/>
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 = {
164 } 164 }
165 }, 165 },
166 on_cmd_open: function(ev) { 166 on_cmd_open: function(ev) {
167 if(this.selection.currentIndex<0) 167 if(this.selection.currentIndex<0) return;
168 return;
169 var p = this.photos[this.selection.currentIndex]; 168 var p = this.photos[this.selection.currentIndex];
170 if(!p.id) 169 if(!p.id) return;
171 return;
172 this.fireflix.openTab(this.fireflix.flickr.make_photo_url(p,'p')); 170 this.fireflix.openTab(this.fireflix.flickr.make_photo_url(p,'p'));
173 } 171 }
174 }, 172 },
@@ -236,6 +234,12 @@ var fireflix = {
236 }else{ 234 }else{
237 this.fireflix.cmd_set_props.setAttribute('disabled','true'); 235 this.fireflix.cmd_set_props.setAttribute('disabled','true');
238 } 236 }
237 },
238 on_cmd_open_in_flickr: function(ev) {
239 if(this.selection.currentIndex<0) return;
240 var p = this.sets[this.selection.currentIndex];
241 if(!p.id) return;
242 this.fireflix.openTab(this.fireflix.flickr.make_photoset_url(p));
239 } 243 }
240 }, 244 },
241 245
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 = {
271 else 271 else
272 return this.get_image_url(p,sfx); 272 return this.get_image_url(p,sfx);
273 }, 273 },
274 make_photoset_url: function(ps) {
275 // TODO: allow for using someone else's photoset?
276 return this.photos_url+this.user.nsid+'/sets/'+ps.id;
277 },
274 278
275 upload_file: function(f,fa,on_success,on_failure) { 279 upload_file: function(f,fa,on_success,on_failure) {
276 try { 280 try {