summaryrefslogtreecommitdiffabout
authorMichael Krelin <hacker@klever.net>2006-10-01 21:58:33 (UTC)
committer Michael Krelin <hacker@klever.net>2006-10-01 21:58:33 (UTC)
commit6e5ed4310ed88d19b9760af346346a79ca21c66d (patch) (unidiff)
tree66c3de4bdfdad3a76ef008364d03638b33721fad
parentd11f973311060020c6cc760f7304488155f40dd7 (diff)
downloadfireflix-6e5ed4310ed88d19b9760af346346a79ca21c66d.zip
fireflix-6e5ed4310ed88d19b9760af346346a79ca21c66d.tar.gz
fireflix-6e5ed4310ed88d19b9760af346346a79ca21c66d.tar.bz2
prevent overflowing in sidebar again
git-svn-id: http://svn.klever.net/kin/fireflix/trunk@177 fe716a7a-6dde-0310-88d9-d003556173a8
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--content/fireflix-panel.xul6
-rw-r--r--content/fireflix.js1
2 files changed, 5 insertions, 2 deletions
diff --git a/content/fireflix-panel.xul b/content/fireflix-panel.xul
index e5e1742..398dd78 100644
--- a/content/fireflix-panel.xul
+++ b/content/fireflix-panel.xul
@@ -134,34 +134,36 @@
134 onselect="fireflix.foundphotos.on_select()" 134 onselect="fireflix.foundphotos.on_select()"
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" crop="end"/>
151 <div flex="1" id="searchresult_description" xmlns="http://www.w3.org/1999/xhtml"/> 151 <hbox flex="1" pack="center">
152 <div flex="1" id="searchresult_description" xmlns="http://www.w3.org/1999/xhtml"/>
153 </hbox>
152 <hbox pack="end"> 154 <hbox pack="end">
153 <button command="cmd_search_open"/> 155 <button command="cmd_search_open"/>
154 </hbox> 156 </hbox>
155 </vbox> 157 </vbox>
156 </groupbox> 158 </groupbox>
157 </vbox> 159 </vbox>
158 </tabpanel> 160 </tabpanel>
159 161
160 <tabpanel id="tabpanel_sets" flex="1" 162 <tabpanel id="tabpanel_sets" flex="1"
161 onkeypress="if(event.keyCode==event.DOM_VK_RETURN) 163 onkeypress="if(event.keyCode==event.DOM_VK_RETURN)
162 document.getElementById('setphotos').focus()"> 164 document.getElementById('setphotos').focus()">
163 <vbox flex="1"> 165 <vbox flex="1">
164 <tree id="setslist" rows="2" onselect="fireflix.photosets.on_select()" 166 <tree id="setslist" rows="2" onselect="fireflix.photosets.on_select()"
165 flex="1" context="sets_menu" 167 flex="1" context="sets_menu"
166 > 168 >
167 <treecols> 169 <treecols>
diff --git a/content/fireflix.js b/content/fireflix.js
index f180379..e144aae 100644
--- a/content/fireflix.js
+++ b/content/fireflix.js
@@ -765,32 +765,33 @@ var fireflix = {
765 /* of all linking elements flickr only allows a */ 765 /* of all linking elements flickr only allows a */
766 var as = this.searchresult_description.getElementsByTagName('a'); 766 var as = this.searchresult_description.getElementsByTagName('a');
767 for(var a=0;a<as.length;++a) 767 for(var a=0;a<as.length;++a)
768 as.item(a).setAttribute('target','_blank'); 768 as.item(a).setAttribute('target','_blank');
769 } 769 }
770 }, 770 },
771 on_select: function() { 771 on_select: function() {
772 if(this.selection.currentIndex<0) { 772 if(this.selection.currentIndex<0) {
773 this.searchresult_props.hidden = true; 773 this.searchresult_props.hidden = true;
774 }else{ 774 }else{
775 var p = this.photos[this.selection.currentIndex]; 775 var p = this.photos[this.selection.currentIndex];
776 if(!p) { 776 if(!p) {
777 this.searchresult_props.hidden = true; 777 this.searchresult_props.hidden = true;
778 }else{ 778 }else{
779 this.search_photo.src = this.fireflix.flickr.make_photo_url(p,'t'); 779 this.search_photo.src = this.fireflix.flickr.make_photo_url(p,'t');
780 this.searchresult_title.value = p.title; 780 this.searchresult_title.value = p.title;
781 this.searchresult_title.tooltipText = p.title;
781 this.render_description_frame(null); 782 this.render_description_frame(null);
782 if(p.description==null && p.description==undefined) { 783 if(p.description==null && p.description==undefined) {
783 var pid = p.id; 784 var pid = p.id;
784 var ci = this.selection.currentIndex; 785 var ci = this.selection.currentIndex;
785 var _this = this; 786 var _this = this;
786 this.fireflix.flickr.api_call( 787 this.fireflix.flickr.api_call(
787 { 788 {
788 method: 'flickr.photos.getInfo', 789 method: 'flickr.photos.getInfo',
789 auth_token: 'default', 790 auth_token: 'default',
790 photo_id: p.id, 791 photo_id: p.id,
791 secret: p.secret 792 secret: p.secret
792 }, function(xr) { 793 }, function(xr) {
793 var pp = _this.photos[ci]; 794 var pp = _this.photos[ci];
794 if(ci==_this.selection.currentIndex && pp.id==pid) { 795 if(ci==_this.selection.currentIndex && pp.id==pid) {
795 var n = xp_node('/rsp/photo',xr.responseXML); 796 var n = xp_node('/rsp/photo',xr.responseXML);
796 pp.fromNode_(n); 797 pp.fromNode_(n);