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

Update Ember to 1.3.1

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
assets/scripts/vendor/ember.js vendored
View File

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

33
assets/scripts/vendor/ember.prod.js vendored
View File

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