summaryrefslogtreecommitdiffabout
authorMichael Krelin <hacker@klever.net>2011-08-28 16:22:04 (GMT)
committer Michael Krelin <hacker@klever.net>2011-08-28 16:22:04 (GMT)
commite58247a43552504e34ae31a5262a8a9dd338243c (patch) (side-by-side diff)
tree010174a32497fa0e085de0902799197f703e678a
parentaa13caca14bac3ed268ac6fb62f0270e40b24e48 (diff)
downloadfireflix-e58247a43552504e34ae31a5262a8a9dd338243c.zip
fireflix-e58247a43552504e34ae31a5262a8a9dd338243c.tar.gz
fireflix-e58247a43552504e34ae31a5262a8a9dd338243c.tar.bz2
more json calls
Signed-off-by: Michael Krelin <hacker@klever.net>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--content/fireflix.js19
1 files changed, 9 insertions, 10 deletions
diff --git a/content/fireflix.js b/content/fireflix.js
index 283e930..d70ab4d 100644
--- a/content/fireflix.js
+++ b/content/fireflix.js
@@ -445,31 +445,30 @@ var fireflix = {
if(psn!=null) {
var pids = this.batch_ids.join(',');
var ppid = this.batch_ids[0];
- var _this = this;
- this.fireflix.flickr.api_call(
+ var that = this;
+ this.fireflix.flickr.api_call_json(
{
method: 'flickr.photosets.create',
auth_token: 'default',
title: psn,
primary_photo_id: ppid
- }, function(x) {
- var npid =
- x.responseXML.getElementsByTagName('photoset').item(0).getAttribute('id');
- _this.fireflix.flickr.api_call(
+ }, function(x,j) {
+ var npid = j.photoset.id;
+ that.fireflix.flickr.api_call_json(
{
method: 'flickr.photosets.editPhotos',
auth_token: 'default',
photoset_id: npid,
primary_photo_id: ppid,
photo_ids: pids
- }, function(x) {
- _this.fireflix.refresh_sets();
+ }, function(x,j) {
+ that.fireflix.refresh_sets();
}, function(x,s,c,m) {
- _this.fireflix.flickr_failure(x,s,c,m);
+ that.fireflix.flickr_failure(x,s,c,m);
}
);
}, function(x,s,c,m) {
- _this.fireflix.flickr_failure(x,s,c,m);
+ that.fireflix.flickr_failure(x,s,c,m);
}
);
}