more jsonifications

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

1 files changed, 14 insertions, 18 deletions

diff --git a/content/fireflix.js b/content/fireflix.js
index 34cfd3e..f30daee 100644
--- a/content/fireflix.js
+++ b/content/fireflix.js
@@ -621,71 +621,67 @@ var fireflix = {
     this.fireflix.openTab( 'file://'+f.file);
    }
   }
  },
 
  on_set_props: function() {
   var pset = this.photosets.sets[this.photosets.selection.currentIndex];
   window.openDialog(
    "chrome://fireflix/content/photoset-props.xul",
    null, "dependent,modal,dialog,chrome", this,
    pset );
   if(pset.dirty) {
-   var _this = this;
-   this.flickr.api_call(
+   var that = this;
+   this.flickr.api_call_json(
     {
      method: 'flickr.photosets.editMeta',
      auth_token: 'default',
      photoset_id: pset.id,
      title: pset.title,
      description: pset.description
-    }, function(xr) {
+    }, function(x,j) {
      pset.dirty = false;
-     _this.flickr.api_call(
+     that.flickr.api_call_json(
       {
        method: 'flickr.photosets.getPhotos',
        auth_token: 'default',
        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');
-        phids.push( pid );
-	if(pid==pset.primary && n.getAttribute('isprimary')!='1')
-	 priph = pid;
+       for(var i in pp) {
+        var pid = pp[i].id;
+	phids.push(pid);
+	if(pid==pset.primary && pp[i].isprimary) priph = pid;
        }
        if(priph) {
-	_this.flickr.api_call(
+	that.flickr.api_call_json(
 	 {
 	  method: 'flickr.photosets.editPhotos',
 	  auth_token: 'default',
 	  photoset_id: pset.id,
 	  primary_photo_id: priph,
 	  photo_ids: phids.join(',')
 	 }, function() { }, function(x,s,c,m) { /* flickr.photosets.editPhotos */
-	  _this.flickr_failure(x,s,c,m);
+	  that.flickr_failure(x,s,c,m);
 	 }
 	);
        }
       }, function(x,s,c,m) { /* flickr.photosets.getPhotos */
-       _this.flickr_failure(x,s,c,m);
+       that.flickr_failure(x,s,c,m);
       }
      );
     }, function(x,s,c,m) { /* flickr.photosets.editMeta */
-     _this.flickr_failure(x,s,c,m);
+     that.flickr_failure(x,s,c,m);
     }
    );
   }
  },
  on_refresh_sets: function() {
   this.refresh_sets();
  },
  on_cmd_sets_html: function(csfx,ev) {
   var uti = csfx.charAt(0); var utl = csfx.charAt(1);
   var rv = this.build_html(this.photoset.photos,uti,utl);
   this.popup_content(rv);
  },