suzanne.soy/travis-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Check if key is defined in incomplete checks

Browse Source
This commit is contained in:
Piotr Sarnacki 2012-10-31 14:56:17 +01:00
parent baa95d590d
commit eef8e55cfe
2 changed files with 5 additions and 4 deletions
assets/scripts
lib/travis
model.coffee
vendor
ember-data.js

3
assets/scripts/lib/travis/model.coffee
View File

@ -35,7 +35,8 @@
@get 'isLoaded' @get 'isLoaded'
).property('incomplete', 'isLoaded') ).property('incomplete', 'isLoaded')
loadTheRest: -> loadTheRest: (key) ->
console.log 'Load missing fields for', @constructor, "because of missing key '#{key}'"
return if @get('isCompleting') return if @get('isCompleting')
@set 'isCompleting', true @set 'isCompleting', true

6
assets/scripts/vendor/ember-data.js vendored
View File

@ -3255,7 +3255,7 @@ DS.attr = function(type, options) {
return Ember.computed(function(key, value) { return Ember.computed(function(key, value) {
var data; var data;
if(arguments.length === 1 && this.constructor.isAttribute(key) && get(this, 'incomplete') && !this.isAttributeLoaded(key)) { if(arguments.length === 1 && key && this.constructor.isAttribute(key) && get(this, 'incomplete') && !this.isAttributeLoaded(key)) {
if(this.loadTheRest) { if(this.loadTheRest) {
this.loadTheRest(key); this.loadTheRest(key);
} }
@ -3395,7 +3395,7 @@ var hasAssociation = function(type, options, one) {
var data = get(this, 'data'), ids, id, association, var data = get(this, 'data'), ids, id, association,
store = get(this, 'store'); store = get(this, 'store');
if(arguments.length === 1 && this.constructor.isAttribute(key) && get(this, 'incomplete') && !this.isAttributeLoaded(key)) { if(arguments.length === 1 && key && this.constructor.isAttribute(key) && get(this, 'incomplete') && !this.isAttributeLoaded(key)) {
if(this.loadTheRest) { if(this.loadTheRest) {
this.loadTheRest(key); this.loadTheRest(key);
} }
@ -3463,7 +3463,7 @@ var hasAssociation = function(type, options) {
store = get(this, 'store'), store = get(this, 'store'),
ids, id, association; ids, id, association;
if(arguments.length === 1 && this.constructor.isAttribute(key) && get(this, 'incomplete') && !this.isAttributeLoaded(key)) { if(arguments.length === 1 && key && this.constructor.isAttribute(key) && get(this, 'incomplete') && !this.isAttributeLoaded(key)) {
if(this.loadTheRest) { if(this.loadTheRest) {
this.loadTheRest(key); this.loadTheRest(key);
} }