summaryrefslogtreecommitdiffabout
path: root/content
authorMichael Krelin <hacker@klever.net>2006-10-09 19:03:13 (UTC)
committer Michael Krelin <hacker@klever.net>2006-10-09 19:03:13 (UTC)
commit55ea41380cc2bcbaebf8cb0a2c1ee401b79f5016 (patch) (side-by-side diff)
tree03a2704067dc5dea4c5c10a8ab0401d6b1f74656 /content
parentda97ac566cb06a583bd8b84b9e1275e37ea0a3ca (diff)
downloadfireflix-55ea41380cc2bcbaebf8cb0a2c1ee401b79f5016.zip
fireflix-55ea41380cc2bcbaebf8cb0a2c1ee401b79f5016.tar.gz
fireflix-55ea41380cc2bcbaebf8cb0a2c1ee401b79f5016.tar.bz2
html generation was mistakenly reversed
git-svn-id: http://svn.klever.net/kin/fireflix/trunk@189 fe716a7a-6dde-0310-88d9-d003556173a8
Diffstat (limited to 'content') (more/less context) (show whitespace changes)
-rw-r--r--content/fireflix.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/content/fireflix.js b/content/fireflix.js
index 63a4118..85b4d39 100644
--- a/content/fireflix.js
+++ b/content/fireflix.js
@@ -831,97 +831,97 @@ var fireflix = {
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';
+ rv += this.photo_html(p,uti,utl)+'\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'
);
return;
},
append_html_menu: function(m,imgt,lnkt,csid,cpfx) {
var mp = m.appendChild(document.createElement('menupopup'));
var t;
t=mp.appendChild(document.createElement('menuitem'));
t.setAttribute('label',this.loc_strings.getString('menutitle_Images'));
t.setAttribute('class','menuhead');t.setAttribute('disabled','true');
mp.appendChild(document.createElement('menuseparator'));
var cs = document.getElementById(csid);
for(var iti=0;iti<imgt.length;++iti) {
t = mp.appendChild(document.createElement('menu'));
t.setAttribute('label',this.loc_strings.getString('urltype_'+imgt.charAt(iti)));
var smp = t.appendChild(document.createElement('menupopup'));
t=smp.appendChild(document.createElement('menuitem'));
t.setAttribute('label',this.loc_strings.getString('menutitle_Links'));