build for bower v0.0.14

tatango · Nov 21, 2014 · be1d00e · be1d00e
1 parent 9ec29af
commit be1d00e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/dist/ember-json-api.js b/dist/ember-json-api.js
@@ -167,7 +167,7 @@ define("json-api-adapter",
       /**
        * Patch the extractSingle method, since there are no singular records
        */
-      extractSingle: function(store, primaryType, payload, recordId, requestType) {
+      extractSingle: function(store, primaryType, payload, recordId, requestType, record) {
         var primaryTypeName;
         if (this.keyForAttribute) {
           primaryTypeName = this.keyForAttribute(primaryType.typeKey);
@@ -186,7 +186,7 @@ define("json-api-adapter",
             json[key] = payload[key];
           }
         }
-        return this._super(store, primaryType, json, recordId, requestType);
+        return this._super(store, primaryType, json, recordId, requestType, record);
       },
 
       /**
@@ -227,17 +227,16 @@ define("json-api-adapter",
           delete payload.links;
         }
         if (payload.linked) {
-          this.extractLinked(payload.linked);
-          delete payload.linked;
+          this.extractLinked(payload);
         }
         return payload;
       },
 
       /**
        * Extract top-level "linked" containing associated objects
        */
-      extractLinked: function(linked) {
-        var link, values, value, relation;
+      extractLinked: function(payload) {
+        var link, values, value, relation, linked = payload.linked;
         var store = get(this, 'store');
 
         for (link in linked) {
@@ -252,8 +251,16 @@ define("json-api-adapter",
               delete value.links;
             }
           }
+
+          if (payload[link]){
+            payload[link].pushObjects(linked[link]);
+          }else{
+            payload[link] = linked[link];
+          }
+
+          delete linked[link];
         }
-        store.pushPayload(linked);
+        delete payload.linked;
       },
 
       /**

diff --git a/dist/ember-json-api.min.js b/dist/ember-json-api.min.js