Created
April 18, 2012 23:38
-
-
Save blt04/2417393 to your computer and use it in GitHub Desktop.
Compiled ember on the left, downloads ember on the right
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/vendor/ember.js b/vendor/ember.js | |
index fdfbd5b..afbb2e4 100644 | |
--- a/vendor/ember.js | |
+++ b/vendor/ember.js | |
@@ -1737,7 +1737,7 @@ if ('undefined' === typeof Ember) { | |
/** | |
@namespace | |
@name Ember | |
- @version 0.9.7 | |
+ @version 0.9.6 | |
All Ember methods and functions are defined inside of this namespace. | |
You generally should not add new properties to this namespace as it may be | |
@@ -1769,10 +1769,10 @@ if ('undefined' !== typeof window) { | |
/** | |
@static | |
@type String | |
- @default '0.9.7' | |
+ @default '0.9.6' | |
@constant | |
*/ | |
-Ember.VERSION = '0.9.7'; | |
+Ember.VERSION = '0.9.6'; | |
/** | |
@static | |
@@ -3258,7 +3258,7 @@ function addDependentKeys(desc, obj, keyName) { | |
/** @private */ | |
function ComputedProperty(func, opts) { | |
this.func = func; | |
- this._cacheable = opts && opts.cacheable; | |
+ this._cacheable = !opts || opts.cacheable !== false; | |
this._dependentKeys = opts && opts.dependentKeys; | |
} | |
@@ -7924,7 +7924,7 @@ Ember.Enumerable = Ember.Mixin.create( /** @lends Ember.Enumerable */ { | |
ret = this.nextObject(0, null, context); | |
pushCtx(context); | |
return ret ; | |
- }).property(), | |
+ }).property().cacheable(false), | |
/** | |
Helper method returns the last object from a collection. If your enumerable | |
@@ -7953,7 +7953,7 @@ Ember.Enumerable = Ember.Mixin.create( /** @lends Ember.Enumerable */ { | |
pushCtx(context); | |
return last; | |
} | |
- }).property(), | |
+ }).property().cacheable(false), | |
/** | |
Returns true if the passed object can be found in the receiver. The | |
@@ -12708,13 +12708,13 @@ Ember.View = Ember.Object.extend(Ember.Evented, | |
} else { | |
return parent; | |
} | |
- }).property('_parentView'), | |
+ }).property('_parentView').cacheable(false), | |
// return the current view, not including virtual views | |
concreteView: Ember.computed(function() { | |
if (!this.isVirtual) { return this; } | |
else { return get(this, 'parentView'); } | |
- }).property('_parentView'), | |
+ }).property('_parentView').cacheable(false), | |
/** | |
If false, the view will appear hidden in DOM. | |
@@ -16621,7 +16621,7 @@ var normalizePath = Ember.Handlebars.normalizePath = function(root, path, data) | |
*/ | |
Ember.Handlebars.getPath = function(root, path, options) { | |
- var data = options && options.data, | |
+ var data = options.data, | |
normalizedPath = normalizePath(root, path, data), | |
value; | |
@@ -16845,7 +16845,7 @@ Ember._BindableSpanView = Ember.View.extend(Ember.Metamorph, | |
} | |
return valueNormalizer ? valueNormalizer(result) : result; | |
- }).property('property', 'previousContext', 'valueNormalizerFunc'), | |
+ }).property('property', 'previousContext', 'valueNormalizerFunc').cacheable(false), | |
rerenderIfNeeded: function() { | |
if (!get(this, 'isDestroyed') && get(this, 'normalizedValue') !== this._lastNormalizedValue) { | |
@@ -18129,11 +18129,11 @@ Ember.Checkbox = Ember.View.extend({ | |
tagName: Ember.computed(function(){ | |
return get(this, 'title') ? undefined : 'input'; | |
- }).property(), | |
+ }).property().cacheable(false), | |
attributeBindings: Ember.computed(function(){ | |
return get(this, 'title') ? [] : ['type', 'checked', 'disabled']; | |
- }).property(), | |
+ }).property().cacheable(false), | |
type: "checkbox", | |
checked: false, | |
@@ -18159,7 +18159,7 @@ Ember.Checkbox = Ember.View.extend({ | |
} else { | |
return get(this, 'checked'); | |
} | |
- }).property('checked'), | |
+ }).property('checked').cacheable(false), | |
change: function() { | |
Ember.run.once(this, this._updateElementValue); | |
@@ -18432,11 +18432,11 @@ var get = Ember.get, getPath = Ember.getPath; | |
Ember.TabPaneView = Ember.View.extend({ | |
tabsContainer: Ember.computed(function() { | |
return this.nearestInstanceOf(Ember.TabContainerView); | |
- }).property(), | |
+ }).property().cacheable(false), | |
isVisible: Ember.computed(function() { | |
return get(this, 'viewName') === getPath(this, 'tabsContainer.currentView'); | |
- }).property('tabsContainer.currentView') | |
+ }).property('tabsContainer.currentView').cacheable(false) | |
}); | |
})(); | |
@@ -18449,7 +18449,7 @@ var get = Ember.get, setPath = Ember.setPath; | |
Ember.TabView = Ember.View.extend({ | |
tabsContainer: Ember.computed(function() { | |
return this.nearestInstanceOf(Ember.TabContainerView); | |
- }).property(), | |
+ }).property().cacheable(false), | |
mouseUp: function() { | |
setPath(this, 'tabsContainer.currentView', get(this, 'value')); | |
@@ -18596,7 +18596,7 @@ Ember.SelectOption = Ember.View.extend({ | |
// `new Number(4) !== 4`, we use `==` below | |
return content == selection; | |
} | |
- }).property('content', 'parentView.selection'), | |
+ }).property('content', 'parentView.selection').cacheable(false), | |
labelPathDidChange: Ember.observer(function() { | |
var labelPath = getPath(this, 'parentView.optionLabelPath'); |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment