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
@@ -142,18 +142,20 @@
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
diff --git a/content/fireflix.js b/content/fireflix.js
index f180379..e144aae 100644
--- a/content/fireflix.js
+++ b/content/fireflix.js
@@ -773,16 +773,17 @@ var fireflix = {
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',