From 92616251bb58d1696823eae9ee0f66324d60e478 Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Fri, 6 Sep 2013 22:14:06 +0200 Subject: [PATCH] Revert "Update code for newest ember-model" This reverts commit 1594130ff300203e326ec0864a25f3c8c700b3b0. --- assets/scripts/app/app.coffee | 2 +- assets/scripts/app/controllers/flash.coffee | 2 +- assets/scripts/lib/travis/model.coffee | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/assets/scripts/app/app.coffee b/assets/scripts/app/app.coffee index 90fd9ed5..3cc79ca6 100644 --- a/assets/scripts/app/app.coffee +++ b/assets/scripts/app/app.coffee @@ -126,7 +126,7 @@ unless window.TravisApplication if reference && options.skipIfExists return - reference = type._getOrCreateReferenceForId(hash.id) + reference = type._referenceForId(hash.id) if reference.record reference.record.merge(hash) else diff --git a/assets/scripts/app/controllers/flash.coffee b/assets/scripts/app/controllers/flash.coffee index 3c226c1b..67ad6ae5 100644 --- a/assets/scripts/app/controllers/flash.coffee +++ b/assets/scripts/app/controllers/flash.coffee @@ -9,7 +9,7 @@ Travis.FlashController = Ember.ArrayController.extend @set('flashes', Ember.A()) content: (-> - @get('unseenBroadcasts').concat(@get('flashes')).filter (o) -> !!o + @get('unseenBroadcasts').concat(@get('flashes')) ).property('unseenBroadcasts.length', 'flashes.length') unseenBroadcasts: (-> diff --git a/assets/scripts/lib/travis/model.coffee b/assets/scripts/lib/travis/model.coffee index 1305c3c8..4c37fe50 100644 --- a/assets/scripts/lib/travis/model.coffee +++ b/assets/scripts/lib/travis/model.coffee @@ -86,10 +86,10 @@ Array.prototype.diff = (a) -> @loadTheRest(key) isAttribute: (name) -> - this.constructor.getAttributes().contains(name) + this.attributes.contains(name) isRelationship: (name) -> - this.constructor.getRelationships().contains(name) + this.relationships.contains(name) loadTheRest: (key) -> # for some weird reason key comes changed to a string and for some weird reason it even is called with @@ -145,7 +145,7 @@ Array.prototype.diff = (a) -> ).property() isRecordLoaded: (id) -> - !!@_getOrCreateReferenceForId(id).record + !!@_referenceForId(id).record camelizeKeys: true