summaryrefslogtreecommitdiffabout
path: root/content
authorMichael Krelin <hacker@klever.net>2006-10-01 20:17:40 (UTC)
committer Michael Krelin <hacker@klever.net>2006-10-01 20:17:40 (UTC)
commitfa83ec27570f4d397aefeaa11e1f74b49b8d9402 (patch) (side-by-side diff)
tree1d40b49c027742d294fe6e39ba2535afd61011e3 /content
parent1667f51c2ab80c8a33216d0d4fbb9e5af50bb76f (diff)
downloadfireflix-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
Diffstat (limited to 'content') (more/less context) (ignore whitespace changes)
-rw-r--r--content/fireflix-panel.xul2
-rw-r--r--content/fireflix.css7
-rw-r--r--content/fireflix.js20
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 @@
<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">
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 {
+div#searchresult_description {
+ min-height: 5em; max-height: 8em;
+ overflow: auto;
+ font-size: 90%;
+ margin: 0.1ex 0.5ex;
+}
+
#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 = {
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');
}