Update ember

This commit is contained in:
Piotr Sarnacki 2012-09-27 14:39:03 +02:00
parent 3aefc86961
commit 57ae258803
2 changed files with 162 additions and 160 deletions

View File

@ -1,5 +1,5 @@
// Version: v1.0.pre-157-g896f794
// Last commit: 896f794 (2012-09-26 21:30:45 +0200)
// Version: v1.0.pre-161-g4255d0a
// Last commit: 4255d0a (2012-09-27 14:32:08 +0200)
(function() {
@ -140,8 +140,8 @@ window.ember_deprecateFunc = Ember.deprecateFunc("ember_deprecateFunc is deprec
})();
// Version: v1.0.pre-157-g896f794
// Last commit: 896f794 (2012-09-26 21:30:45 +0200)
// Version: v1.0.pre-161-g4255d0a
// Last commit: 4255d0a (2012-09-27 14:32:08 +0200)
(function() {
@ -3096,9 +3096,11 @@ ComputedPropertyPrototype.set = function(obj, keyName, value) {
hadCachedValue = false,
ret;
this._suspended = obj;
try {
ret = this.func.call(obj, keyName, value);
if (cacheable && keyName in meta.cache) {
if (meta.cache[keyName] === value) {
if (meta.cache[keyName] === ret) {
return;
}
hadCachedValue = true;
@ -3110,8 +3112,6 @@ ComputedPropertyPrototype.set = function(obj, keyName, value) {
delete meta.cache[keyName];
}
ret = this.func.call(obj, keyName, value);
if (cacheable) {
if (!watched && !hadCachedValue) {
addDependentKeys(this, obj, keyName, meta);
@ -3120,8 +3120,9 @@ ComputedPropertyPrototype.set = function(obj, keyName, value) {
}
if (watched) { Ember.propertyDidChange(obj, keyName); }
} finally {
this._suspended = oldSuspended;
}
return ret;
};
@ -22354,8 +22355,8 @@ Ember Handlebars
})();
// Version: v1.0.pre-157-g896f794
// Last commit: 896f794 (2012-09-26 21:30:45 +0200)
// Version: v1.0.pre-161-g4255d0a
// Last commit: 4255d0a (2012-09-27 14:32:08 +0200)
(function() {

View File

@ -1952,8 +1952,8 @@ Handlebars.VM = {
Handlebars.template = Handlebars.VM.template;
;
// Version: v1.0.pre-157-g896f794
// Last commit: 896f794 (2012-09-26 21:30:45 +0200)
// Version: v1.0.pre-161-g4255d0a
// Last commit: 4255d0a (2012-09-27 14:32:08 +0200)
(function() {
@ -2094,8 +2094,8 @@ window.ember_deprecateFunc = Ember.deprecateFunc("ember_deprecateFunc is deprec
})();
// Version: v1.0.pre-157-g896f794
// Last commit: 896f794 (2012-09-26 21:30:45 +0200)
// Version: v1.0.pre-161-g4255d0a
// Last commit: 4255d0a (2012-09-27 14:32:08 +0200)
(function() {
@ -5050,9 +5050,11 @@ ComputedPropertyPrototype.set = function(obj, keyName, value) {
hadCachedValue = false,
ret;
this._suspended = obj;
try {
ret = this.func.call(obj, keyName, value);
if (cacheable && keyName in meta.cache) {
if (meta.cache[keyName] === value) {
if (meta.cache[keyName] === ret) {
return;
}
hadCachedValue = true;
@ -5064,8 +5066,6 @@ ComputedPropertyPrototype.set = function(obj, keyName, value) {
delete meta.cache[keyName];
}
ret = this.func.call(obj, keyName, value);
if (cacheable) {
if (!watched && !hadCachedValue) {
addDependentKeys(this, obj, keyName, meta);
@ -5074,8 +5074,9 @@ ComputedPropertyPrototype.set = function(obj, keyName, value) {
}
if (watched) { Ember.propertyDidChange(obj, keyName); }
} finally {
this._suspended = oldSuspended;
}
return ret;
};
@ -24308,8 +24309,8 @@ Ember Handlebars
})();
// Version: v1.0.pre-157-g896f794
// Last commit: 896f794 (2012-09-26 21:30:45 +0200)
// Version: v1.0.pre-161-g4255d0a
// Last commit: 4255d0a (2012-09-27 14:32:08 +0200)
(function() {