Update Ember to 1.3.1

This commit is contained in:
Piotr Sarnacki 2014-01-14 18:25:36 +01:00
parent a8a112cfa8
commit 4cf6f0542e
2 changed files with 177 additions and 147 deletions

View File

@ -5,7 +5,7 @@
* Portions Copyright 2008-2011 Apple Inc. All rights reserved.
* @license Licensed under MIT license
* See https://raw.github.com/emberjs/ember.js/master/LICENSE
* @version 1.3.0
* @version 1.3.1
*/
@ -203,7 +203,7 @@ if (!Ember.testing) {
* Portions Copyright 2008-2011 Apple Inc. All rights reserved.
* @license Licensed under MIT license
* See https://raw.github.com/emberjs/ember.js/master/LICENSE
* @version 1.3.0
* @version 1.3.1
*/
@ -286,7 +286,7 @@ var define, requireModule, require, requirejs;
@class Ember
@static
@version 1.3.0
@version 1.3.1
*/
if ('undefined' === typeof Ember) {
@ -313,10 +313,10 @@ Ember.toString = function() { return "Ember"; };
/**
@property VERSION
@type String
@default '1.3.0'
@default '1.3.1'
@static
*/
Ember.VERSION = '1.3.0';
Ember.VERSION = '1.3.1';
/**
Standard environmental variables. You can define these in a global `EmberENV`
@ -27467,6 +27467,20 @@ function exists(value) {
return !Ember.isNone(value);
}
function sanitizedHandlebarsGet(currentContext, property, options) {
var result = handlebarsGet(currentContext, property, options);
if (result === null || result === undefined) {
result = "";
} else if (!(result instanceof Handlebars.SafeString)) {
result = String(result);
}
if (!options.hash.unescaped){
result = Handlebars.Utils.escapeExpression(result);
}
return result;
}
// Binds a property into the DOM. This will create a hook in DOM that the
// KVO system will look for and update if the property changes.
function bind(property, options, preserveContext, shouldDisplay, valueNormalizer, childProperties) {
@ -27558,9 +27572,9 @@ function simpleBind(currentContext, property, options) {
Ember.run.once(view, 'rerender');
};
var result = handlebarsGet(currentContext, property, options);
if (result === null || result === undefined) { result = ""; }
data.buffer.push(result);
output = sanitizedHandlebarsGet(currentContext, property, options);
data.buffer.push(output);
} else {
var bindView = new Ember._SimpleHandlebarsView(
property, currentContext, !options.hash.unescaped, options.data
@ -27584,8 +27598,9 @@ function simpleBind(currentContext, property, options) {
} else {
// The object is not observable, so just render it out and
// be done with it.
output = handlebarsGet(currentContext, property, options);
data.buffer.push((output === null || typeof output === 'undefined') ? '' : output);
output = sanitizedHandlebarsGet(currentContext, property, options);
data.buffer.push(output);
}
}

File diff suppressed because it is too large Load Diff