dist/ember-runtime.js in ember-source-1.1.1 vs dist/ember-runtime.js in ember-source-1.1.2
- old
+ new
@@ -1,6 +1,6 @@
- // Version: 1.1.1
+ // Version: 1.1.2
(function() {
/*global __fail__*/
/**
@@ -172,11 +172,11 @@
}
}
})();
- // Version: 1.1.1
+ // Version: 1.1.2
(function() {
var define, requireModule;
(function() {
@@ -237,11 +237,11 @@
The core Runtime framework is based on the jQuery API with a number of
performance optimizations.
@class Ember
@static
- @version 1.1.1
+ @version 1.1.2
*/
if ('undefined' === typeof Ember) {
// Create core object. Make it act like an instance of Ember.Namespace so that
// objects assigned to it are given a sane string representation.
@@ -264,14 +264,14 @@
/**
@property VERSION
@type String
- @default '1.1.1'
+ @default '1.1.2'
@final
*/
-Ember.VERSION = '1.1.1';
+Ember.VERSION = '1.1.2';
/**
Standard environmental variables. You can define these in a global `ENV`
variable before loading Ember to control various configuration
settings.
@@ -7038,12 +7038,10 @@
return baseValue.concat(value);
} else {
return Ember.makeArray(baseValue).concat(value);
}
} else {
- // Make sure this mixin has its own array so it is not
- // accidentally mutated by another child's interactions
- return Ember.makeArray(value).slice();
+ return Ember.makeArray(value);
}
}
function applyMergedProperties(obj, key, value, values) {
var baseValue = values[key] || obj[key];