author | Michael Krelin <hacker@klever.net> | 2006-09-30 23:30:13 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2006-09-30 23:30:13 (UTC) |
commit | 1667f51c2ab80c8a33216d0d4fbb9e5af50bb76f (patch) (side-by-side diff) | |
tree | 79940e7248b8dcf5cd7bfaafefd11e5c06a34059 /content | |
parent | 01fbc99cb713a0c4656f33949b2949bf7403656b (diff) | |
download | fireflix-1667f51c2ab80c8a33216d0d4fbb9e5af50bb76f.zip fireflix-1667f51c2ab80c8a33216d0d4fbb9e5af50bb76f.tar.gz fireflix-1667f51c2ab80c8a33216d0d4fbb9e5af50bb76f.tar.bz2 |
moved photo description to iframe to make it html-enabled (still not sure if using div would be a better idea)
git-svn-id: http://svn.klever.net/kin/fireflix/trunk@172 fe716a7a-6dde-0310-88d9-d003556173a8
-rw-r--r-- | content/fireflix-panel.xul | 2 | ||||
-rw-r--r-- | content/fireflix.css | 8 | ||||
-rw-r--r-- | content/fireflix.js | 25 |
3 files changed, 23 insertions, 12 deletions
diff --git a/content/fireflix-panel.xul b/content/fireflix-panel.xul index 2a15a51..b84b596 100644 --- a/content/fireflix-panel.xul +++ b/content/fireflix-panel.xul @@ -149,5 +149,5 @@ <vbox flex="1"> <label id="searchresult_title"/> - <textbox flex="1" multiline="true" class="plain" readonly="true" id="searchresult_description"/> + <iframe flex="1" id="searchresult_description"/> <hbox pack="end"> <button command="cmd_search_open"/> diff --git a/content/fireflix.css b/content/fireflix.css index 188f48e..4a3228f 100644 --- a/content/fireflix.css +++ b/content/fireflix.css @@ -73,12 +73,4 @@ menuitem.menuhead { } -label#searchresult_description { - font-weight: bold; -} -textbox#searchresult_description { - padding: 1px 3px !important; - background: white; -} - #copying div { margin: 1ex 1em; diff --git a/content/fireflix.js b/content/fireflix.js index 337354e..6773134 100644 --- a/content/fireflix.js +++ b/content/fireflix.js @@ -755,4 +755,23 @@ var fireflix = { ); }, + 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 */ + }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'); + } + }, on_select: function() { if(this.selection.currentIndex<0) { @@ -765,5 +784,5 @@ var fireflix = { this.search_photo.src = this.fireflix.flickr.make_photo_url(p,'t'); this.searchresult_title.value = p.title; - this.searchresult_description.value = null; + this.render_description_frame(null); if(p.description==null && p.description==undefined) { var pid = p.id; @@ -781,5 +800,5 @@ var fireflix = { var n = xp_node('/rsp/photo',xr.responseXML); pp.fromNode_(n); - _this.searchresult_description.value=pp.description?pp.description:null; + _this.render_description_frame(pp.description); } }, function(x,s,c,m) { @@ -789,5 +808,5 @@ var fireflix = { this.searchresult_props.hidden = false; }else{ - this.searchresult_description.value=p.description?p.description:null; + this.render_description_frame(p.description); } } |