summaryrefslogtreecommitdiffabout
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) (unidiff)
tree1d40b49c027742d294fe6e39ba2535afd61011e3
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 (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
@@ -135,33 +135,33 @@
135 ondblclick="fireflix.foundphotos.on_cmd_open(event)" 135 ondblclick="fireflix.foundphotos.on_cmd_open(event)"
136 onkeypress="if(event.keyCode==event.DOM_VK_RETURN) 136 onkeypress="if(event.keyCode==event.DOM_VK_RETURN)
137 fireflix.foundphotos.on_cmd_open(event)"> 137 fireflix.foundphotos.on_cmd_open(event)">
138 <treecols> 138 <treecols>
139 <treecol id="sr_title" label="&panel.search.col.title.label;" flex="2" crop="end" align="start" /> 139 <treecol id="sr_title" label="&panel.search.col.title.label;" flex="2" crop="end" align="start" />
140 </treecols> 140 </treecols>
141 <treechildren/> 141 <treechildren/>
142 </tree> 142 </tree>
143 <groupbox id="searchresult_props" orient="horizontal" hidden="true"> 143 <groupbox id="searchresult_props" orient="horizontal" hidden="true">
144 <vbox width="100" pack="center"> 144 <vbox width="100" pack="center">
145 <hbox pack="center"> 145 <hbox pack="center">
146 <image id="search_photo"/> 146 <image id="search_photo"/>
147 </hbox> 147 </hbox>
148 </vbox> 148 </vbox>
149 <vbox flex="1"> 149 <vbox flex="1">
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">
153 <button command="cmd_search_open"/> 153 <button command="cmd_search_open"/>
154 </hbox> 154 </hbox>
155 </vbox> 155 </vbox>
156 </groupbox> 156 </groupbox>
157 </vbox> 157 </vbox>
158 </tabpanel> 158 </tabpanel>
159 159
160 <tabpanel id="tabpanel_sets" flex="1" 160 <tabpanel id="tabpanel_sets" flex="1"
161 onkeypress="if(event.keyCode==event.DOM_VK_RETURN) 161 onkeypress="if(event.keyCode==event.DOM_VK_RETURN)
162 document.getElementById('setphotos').focus()"> 162 document.getElementById('setphotos').focus()">
163 <vbox flex="1"> 163 <vbox flex="1">
164 <tree id="setslist" rows="2" onselect="fireflix.photosets.on_select()" 164 <tree id="setslist" rows="2" onselect="fireflix.photosets.on_select()"
165 flex="1" context="sets_menu" 165 flex="1" context="sets_menu"
166 > 166 >
167 <treecols> 167 <treecols>
diff --git a/content/fireflix.css b/content/fireflix.css
index 4a3228f..c16dca6 100644
--- a/content/fireflix.css
+++ b/content/fireflix.css
@@ -59,24 +59,31 @@ image#set_photo, image#set_primary {
59 font-size: 300%; 59 font-size: 300%;
60 font-weight: bold; 60 font-weight: bold;
61 color: yellow; 61 color: yellow;
62} 62}
63.about .link { 63.about .link {
64 text-decoration: underline; 64 text-decoration: underline;
65 color: white; 65 color: white;
66 cursor: pointer; 66 cursor: pointer;
67} 67}
68 68
69menuitem.menuhead { 69menuitem.menuhead {
70 background: gray; 70 background: gray;
71 color: black; 71 color: black;
72 font-weight: bold; 72 font-weight: bold;
73} 73}
74 74
75div#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 {
76 margin: 1ex 1em; 83 margin: 1ex 1em;
77 font-family: courier, monospace; 84 font-family: courier, monospace;
78 font-size: 9pt; 85 font-size: 9pt;
79 padding: 2px; 86 padding: 2px;
80 border: dotted 1px gray; 87 border: dotted 1px gray;
81 background: white; 88 background: white;
82} 89}
diff --git a/content/fireflix.js b/content/fireflix.js
index 6773134..6681303 100644
--- a/content/fireflix.js
+++ b/content/fireflix.js
@@ -743,47 +743,39 @@ var fireflix = {
743 var _this = this; 743 var _this = this;
744 this.fireflix.flickr.api_call( pars, 744 this.fireflix.flickr.api_call( pars,
745 function(xr) { 745 function(xr) {
746 var x = xr.responseXML; 746 var x = xr.responseXML;
747 var xp = x.evaluate( 747 var xp = x.evaluate(
748 '/rsp/photos/photo', x, null, 748 '/rsp/photos/photo', x, null,
749 XPathResult.ORDERED_NODE_ITERATOR_TYPE, null ); 749 XPathResult.ORDERED_NODE_ITERATOR_TYPE, null );
750 _this.importXPR(xp); 750 _this.importXPR(xp);
751 _this.on_select(); 751 _this.on_select();
752 }, function(x,s,c,m) { 752 }, function(x,s,c,m) {
753 _this.fireflix.flickr_failure(x,s,c,m); 753 _this.fireflix.flickr_failure(x,s,c,m);
754 } 754 }
755 ); 755 );
756 }, 756 },
757 render_description_frame: function(content) { 757 render_description_frame: function(content) {
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 }
775 }, 767 },
776 on_select: function() { 768 on_select: function() {
777 if(this.selection.currentIndex<0) { 769 if(this.selection.currentIndex<0) {
778 this.searchresult_props.hidden = true; 770 this.searchresult_props.hidden = true;
779 }else{ 771 }else{
780 var p = this.photos[this.selection.currentIndex]; 772 var p = this.photos[this.selection.currentIndex];
781 if(!p) { 773 if(!p) {
782 this.searchresult_props.hidden = true; 774 this.searchresult_props.hidden = true;
783 }else{ 775 }else{
784 this.search_photo.src = this.fireflix.flickr.make_photo_url(p,'t'); 776 this.search_photo.src = this.fireflix.flickr.make_photo_url(p,'t');
785 this.searchresult_title.value = p.title; 777 this.searchresult_title.value = p.title;
786 this.render_description_frame(null); 778 this.render_description_frame(null);
787 if(p.description==null && p.description==undefined) { 779 if(p.description==null && p.description==undefined) {
788 var pid = p.id; 780 var pid = p.id;
789 var ci = this.selection.currentIndex; 781 var ci = this.selection.currentIndex;