Prefer chaining off existing Promises

Author: vitch

lib/s3.js

@@ -131,7 +131,7 @@ module.exports = CoreObject.extend({
       current: headObject(client, { Bucket: bucket, Key: indexKey }),
     })
     .then(function(data) {
-      return data.revisions.All.sort(function(a, b) {
+      return data.revisions.sort(function(a, b) {
         return new Date(b.LastModified) - new Date(a.LastModified);
       }).map(function(d) {
         var revision = d.Key.substr(revisionPrefix.length);
@@ -146,24 +146,21 @@ module.exports = CoreObject.extend({
     var listObjects    = RSVP.denodeify(client.listObjects.bind(client));
     var allRevisions   = [];
 
-    return new Promise(function(resolve, reject) {
-      function listObjectRecursively(options) {
-        listObjects(options).then(function(response) {
-          [].push.apply(allRevisions, response.Contents);
-
-          if (response.IsTruncated) {
-            var nextMarker = response.NextMarker || response.Contents[response.Contents.length - 1].Key;
-            options.Marker = nextMarker;
-            listObjectRecursively(options);
-          } else {
-            response.All = allRevisions;
-            resolve(response);
-          }
-        }).catch(reject);
-      }
+    function listObjectRecursively(options) {
+      return listObjects(options).then(function(response) {
+        [].push.apply(allRevisions, response.Contents);
 
-      listObjectRecursively(options);
-    });
+        if (response.IsTruncated) {
+          var nextMarker = response.Contents[response.Contents.length - 1].Key;
+          options.Marker = nextMarker;
+          return listObjectRecursively(options);
+        } else {
+          return allRevisions;
+        }
+      });
+    }
+
+    return listObjectRecursively(options);
 
   }
 });