update to ember 1.3.1
Change-Id: Ia8ef4f9351bab01edb3fe989e628cfcb9412e227 Reviewed-on: https://gerrit.instructure.com/28542 Reviewed-by: Aaron Shafovaloff <ashafovaloff@instructure.com> Tested-by: Jenkins <jenkins@instructure.com> QA-Review: Stanley Stuart <stanley@instructure.com> Product-Review: Stanley Stuart <stanley@instructure.com>
This commit is contained in:
parent
51410731e5
commit
76ec23ecbd
|
@ -3,7 +3,7 @@
|
||||||
"version": "0.0.0",
|
"version": "0.0.0",
|
||||||
"private": true,
|
"private": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"ember": "1.3.0",
|
"ember": "1.3.1",
|
||||||
"handlebars": "1.1.2",
|
"handlebars": "1.1.2",
|
||||||
"ic-ajax": "~0.2.0",
|
"ic-ajax": "~0.2.0",
|
||||||
"ic-menu": "~0.1.0",
|
"ic-menu": "~0.1.0",
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "ember",
|
"name": "ember",
|
||||||
"version": "1.3.0",
|
"version": "1.3.1",
|
||||||
"main": [
|
"main": [
|
||||||
"./ember.js"
|
"./ember.js"
|
||||||
],
|
],
|
||||||
|
@ -9,13 +9,13 @@
|
||||||
"handlebars": ">= 1.0.0"
|
"handlebars": ">= 1.0.0"
|
||||||
},
|
},
|
||||||
"homepage": "https://github.com/components/ember",
|
"homepage": "https://github.com/components/ember",
|
||||||
"_release": "1.3.0",
|
"_release": "1.3.1",
|
||||||
"_resolution": {
|
"_resolution": {
|
||||||
"type": "version",
|
"type": "version",
|
||||||
"tag": "1.3.0",
|
"tag": "1.3.1",
|
||||||
"commit": "37b7e927015bcecadc79891c624898d3ddbc066c"
|
"commit": "291ac53659ac21099f1d9e6eb9776cfe9dd690bb"
|
||||||
},
|
},
|
||||||
"_source": "git://github.com/components/ember.git",
|
"_source": "git://github.com/components/ember.git",
|
||||||
"_target": "1.3.0",
|
"_target": "1.3.1",
|
||||||
"_originalSource": "ember"
|
"_originalSource": "ember"
|
||||||
}
|
}
|
|
@ -1,4 +1,4 @@
|
||||||
VERSION=v1.3.0
|
VERSION=v1.3.1
|
||||||
|
|
||||||
default:
|
default:
|
||||||
@curl -O http://builds.emberjs.com/tags/$(VERSION)/ember.js
|
@curl -O http://builds.emberjs.com/tags/$(VERSION)/ember.js
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "ember",
|
"name": "ember",
|
||||||
"version": "1.3.0",
|
"version": "1.3.1",
|
||||||
"main": [
|
"main": [
|
||||||
"./ember.js"
|
"./ember.js"
|
||||||
],
|
],
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{
|
{
|
||||||
"name": "ember",
|
"name": "ember",
|
||||||
"repo": "components/ember",
|
"repo": "components/ember",
|
||||||
"version": "1.3.0",
|
"version": "1.3.1",
|
||||||
"main": "ember.js",
|
"main": "ember.js",
|
||||||
"scripts": [
|
"scripts": [
|
||||||
"ember.js"
|
"ember.js"
|
||||||
|
|
|
@ -7,7 +7,7 @@ var Ember = { assert: function() {}, FEATURES: { isEnabled: function() {} } };
|
||||||
* 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
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "components-ember",
|
"name": "components-ember",
|
||||||
"version": "1.3.0",
|
"version": "1.3.1",
|
||||||
"description": "Ember Application Framework",
|
"description": "Ember Application Framework",
|
||||||
"keywords": ["ember"],
|
"keywords": ["ember"],
|
||||||
"main": "./ember.js",
|
"main": "./ember.js",
|
||||||
|
|
Loading…
Reference in New Issue