-rw-r--r-- | content/fireflix.js | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/content/fireflix.js b/content/fireflix.js index 6773134..6681303 100644 --- a/content/fireflix.js +++ b/content/fireflix.js | |||
@@ -747,39 +747,31 @@ var fireflix = { | |||
747 | var xp = x.evaluate( | 747 | var xp = x.evaluate( |
748 | '/rsp/photos/photo', x, null, | 748 | '/rsp/photos/photo', x, null, |
749 | XPathResult.ORDERED_NODE_ITERATOR_TYPE, null ); | 749 | XPathResult.ORDERED_NODE_ITERATOR_TYPE, null ); |
750 | _this.importXPR(xp); | 750 | _this.importXPR(xp); |
751 | _this.on_select(); | 751 | _this.on_select(); |
752 | }, function(x,s,c,m) { | 752 | }, function(x,s,c,m) { |
753 | _this.fireflix.flickr_failure(x,s,c,m); | 753 | _this.fireflix.flickr_failure(x,s,c,m); |
754 | } | 754 | } |
755 | ); | 755 | ); |
756 | }, | 756 | }, |
757 | render_description_frame: function(content) { | 757 | render_description_frame: function(content) { |
758 | if(!content) { | 758 | if(!content) { |
759 | try { | 759 | this.searchresult_description.innerHTML = ''; |
760 | this.searchresult_description.contentDocument.lastChild.innerHTML | ||
761 | = ''; | ||
762 | }catch(e) { } /* it will throw exceptions when the iframe isn't well | ||
763 | prepared to meet me, but it's unimportant then, anyway */ | ||
764 | }else{ | 760 | }else{ |
765 | this.searchresult_description.contentDocument.lastChild.setAttribute( | 761 | this.searchresult_description.innerHTML = content?content:''; |
766 | 'style', | 762 | /* of all linking elements flickr only allows a */ |
767 | 'font-size: 80%; margin: 1px 3px; font-family: arial, sans-serif' | 763 | var as = this.searchresult_description.getElementsByTagName('a'); |
768 | ); | 764 | for(var a=0;a<as.length;++a) |
769 | this.searchresult_description.contentDocument.lastChild.innerHTML | 765 | as.item(a).setAttribute('target','_blank'); |
770 | = content; | ||
771 | var ls = this.searchresult_description.contentDocument.links; | ||
772 | for(var l=0;l<ls.length;++l) | ||
773 | ls.item(l).setAttribute('target','_blank'); | ||
774 | } | 766 | } |
775 | }, | 767 | }, |
776 | on_select: function() { | 768 | on_select: function() { |
777 | if(this.selection.currentIndex<0) { | 769 | if(this.selection.currentIndex<0) { |
778 | this.searchresult_props.hidden = true; | 770 | this.searchresult_props.hidden = true; |
779 | }else{ | 771 | }else{ |
780 | var p = this.photos[this.selection.currentIndex]; | 772 | var p = this.photos[this.selection.currentIndex]; |
781 | if(!p) { | 773 | if(!p) { |
782 | this.searchresult_props.hidden = true; | 774 | this.searchresult_props.hidden = true; |
783 | }else{ | 775 | }else{ |
784 | this.search_photo.src = this.fireflix.flickr.make_photo_url(p,'t'); | 776 | this.search_photo.src = this.fireflix.flickr.make_photo_url(p,'t'); |
785 | this.searchresult_title.value = p.title; | 777 | this.searchresult_title.value = p.title; |