summaryrefslogtreecommitdiffabout
Side-by-side diff
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
@@ -55,193 +55,193 @@
oncommand="fireflix.on_refresh_sets()" />
<command id="cmd_set_props" label="&panel.sets.cmd_properties;"
oncommand="fireflix.on_set_props()" disabled="true" />
</commandset>
<popupset>
<popup id="sets_menu">
<menuitem command="cmd_set_props"/>
<menuitem command="cmd_refresh_sets"/>
<menuseparator/>
<menu label="&panel.sets.generate_html;" id="sets_html_menu"/>
</popup>
</popupset>
<commandset id="cmdset_uploads">
<command id="cmd_uploads_clear" label="&panel.uploads.clear.label;"
oncommand="fireflix.uploads.on_clear()" />
<command id="cmd_uploads_upload" label="&panel.uploads.upload.label;"
oncommand="fireflix.uploads.on_upload()" />
<command id="cmd_uploads_remove" label="&panel.uploads.remove.label;"
oncommand="fireflix.uploads.on_remove()" />
<command id="cmd_uploads_add" label="&panel.uploads.add.label;"
oncommand="fireflix.uploads.on_add()" />
</commandset>
<popupset>
<popup id="uploads_menu">
<menuitem command="cmd_uploads_add"/>
<menuitem command="cmd_uploads_clear"/>
<menuitem command="cmd_uploads_remove"/>
<menuseparator/>
<menuitem command="cmd_uploads_upload"/>
<menuseparator/>
<menu label="&panel.uploads.generate_html;" id="uploads_html_menu"/>
</popup>
</popupset>
<vbox class="wholething" flex="1">
<groupbox context="auth_menu">
<caption label="&panel.auth_info;"/>
<hbox>
<label id="auth_info" value="&panel.no_auth_info;" flex="1" disabled="true" crop="end"/>
<button id="b_auth" command="cmd_auth_auth"/>
<button id="b_auth_done" command="cmd_auth_done" hidden="true"/>
<button command="cmd_auth_open_flickr"
tooltiptext="&panel.auth.flickr.tip;"/>
</hbox>
</groupbox>
<tabbox flex="1" id="fireflix_tabs">
<tabs>
<tab label="&panel.tabs.search;"/>
<tab label="&panel.tabs.sets;"/>
<tab label="&panel.tabs.tags;" hidden="true"/> <!-- TODO: -->
<tab id="tab_upload" label="&panel.tabs.upload;"/>
</tabs>
<tabpanels flex="1">
<tabpanel id="tabpanel_search" flex="1">
<vbox flex="1">
<groupbox class="search_params" orient="vertical" onkeypress="if(event.keyCode==event.DOM_VK_RETURN) fireflix.foundphotos.search_photos()">
<hbox>
<label control="search_for" value="&panel.search.search_for.label;"
accesskey="s"/>
<textbox id="search_for" flex="1"/>
</hbox>
<hbox>
<checkbox id="search_tags" label="&panel.search.mode.tagsonly.label;"
tooltiptext="&panel.search.mode.tagsonly.tip;" checked="false"
accesskey="t" />
<checkbox id="search_mine" label="&panel.search.mode.mine.label;" checked="true" accesskey="m"/>
<spacer flex="1"/>
<button command="cmd_search"/>
</hbox>
</groupbox>
<tree id="searchresults" rows="2" flex="1"
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"/>
- <iframe flex="1" id="searchresult_description"/>
+ <div flex="1" id="searchresult_description" xmlns="http://www.w3.org/1999/xhtml"/>
<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>
<treecol id="sl_name" label="&panel.sets.name.label;" flex="4" crop="end" align="start" tooltiptext="&panel.sets.name.tip;"/>
<splitter class="tree-splitter" />
<treecol id="sl_photos" label="&panel.sets.photos.label;" flex="1" align="end" tooltiptext="&panel.sets.photos.tip;" />
</treecols>
<treechildren/>
</tree>
<hbox>
<button command="cmd_refresh_sets" />
<button command="cmd_set_props" />
</hbox>
<tree id="setphotos" rows="2" onselect="fireflix.photoset.on_select()"
flex="1">
<treecols>
<treecol id="sp_title" label="&panel.setphotos.title.label;" flex="1" crop="end" align="start" tooltiptext="&panel.setphotos.title.tip;" />
<splitter class="tree-splitter" />
<treecol id="sp_taken" label="&panel.setphotos.taken.label;" crop="end" align="start" tooltiptext="&panel.setphotos.taken.tip;" hidden="true" />
<treecol id="sp_upload" label="&panel.setphotos.upload.label;" crop="end" align="start" tooltiptext="&panel.setphotos.upload.tip;" hidden="true" />
</treecols>
<treechildren/>
</tree>
<groupbox id="set_photo_props" orient="horizontal">
<vbox width="100" pack="center">
<hbox pack="center">
<image id="set_photo" hidden="true"/>
</hbox>
</vbox>
<spacer flex="1"/>
</groupbox>
</vbox>
</tabpanel>
<tabpanel id="tabpanel_tags">
<listbox id="tagslist" rows="8" flex="1">
<listhead>
<listheader label="&panel.tagslist.tag.label;"/>
</listhead>
<listcols>
<listcol flex="1"/>
</listcols>
</listbox>
</tabpanel>
<tabpanel id="tabpanel_upload">
<vbox flex="1">
<tree id="uploadlist" rows="2" flex="1"
onselect="fireflix.uploads.selectionChanged()"
context="uploads_menu">
<treecols>
<treecol id="up_file" label="&panel.uploadlist.file.label;" flex="4" crop="start" align="start"/>
<splitter class="tree-splitter" />
<treecol id="up_title" label="&panel.uploadlist.title.label;" flex="5" crop="end" align="start" />
<splitter class="tree-splitter" />
<treecol id="up_status" label="&panel.uploadlist.status.label;" flex="1" crop="end" align="start" />
</treecols>
<treechildren/>
</tree>
<progressmeter id="upload_progress" mode="undetermined" hidden="true" />
<groupbox id="upload_file_props" orient="horizontal" hidden="true">
<image id="upload_file_preview" width="100" height="100" />
<grid flex="1">
<columns>
<column/>
<column flex="1"/>
</columns>
<rows>
<row>
<label control="upload_filename"
value="&panel.upload_props.filename.label;" />
<textbox id="upload_filename"
oninput="fireflix.uploads.propsToSel('filename')"/>
</row>
<row>
<label control="upload_title" value="&panel.upload_props.title.label;" />
<textbox id="upload_title"
oninput="fireflix.uploads.propsToSel('title')"/>
</row>
<row>
<label control="uplod_tags" value="&panel.upload_props.tags.label;" />
<textbox id="upload_tags"
oninput="fireflix.uploads.propsToSel('tags')"/>
diff --git a/content/fireflix.css b/content/fireflix.css
index 4a3228f..c16dca6 100644
--- a/content/fireflix.css
+++ b/content/fireflix.css
@@ -1,82 +1,89 @@
.generated.wholething,
.about.wholething,
tabbox, tabpanels, tabpanel {
background: url("background.jpeg");
}
tabpanels {
padding: 0px;
}
tree {
margin-top: 2px;
background: rgb(12,167,0);
color: rgb(255,255,0);
font-size: 90%;
}
tree treechildren { /* for windows */
background: rgb(12,167,0);
}
tree#uploadlist treechildren::-moz-tree-cell-text(pending) {
}
tree#uploadlist treechildren::-moz-tree-cell-text(completed) {
color: white;
}
tree#uploadlist treechildren::-moz-tree-row(failed) {
background: yellow;
}
tree#uploadlist treechildren::-moz-tree-cell-text(failed) {
color: red;
}
tree#uploadlist treechildren::-moz-tree-cell-text(uploading) {
font-weight: bold;
}
groupbox#searchresult_props,
groupbox.search_params,
groupbox#upload_file_props,
groupbox#set_props,
groupbox#set_photo_props {
background: white;
}
groupbox#upload_file_props label {
text-align: right;
}
image#set_photo, image#set_primary {
border: black 1px solid;
}
.about .insides {
margin: 1ex;
}
.about .text {
border: yellow solid 1px;
background: green;
}
.about .title {
font-size: 300%;
font-weight: bold;
color: yellow;
}
.about .link {
text-decoration: underline;
color: white;
cursor: pointer;
}
menuitem.menuhead {
background: gray;
color: black;
font-weight: bold;
}
+div#searchresult_description {
+ min-height: 5em; max-height: 8em;
+ overflow: auto;
+ font-size: 90%;
+ margin: 0.1ex 0.5ex;
+}
+
#copying div {
margin: 1ex 1em;
font-family: courier, monospace;
font-size: 9pt;
padding: 2px;
border: dotted 1px gray;
background: white;
}
diff --git a/content/fireflix.js b/content/fireflix.js
index 6773134..6681303 100644
--- a/content/fireflix.js
+++ b/content/fireflix.js
@@ -663,207 +663,199 @@ var fireflix = {
auth_token: 'default',
extras: 'original_format',
user_id: 'me',
per_page: pp
},
function(xr) {
var x = xr.responseXML;
var rv = '';
for(var pn in pids) {
var p = pids[pn];
var pp = new Photo(xp_node('/rsp/photos/photo[@id='+p+']',x));
rv += _this.photo_html(pp,uti,utl)+'\n';
}
_this.popup_content(rv);
}, function(x,s,c,m) {
_this.flickr_failure(x,s,c,m);
}
);
},
/*
*
*/
foundphotos: {
fireflix: null,
init: function(f) {
this.fireflix = f;
pull_elements(this,document,[
'search_for','search_tags','search_mine',
'searchresult_props','search_photo',
'searchresult_title','searchresult_description'
]);
document.getElementById('searchresults').view = this;
},
photos: new Array(),
rowCount: 0,
getCellText: function(r,c) {
var p = this.photos[r];
if(c.id=='sr_title') return p.title;
return c.id;
},
setTree: function(t) { this.tree = t },
isContainer: function(r) { return false },
isSeparator: function(r) { return false },
isSorted: function(r) { return false },
getLevel: function(r) { return 0 },
getImageSrc: function(r,c) { return null },
getRowProperties: function(r,p) { },
getCellProperties: function(cid,cel,p) { },
getColumnProperties: function(cid,cel,p) { },
cycleHeader: function(cid,e) { },
getParentIndex: function(r) { return -1 },
drop: function(r,o) { },
canDropBeforeAfter: function(r,b) { return false },
importXPR: function(xp) {
this.selection.clearSelection();
this.selection.currentIndex = -1;
this.searchresult_props.hidden = true;
this.tree.beginUpdateBatch();
this.photos = new Array();
var n; while(n=xp.iterateNext()) {
this.photos.push(new Photo(n));
}
this.rowCount = this.photos.length;
this.tree.endUpdateBatch();
},
search_photos: function() {
var pars = {
method: 'flickr.photos.search',
auth_token: 'default',
extras: 'license,date_upload,date_taken,owner_name,icon_server,original_format,last_update,geo'
};
if(this.search_mine.checked)
pars.user_id='me';
if(this.search_tags.checked) {
pars.tags=this.search_for.value.split(/ +/).join(',');
}else{
pars.text=this.search_for.value;
}
var _this = this;
this.fireflix.flickr.api_call( pars,
function(xr) {
var x = xr.responseXML;
var xp = x.evaluate(
'/rsp/photos/photo', x, null,
XPathResult.ORDERED_NODE_ITERATOR_TYPE, null );
_this.importXPR(xp);
_this.on_select();
}, function(x,s,c,m) {
_this.fireflix.flickr_failure(x,s,c,m);
}
);
},
render_description_frame: function(content) {
if(!content) {
- try {
- this.searchresult_description.contentDocument.lastChild.innerHTML
- = '';
- }catch(e) { } /* it will throw exceptions when the iframe isn't well
- prepared to meet me, but it's unimportant then, anyway */
+ this.searchresult_description.innerHTML = '';
}else{
- this.searchresult_description.contentDocument.lastChild.setAttribute(
- 'style',
- 'font-size: 80%; margin: 1px 3px; font-family: arial, sans-serif'
- );
- this.searchresult_description.contentDocument.lastChild.innerHTML
- = content;
- var ls = this.searchresult_description.contentDocument.links;
- for(var l=0;l<ls.length;++l)
- ls.item(l).setAttribute('target','_blank');
+ this.searchresult_description.innerHTML = content?content:'';
+ /* 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.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);
_this.render_description_frame(pp.description);
}
}, function(x,s,c,m) {
_this.fireflix.flickr_failure(x,s,c,m);
}
);
this.searchresult_props.hidden = false;
}else{
this.render_description_frame(p.description);
}
}
}
},
on_cmd_open: function(ev) {
if(this.selection.currentIndex<0)
return;
var p = this.photos[this.selection.currentIndex];
if(!p.id)
return;
this.fireflix.openTab(this.fireflix.flickr.make_photo_url(p,'p'));
}
},
photo_html: function(p,i,l) {
// TODO: add alt/title when possible
var rv =
'<a href="'+this.flickr.make_photo_url(p,l)+'">' +
'<img src="'+this.flickr.make_photo_url(p,i)+'" />'+
'</a>';
return rv;
},
build_html: function(photos,uti,utl) {
var rv = '';
for(var i in photos) {
var p = photos[i];
rv += this.photo_html(p,utl,uti)+'\n';
}
return rv;
},
popup_content: function(s) {
window.openDialog(
"chrome://fireflix/content/generated-content.xul",
null, "dialog,chrome", this, s );
},
copy_to_clipboard: function(s) {
var ch = Components.classes["@mozilla.org/widget/clipboardhelper;1"]
.getService(Components.interfaces.nsIClipboardHelper);
ch.copyString(s);
},
openTab: function(l) {
var wm = Components.classes['@mozilla.org/appshell/window-mediator;1'].getService(
Components.interfaces.nsIWindowMediator );
var bw = wm.getMostRecentWindow('navigator:browser');
var b = bw.getBrowser();
var t = b.addTab(l);
b.selectedTab = t;
},
build_menus: function() {
this.append_html_menu(
document.getElementById('sets_html_menu'),
'stm_','m_bop','cmdset_sets','cmd_sets_html'
);
this.append_html_menu(
document.getElementById('uploads_html_menu'),
'stm_','m_bop','cmdset_uploads','cmd_uploads_html'
);