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

update ember-data

Browse Source
This commit is contained in:
Sven Fuchs 2012-06-30 01:15:28 +02:00
parent 1cce65842b
commit aec121a576
2 changed files with 38 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
assets/javascripts/vendor/ember-data.js vendored
View File

@ -1284,6 +1284,8 @@ DS.Store = Ember.Object.extend({
return clientIdToId[clientId]; return clientIdToId[clientId];
}); });
if (!neededIds.length) { return; }
var adapter = get(this, '_adapter'); var adapter = get(this, '_adapter');
if (adapter && adapter.findMany) { adapter.findMany(this, type, neededIds); } if (adapter && adapter.findMany) { adapter.findMany(this, type, neededIds); }
else { throw fmt("Adapter is either null or does not implement `findMany` method", this); } else { throw fmt("Adapter is either null or does not implement `findMany` method", this); }
@ -2204,7 +2206,7 @@ var DirtyState = DS.State.extend({
t.recordBecameClean(dirtyType, record); t.recordBecameClean(dirtyType, record);
}); });
manager.goToState('loaded'); manager.goToState('saved');
} }
}, Uncommitted), }, Uncommitted),
@ -2234,7 +2236,7 @@ var DirtyState = DS.State.extend({
t.recordBecameClean('inflight', record); t.recordBecameClean('inflight', record);
}); });
manager.goToState('loaded'); manager.goToState('saved');
manager.send('invokeLifecycleCallbacks', dirtyType); manager.send('invokeLifecycleCallbacks', dirtyType);
}, },
@ -3212,6 +3214,17 @@ DS.Model.reopenClass({
} }
}); });
function getAttr(record, options, key) {
var data = get(record, 'data');
var value = get(data, key);
if (value === undefined) {
value = options.defaultValue;
}
return value;
}
DS.attr = function(type, options) { DS.attr = function(type, options) {
var transform = DS.attr.transforms[type]; var transform = DS.attr.transforms[type];
Ember.assert("Could not find model attribute of type " + type, !!transform); Ember.assert("Could not find model attribute of type " + type, !!transform);
@ -3241,14 +3254,12 @@ DS.attr = function(type, options) {
if (arguments.length === 2) { if (arguments.length === 2) {
value = transformTo(value); value = transformTo(value);
this.setProperty(key, value);
} else {
data = get(this, 'data');
value = get(data, key);
if (value === undefined) { if (value !== getAttr(this, options, key)) {
value = options.defaultValue; this.setProperty(key, value);
} }
} else {
value = getAttr(this, options, key);
} }
return transformFrom(value); return transformFrom(value);

27
public/javascripts/vendor.js
View File

@ -23366,6 +23366,8 @@ DS.Store = Ember.Object.extend({
return clientIdToId[clientId]; return clientIdToId[clientId];
}); });
if (!neededIds.length) { return; }
var adapter = get(this, '_adapter'); var adapter = get(this, '_adapter');
if (adapter && adapter.findMany) { adapter.findMany(this, type, neededIds); } if (adapter && adapter.findMany) { adapter.findMany(this, type, neededIds); }
else { throw fmt("Adapter is either null or does not implement `findMany` method", this); } else { throw fmt("Adapter is either null or does not implement `findMany` method", this); }
@ -24286,7 +24288,7 @@ var DirtyState = DS.State.extend({
t.recordBecameClean(dirtyType, record); t.recordBecameClean(dirtyType, record);
}); });
manager.goToState('loaded'); manager.goToState('saved');
} }
}, Uncommitted), }, Uncommitted),
@ -24316,7 +24318,7 @@ var DirtyState = DS.State.extend({
t.recordBecameClean('inflight', record); t.recordBecameClean('inflight', record);
}); });
manager.goToState('loaded'); manager.goToState('saved');
manager.send('invokeLifecycleCallbacks', dirtyType); manager.send('invokeLifecycleCallbacks', dirtyType);
}, },
@ -25294,6 +25296,17 @@ DS.Model.reopenClass({
} }
}); });
function getAttr(record, options, key) {
var data = get(record, 'data');
var value = get(data, key);
if (value === undefined) {
value = options.defaultValue;
}
return value;
}
DS.attr = function(type, options) { DS.attr = function(type, options) {
var transform = DS.attr.transforms[type]; var transform = DS.attr.transforms[type];
Ember.assert("Could not find model attribute of type " + type, !!transform); Ember.assert("Could not find model attribute of type " + type, !!transform);
@ -25323,14 +25336,12 @@ DS.attr = function(type, options) {
if (arguments.length === 2) { if (arguments.length === 2) {
value = transformTo(value); value = transformTo(value);
this.setProperty(key, value);
} else {
data = get(this, 'data');
value = get(data, key);
if (value === undefined) { if (value !== getAttr(this, options, key)) {
value = options.defaultValue; this.setProperty(key, value);
} }
} else {
value = getAttr(this, options, key);
} }
return transformFrom(value); return transformFrom(value);