more jsonifications

Signed-off-by: Michael Krelin <hacker@klever.net>

1 files changed, 13 insertions, 17 deletions

diff --git a/content/fireflix.js b/content/fireflix.js
index 34cfd3e..f30daee 100644
--- a/content/fireflix.js
+++ b/content/fireflix.js
@@ -632,4 +632,4 @@ var fireflix = {
   if(pset.dirty) {
-   var _this = this;
-   this.flickr.api_call(
+   var that = this;
+   this.flickr.api_call_json(
     {
@@ -640,5 +640,5 @@ var fireflix = {
      description: pset.description
-    }, function(xr) {
+    }, function(x,j) {
      pset.dirty = false;
-     _this.flickr.api_call(
+     that.flickr.api_call_json(
       {
@@ -647,17 +647,13 @@ var fireflix = {
        photoset_id: pset.id
-      }, function(xr) {
-       var x = xr.responseXML;
-       var xp = x.evaluate(
-        '/rsp/photoset/photo', x, null,
-	XPathResult.ORDERED_NODE_ITERATOR_TYPE, null );
+      }, function(x,j) {
+       var pp = j.photoset.photo;
        var phids = new Array();
        var priph = null;
-       var n; while(n=xp.iterateNext()) {
-        var pid = n.getAttribute('id');
+       for(var i in pp) {
+        var pid = pp[i].id;
         phids.push( pid );
-	if(pid==pset.primary && n.getAttribute('isprimary')!='1')
-	 priph = pid;
+	if(pid==pset.primary && pp[i].isprimary) priph = pid;
        }
        if(priph) {
-	_this.flickr.api_call(
+	that.flickr.api_call_json(
 	 {
@@ -669,3 +665,3 @@ var fireflix = {
 	 }, function() { }, function(x,s,c,m) { /* flickr.photosets.editPhotos */
-	  _this.flickr_failure(x,s,c,m);
+	  that.flickr_failure(x,s,c,m);
 	 }
@@ -674,3 +670,3 @@ var fireflix = {
       }, function(x,s,c,m) { /* flickr.photosets.getPhotos */
-       _this.flickr_failure(x,s,c,m);
+       that.flickr_failure(x,s,c,m);
       }
@@ -678,3 +674,3 @@ var fireflix = {
     }, function(x,s,c,m) { /* flickr.photosets.editMeta */
-     _this.flickr_failure(x,s,c,m);
+     that.flickr_failure(x,s,c,m);
     }