summaryrefslogtreecommitdiffabout
authorMichael Krelin <hacker@klever.net>2006-09-30 23:30:13 (UTC)
committer Michael Krelin <hacker@klever.net>2006-09-30 23:30:13 (UTC)
commit1667f51c2ab80c8a33216d0d4fbb9e5af50bb76f (patch) (unidiff)
tree79940e7248b8dcf5cd7bfaafefd11e5c06a34059
parent01fbc99cb713a0c4656f33949b2949bf7403656b (diff)
downloadfireflix-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
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--content/fireflix-panel.xul2
-rw-r--r--content/fireflix.css8
-rw-r--r--content/fireflix.js25
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
@@ -150,3 +150,3 @@
150 <label id="searchresult_title"/> 150 <label id="searchresult_title"/>
151 <textbox flex="1" multiline="true" class="plain" readonly="true" id="searchresult_description"/> 151 <iframe flex="1" id="searchresult_description"/>
152 <hbox pack="end"> 152 <hbox pack="end">
diff --git a/content/fireflix.css b/content/fireflix.css
index 188f48e..4a3228f 100644
--- a/content/fireflix.css
+++ b/content/fireflix.css
@@ -74,10 +74,2 @@ menuitem.menuhead {
74 74
75label#searchresult_description {
76 font-weight: bold;
77}
78textbox#searchresult_description {
79 padding: 1px 3px !important;
80 background: white;
81}
82
83#copying div { 75#copying div {
diff --git a/content/fireflix.js b/content/fireflix.js
index 337354e..6773134 100644
--- a/content/fireflix.js
+++ b/content/fireflix.js
@@ -756,2 +756,21 @@ var fireflix = {
756 }, 756 },
757 render_description_frame: function(content) {
758 if(!content) {
759 try {
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{
765 this.searchresult_description.contentDocument.lastChild.setAttribute(
766 'style',
767 'font-size: 80%; margin: 1px 3px; font-family: arial, sans-serif'
768 );
769 this.searchresult_description.contentDocument.lastChild.innerHTML
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 }
775 },
757 on_select: function() { 776 on_select: function() {
@@ -766,3 +785,3 @@ var fireflix = {
766 this.searchresult_title.value = p.title; 785 this.searchresult_title.value = p.title;
767 this.searchresult_description.value = null; 786 this.render_description_frame(null);
768 if(p.description==null && p.description==undefined) { 787 if(p.description==null && p.description==undefined) {
@@ -782,3 +801,3 @@ var fireflix = {
782 pp.fromNode_(n); 801 pp.fromNode_(n);
783 _this.searchresult_description.value=pp.description?pp.description:null; 802 _this.render_description_frame(pp.description);
784 } 803 }
@@ -790,3 +809,3 @@ var fireflix = {
790 }else{ 809 }else{
791 this.searchresult_description.value=p.description?p.description:null; 810 this.render_description_frame(p.description);
792 } 811 }