summaryrefslogtreecommitdiffabout
path: root/content/flickr.js
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) (unidiff)
treedee166a9e25442a9043492f38104397fb748633b /content/flickr.js
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/flickr.js') (more/less context) (ignore whitespace changes)
-rw-r--r--content/flickr.js4
1 files changed, 4 insertions, 0 deletions
diff --git a/content/flickr.js b/content/flickr.js
index 75d1a72..b8360c1 100644
--- a/content/flickr.js
+++ b/content/flickr.js
@@ -250,48 +250,52 @@ Flickr.prototype = {
250 o.server, 250 o.server,
251 (o instanceof Photoset)? o.primary : o.id, 251 (o instanceof Photoset)? o.primary : o.id,
252 o.secret, 252 o.secret,
253 sfx, 253 sfx,
254 (sfx=='o')?o.originalformat:null 254 (sfx=='o')?o.originalformat:null
255 ); 255 );
256 }, 256 },
257 get_photo_page_url: function(p) { 257 get_photo_page_url: function(p) {
258 if(p instanceof Photo) { 258 if(p instanceof Photo) {
259 // TODO: track photoset and user owner id from there? 259 // TODO: track photoset and user owner id from there?
260 // The approach below is sheerly wrong. 260 // The approach below is sheerly wrong.
261 var o = this.user.nsid; 261 var o = this.user.nsid;
262 if(p.owner && p.owner.nsid) o = p.owner.nsid; 262 if(p.owner && p.owner.nsid) o = p.owner.nsid;
263 var rv = this.photos_url + o +'/' + p.id; 263 var rv = this.photos_url + o +'/' + p.id;
264 return rv; 264 return rv;
265 }else // TODO: take owner into account? 265 }else // TODO: take owner into account?
266 return this.photos_url + this.user.nsid + '/' + p; 266 return this.photos_url + this.user.nsid + '/' + p;
267 }, 267 },
268 make_photo_url: function(p,sfx) { 268 make_photo_url: function(p,sfx) {
269 if(sfx=='p') 269 if(sfx=='p')
270 return this.get_photo_page_url(p); 270 return this.get_photo_page_url(p);
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 {
277 var fi = Components.classes["@mozilla.org/file/local;1"] 281 var fi = Components.classes["@mozilla.org/file/local;1"]
278 .createInstance(Components.interfaces.nsILocalFile); 282 .createInstance(Components.interfaces.nsILocalFile);
279 fi.initWithPath( f ); 283 fi.initWithPath( f );
280 var st = Components.classes["@mozilla.org/network/file-input-stream;1"] 284 var st = Components.classes["@mozilla.org/network/file-input-stream;1"]
281 .createInstance(Components.interfaces.nsIFileInputStream); 285 .createInstance(Components.interfaces.nsIFileInputStream);
282 st.init(fi,0x01,00004,null); 286 st.init(fi,0x01,00004,null);
283 var bis = Components.classes["@mozilla.org/binaryinputstream;1"] 287 var bis = Components.classes["@mozilla.org/binaryinputstream;1"]
284 .createInstance(Components.interfaces.nsIBinaryInputStream); 288 .createInstance(Components.interfaces.nsIBinaryInputStream);
285 bis.setInputStream(st); 289 bis.setInputStream(st);
286 290
287 // allocate and initialize temp storage string 291 // allocate and initialize temp storage string
288 var pbs = Components.classes["@mozilla.org/storagestream;1"] 292 var pbs = Components.classes["@mozilla.org/storagestream;1"]
289 .createInstance(Components.interfaces.nsIStorageStream); 293 .createInstance(Components.interfaces.nsIStorageStream);
290 pbs.init(1024,10000000,null); 294 pbs.init(1024,10000000,null);
291 // create output stream 295 // create output stream
292 var pbos = pbs.getOutputStream(0); 296 var pbos = pbs.getOutputStream(0);
293 // and a binaryoutputstream interface 297 // and a binaryoutputstream interface
294 var pbbos = Components.classes["@mozilla.org/binaryoutputstream;1"] 298 var pbbos = Components.classes["@mozilla.org/binaryoutputstream;1"]
295 .createInstance(Components.interfaces.nsIBinaryOutputStream); 299 .createInstance(Components.interfaces.nsIBinaryOutputStream);
296 pbbos.setOutputStream(pbos); 300 pbbos.setOutputStream(pbos);
297 301