-rw-r--r-- | content/fireflix-panel.xul | 2 | ||||
-rw-r--r-- | content/fireflix.css | 7 | ||||
-rw-r--r-- | content/fireflix.js | 20 |
3 files changed, 14 insertions, 15 deletions
diff --git a/content/fireflix-panel.xul b/content/fireflix-panel.xul index b84b596..e5e1742 100644 --- a/content/fireflix-panel.xul +++ b/content/fireflix-panel.xul @@ -139,25 +139,25 @@ <treecol id="sr_title" label="&panel.search.col.title.label;" flex="2" crop="end" align="start" /> </treecols> <treechildren/> </tree> <groupbox id="searchresult_props" orient="horizontal" hidden="true"> <vbox width="100" pack="center"> <hbox pack="center"> <image id="search_photo"/> </hbox> </vbox> <vbox flex="1"> <label id="searchresult_title"/> - <iframe flex="1" id="searchresult_description"/> + <div flex="1" id="searchresult_description" xmlns="http://www.w3.org/1999/xhtml"/> <hbox pack="end"> <button command="cmd_search_open"/> </hbox> </vbox> </groupbox> </vbox> </tabpanel> <tabpanel id="tabpanel_sets" flex="1" onkeypress="if(event.keyCode==event.DOM_VK_RETURN) document.getElementById('setphotos').focus()"> <vbox flex="1"> diff --git a/content/fireflix.css b/content/fireflix.css index 4a3228f..c16dca6 100644 --- a/content/fireflix.css +++ b/content/fireflix.css @@ -63,20 +63,27 @@ image#set_photo, image#set_primary { .about .link { text-decoration: underline; color: white; cursor: pointer; } menuitem.menuhead { background: gray; color: black; font-weight: bold; } +div#searchresult_description { + min-height: 5em; max-height: 8em; + overflow: auto; + font-size: 90%; + margin: 0.1ex 0.5ex; +} + #copying div { margin: 1ex 1em; font-family: courier, monospace; font-size: 9pt; padding: 2px; border: dotted 1px gray; background: white; } 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 = { var xp = x.evaluate( '/rsp/photos/photo', x, null, XPathResult.ORDERED_NODE_ITERATOR_TYPE, null ); _this.importXPR(xp); _this.on_select(); }, function(x,s,c,m) { _this.fireflix.flickr_failure(x,s,c,m); } ); }, render_description_frame: function(content) { if(!content) { - try { - this.searchresult_description.contentDocument.lastChild.innerHTML - = ''; - }catch(e) { } /* it will throw exceptions when the iframe isn't well - prepared to meet me, but it's unimportant then, anyway */ + this.searchresult_description.innerHTML = ''; }else{ - this.searchresult_description.contentDocument.lastChild.setAttribute( - 'style', - 'font-size: 80%; margin: 1px 3px; font-family: arial, sans-serif' - ); - this.searchresult_description.contentDocument.lastChild.innerHTML - = content; - var ls = this.searchresult_description.contentDocument.links; - for(var l=0;l<ls.length;++l) - ls.item(l).setAttribute('target','_blank'); + this.searchresult_description.innerHTML = content?content:''; + /* of all linking elements flickr only allows a */ + var as = this.searchresult_description.getElementsByTagName('a'); + for(var a=0;a<as.length;++a) + as.item(a).setAttribute('target','_blank'); } }, on_select: function() { if(this.selection.currentIndex<0) { this.searchresult_props.hidden = true; }else{ var p = this.photos[this.selection.currentIndex]; if(!p) { this.searchresult_props.hidden = true; }else{ this.search_photo.src = this.fireflix.flickr.make_photo_url(p,'t'); this.searchresult_title.value = p.title; |