ylqjgm
/
canvas-lms
mirror of https://github.com/instructure/canvas-lms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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:
Stanley Stuart 2014-01-14 14:40:19 -06:00
parent 51410731e5
commit 76ec23ecbd
10 changed files with 63 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bower.json
View File

@ -3,7 +3,7 @@
"version": "0.0.0",
"private": true,
"dependencies": {
"ember": "1.3.0",
"ember": "1.3.1",
"handlebars": "1.1.2",
"ic-ajax": "~0.2.0",
"ic-menu": "~0.1.0",

10
public/javascripts/bower/ember/.bower.json
View File

@ -1,6 +1,6 @@
{
"name": "ember",
"version": "1.3.0",
"version": "1.3.1",
"main": [
"./ember.js"
],
@ -9,13 +9,13 @@
"handlebars": ">= 1.0.0"
},
"homepage": "https://github.com/components/ember",
"_release": "1.3.0",
"_release": "1.3.1",
"_resolution": {
"type": "version",
"tag": "1.3.0",
"commit": "37b7e927015bcecadc79891c624898d3ddbc066c"
"tag": "1.3.1",
"commit": "291ac53659ac21099f1d9e6eb9776cfe9dd690bb"
},
"_source": "git://github.com/components/ember.git",
"_target": "1.3.0",
"_target": "1.3.1",
"_originalSource": "ember"
}

2
public/javascripts/bower/ember/Makefile
View File

@ -1,4 +1,4 @@
VERSION=v1.3.0
VERSION=v1.3.1
default:
@curl -O http://builds.emberjs.com/tags/$(VERSION)/ember.js

2
public/javascripts/bower/ember/bower.json
View File

@ -1,6 +1,6 @@
{
"name": "ember",
"version": "1.3.0",
"version": "1.3.1",
"main": [
"./ember.js"
],

2
public/javascripts/bower/ember/component.json
View File

@ -1,7 +1,7 @@
{
"name": "ember",
"repo": "components/ember",
"version": "1.3.0",
"version": "1.3.1",
"main": "ember.js",
"scripts": [
"ember.js"

2
public/javascripts/bower/ember/ember-template-compiler.js
View File

@ -7,7 +7,7 @@ var Ember = { assert: function() {}, FEATURES: { isEnabled: function() {} } };
* 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
*/

35
public/javascripts/bower/ember/ember.js
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);
}
}

6
public/javascripts/bower/ember/ember.min.js vendored
View File

File diff suppressed because one or more lines are too long

33
public/javascripts/bower/ember/ember.prod.js
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
*/
@ -88,7 +88,7 @@ var define, requireModule, require, requirejs;
@class Ember
@static
@version 1.3.0
@version 1.3.1
*/
if ('undefined' === typeof Ember) {
@ -115,10 +115,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`
@ -27162,6 +27162,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) {
@ -27253,9 +27267,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
@ -27279,8 +27293,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);
}
}

2
public/javascripts/bower/ember/package.json
View File

@ -1,6 +1,6 @@
{
"name": "components-ember",
"version": "1.3.0",
"version": "1.3.1",
"description": "Ember Application Framework",
"keywords": ["ember"],
"main": "./ember.js",