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) (side-by-side diff)
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 @@
onselect="fireflix.foundphotos.on_select()"
ondblclick="fireflix.foundphotos.on_cmd_open(event)"
onkeypress="if(event.keyCode==event.DOM_VK_RETURN)
fireflix.foundphotos.on_cmd_open(event)">
<treecols>
<treecol id="sr_title" label="&panel.search.col.title.label;" flex="2" crop="end" align="start" />
</treecols>
<treechildren/>
</tree>
<groupbox id="searchresult_props" orient="horizontal" hidden="true">
<vbox width="100" pack="center">
<hbox pack="center">
<image id="search_photo"/>
</hbox>
</vbox>
<vbox flex="1">
- <label id="searchresult_title"/>
- <div flex="1" id="searchresult_description" xmlns="http://www.w3.org/1999/xhtml"/>
+ <label id="searchresult_title" crop="end"/>
+ <hbox flex="1" pack="center">
+ <div flex="1" id="searchresult_description" xmlns="http://www.w3.org/1999/xhtml"/>
+ </hbox>
<hbox pack="end">
<button command="cmd_search_open"/>
</hbox>
</vbox>
</groupbox>
</vbox>
</tabpanel>
<tabpanel id="tabpanel_sets" flex="1"
onkeypress="if(event.keyCode==event.DOM_VK_RETURN)
document.getElementById('setphotos').focus()">
<vbox flex="1">
<tree id="setslist" rows="2" onselect="fireflix.photosets.on_select()"
flex="1" context="sets_menu"
>
<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 = {
/* 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');
}
},
on_select: function() {
if(this.selection.currentIndex<0) {
this.searchresult_props.hidden = true;
}else{
var p = this.photos[this.selection.currentIndex];
if(!p) {
this.searchresult_props.hidden = true;
}else{
this.search_photo.src = this.fireflix.flickr.make_photo_url(p,'t');
this.searchresult_title.value = p.title;
+ this.searchresult_title.tooltipText = p.title;
this.render_description_frame(null);
if(p.description==null && p.description==undefined) {
var pid = p.id;
var ci = this.selection.currentIndex;
var _this = this;
this.fireflix.flickr.api_call(
{
method: 'flickr.photos.getInfo',
auth_token: 'default',
photo_id: p.id,
secret: p.secret
}, function(xr) {
var pp = _this.photos[ci];
if(ci==_this.selection.currentIndex && pp.id==pid) {
var n = xp_node('/rsp/photo',xr.responseXML);
pp.fromNode_(n);