author | Michael Krelin <hacker@klever.net> | 2006-10-01 20:17:40 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2006-10-01 20:17:40 (UTC) |
commit | fa83ec27570f4d397aefeaa11e1f74b49b8d9402 (patch) (unidiff) | |
tree | 1d40b49c027742d294fe6e39ba2535afd61011e3 /content | |
parent | 1667f51c2ab80c8a33216d0d4fbb9e5af50bb76f (diff) | |
download | fireflix-fa83ec27570f4d397aefeaa11e1f74b49b8d9402.zip fireflix-fa83ec27570f4d397aefeaa11e1f74b49b8d9402.tar.gz fireflix-fa83ec27570f4d397aefeaa11e1f74b49b8d9402.tar.bz2 |
for a number of reasons div is better than iframe for the purpose of showing html descriptions
git-svn-id: http://svn.klever.net/kin/fireflix/trunk@173 fe716a7a-6dde-0310-88d9-d003556173a8
-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 | |||
@@ -150,3 +150,3 @@ | |||
150 | <label id="searchresult_title"/> | 150 | <label id="searchresult_title"/> |
151 | <iframe flex="1" id="searchresult_description"/> | 151 | <div flex="1" id="searchresult_description" xmlns="http://www.w3.org/1999/xhtml"/> |
152 | <hbox pack="end"> | 152 | <hbox pack="end"> |
diff --git a/content/fireflix.css b/content/fireflix.css index 4a3228f..c16dca6 100644 --- a/content/fireflix.css +++ b/content/fireflix.css | |||
@@ -74,2 +74,9 @@ menuitem.menuhead { | |||
74 | 74 | ||
75 | div#searchresult_description { | ||
76 | min-height: 5em; max-height: 8em; | ||
77 | overflow: auto; | ||
78 | font-size: 90%; | ||
79 | margin: 0.1ex 0.5ex; | ||
80 | } | ||
81 | |||
75 | #copying div { | 82 | #copying div { |
diff --git a/content/fireflix.js b/content/fireflix.js index 6773134..6681303 100644 --- a/content/fireflix.js +++ b/content/fireflix.js | |||
@@ -758,17 +758,9 @@ var fireflix = { | |||
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 | } |