dist/ember-runtime.js in ember-source-1.11.0.beta.5 vs dist/ember-runtime.js in ember-source-1.11.0
- old
+ new
@@ -3,11 +3,11 @@
* @copyright Copyright 2011-2015 Tilde Inc. and contributors
* Portions Copyright 2006-2011 Strobe Inc.
* 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.11.0-beta.5.1501308c
+ * @version 1.11.0
*/
(function() {
var enifed, requireModule, eriuqer, requirejs, Ember;
var mainContext = this;
@@ -1152,10 +1152,11 @@
/**
@private
@property _registry
@type Registry
+ @since 1.11.0
*/
_registry: null,
/**
@property cache
@@ -1497,10 +1498,11 @@
The public API for `Registry` is still in flux and should not be considered
stable.
@private
@class Registry
+ @since 1.11.0
*/
function Registry(options) {
this.fallback = options && options.fallback ? options.fallback : null;
this.resolver = options && options.resolver ? options.resolver : function() {};
@@ -1612,11 +1614,11 @@
@private
@property _defaultContainer
@type Container
*/
- _defaultContainer: null,
+ _defaultContainer: null,
/**
Creates a container based on this registry.
@method container
@@ -4802,12 +4804,12 @@
/**
This is a more semantically meaningful alias of `computed.oneWay`,
whose name is somewhat ambiguous as to which direction the data flows.
- @method computed.reads
- @for Ember
+ @method reads
+ @for Ember.computed
@param {String} dependentKey
@return {Ember.ComputedProperty} computed property which creates a
one way computed property to the original value for property.
*/
@@ -4945,11 +4947,11 @@
The core Runtime framework is based on the jQuery API with a number of
performance optimizations.
@class Ember
@static
- @version 1.11.0-beta.5.1501308c
+ @version 1.11.0
*/
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.
@@ -4973,14 +4975,14 @@
/**
@property VERSION
@type String
- @default '1.11.0-beta.5.1501308c'
+ @default '1.11.0'
@static
*/
- Ember.VERSION = '1.11.0-beta.5.1501308c';
+ Ember.VERSION = '1.11.0';
/**
Standard environmental variables. You can define these in a global `EmberENV`
variable before loading Ember to control various configuration settings.
@@ -5140,11 +5142,11 @@
exports.removeDependentKeys = removeDependentKeys;
// Remove "use strict"; from transpiled module until
// https://bugs.webkit.org/show_bug.cgi?id=138038 is fixed
//
- // REMOVE_USE_STRICT: true
+ "REMOVE_USE_STRICT: true";
function keysForDep(depsMeta, depKey) {
var keys = depsMeta[depKey];
if (!keys) {
// if there are no dependencies yet for a the given key
@@ -5595,11 +5597,11 @@
exports.removeListener = removeListener;
// Remove "use strict"; from transpiled module until
// https://bugs.webkit.org/show_bug.cgi?id=138038 is fixed
//
- // REMOVE_USE_STRICT: true
+ "REMOVE_USE_STRICT: true";
/**
@module ember-metal
*/
var a_slice = [].slice;
@@ -7219,11 +7221,11 @@
exports.Mixin = Mixin;
// Remove "use strict"; from transpiled module until
// https://bugs.webkit.org/show_bug.cgi?id=138038 is fixed
//
- // REMOVE_USE_STRICT: true
+ "REMOVE_USE_STRICT: true";
/**
@module ember
@submodule ember-metal
*/
@@ -8362,12 +8364,11 @@
// Remove "use strict"; from transpiled module until
// https://bugs.webkit.org/show_bug.cgi?id=138038 is fixed
//
- // REMOVE_USE_STRICT: true
- //
+ "REMOVE_USE_STRICT: true";
var create;
// ES5 15.2.3.5
// http://es5.github.com/#x15.2.3.5
if (!(Object.create && !Object.create(null).hasOwnProperty)) {
@@ -8579,11 +8580,11 @@
return false;
})();
if (!canDefinePropertyOnDOM) {
- defineProperty = function(obj, keyName, desc) {
+ exports.defineProperty = defineProperty = function(obj, keyName, desc) {
var isNode;
if (typeof Node === "object") {
isNode = obj instanceof Node;
} else {
@@ -8599,20 +8600,19 @@
};
}
}
if (!hasES5CompliantDefineProperty) {
- defineProperty = function definePropertyPolyfill(obj, keyName, desc) {
+ exports.defineProperty = defineProperty = function definePropertyPolyfill(obj, keyName, desc) {
if (!desc.get) { obj[keyName] = desc.value; }
};
}
var hasPropertyAccessors = hasES5CompliantDefineProperty;
var canDefineNonEnumerableProperties = hasES5CompliantDefineProperty;
exports.hasES5CompliantDefineProperty = hasES5CompliantDefineProperty;
- exports.defineProperty = defineProperty;
exports.hasPropertyAccessors = hasPropertyAccessors;
exports.canDefineNonEnumerableProperties = canDefineNonEnumerableProperties;
});
enifed('ember-metal/properties', ['exports', 'ember-metal/core', 'ember-metal/utils', 'ember-metal/platform/define_property', 'ember-metal/property_events'], function (exports, Ember, utils, define_property, property_events) {
@@ -10600,11 +10600,11 @@
exports.canInvoke = canInvoke;
// Remove "use strict"; from transpiled module until
// https://bugs.webkit.org/show_bug.cgi?id=138038 is fixed
//
- // REMOVE_USE_STRICT: true
+ "REMOVE_USE_STRICT: true";
var _uuid = 0;
/**
Generates a universally unique identifier. This method
@@ -11236,11 +11236,11 @@
of the tryable
*/
var tryFinally;
if (needsFinallyFix) {
- tryFinally = function(tryable, finalizer, binding) {
+ exports.tryFinally = tryFinally = function(tryable, finalizer, binding) {
var result, finalResult, finalError;
binding = binding || this;
try {
@@ -11256,11 +11256,11 @@
if (finalError) { throw finalError; }
return (finalResult === undefined) ? result : finalResult;
};
} else {
- tryFinally = function(tryable, finalizer, binding) {
+ exports.tryFinally = tryFinally = function(tryable, finalizer, binding) {
var result, finalResult;
binding = binding || this;
try {
@@ -11312,11 +11312,11 @@
unless that value is undefined, in which case it is the return value
of the tryable.
*/
var tryCatchFinally;
if (needsFinallyFix) {
- tryCatchFinally = function(tryable, catchable, finalizer, binding) {
+ exports.tryCatchFinally = tryCatchFinally = function(tryable, catchable, finalizer, binding) {
var result, finalResult, finalError;
binding = binding || this;
try {
@@ -11334,11 +11334,11 @@
if (finalError) { throw finalError; }
return (finalResult === undefined) ? result : finalResult;
};
} else {
- tryCatchFinally = function(tryable, catchable, finalizer, binding) {
+ exports.tryCatchFinally = tryCatchFinally = function(tryable, catchable, finalizer, binding) {
var result, finalResult;
binding = binding || this;
try {
@@ -11532,12 +11532,10 @@
exports.GUID_KEY_PROPERTY = GUID_KEY_PROPERTY;
exports.NEXT_SUPER_PROPERTY = NEXT_SUPER_PROPERTY;
exports.GUID_KEY = GUID_KEY;
exports.META_DESC = META_DESC;
exports.EMPTY_META = EMPTY_META;
- exports.tryCatchFinally = tryCatchFinally;
- exports.tryFinally = tryFinally;
});
enifed('ember-metal/watch_key', ['exports', 'ember-metal/core', 'ember-metal/utils', 'ember-metal/platform/define_property', 'ember-metal/properties'], function (exports, Ember, utils, define_property, properties) {
'use strict';
@@ -13802,11 +13800,11 @@
exports.mapProperty = mapProperty;
exports.filterProperty = filterProperty;
exports.union = union;
});
-enifed('ember-runtime/controllers/array_controller', ['exports', 'ember-metal/core', 'ember-metal/property_get', 'ember-metal/enumerable_utils', 'ember-runtime/system/array_proxy', 'ember-runtime/mixins/sortable', 'ember-runtime/mixins/controller', 'ember-metal/computed', 'ember-metal/error'], function (exports, Ember, property_get, enumerable_utils, ArrayProxy, SortableMixin, ControllerMixin, computed, EmberError) {
+enifed('ember-runtime/controllers/array_controller', ['exports', 'ember-metal/core', 'ember-metal/property_get', 'ember-metal/enumerable_utils', 'ember-runtime/system/array_proxy', 'ember-runtime/mixins/sortable', 'ember-runtime/mixins/controller', 'ember-metal/computed', 'ember-metal/error', 'ember-runtime/mixins/array'], function (exports, Ember, property_get, enumerable_utils, ArrayProxy, SortableMixin, ControllerMixin, computed, EmberError, EmberArray) {
'use strict';
/**
@module ember
@@ -13912,11 +13910,16 @@
init: function() {
this._super.apply(this, arguments);
this._subControllers = [];
},
- model: computed.computed(function () {
+ model: computed.computed(function (key, value) {
+ if (arguments.length > 1) {
+
+ return value;
+ }
+
return Ember['default'].A();
}),
/**
* Flag to mark as being "virtual". Used to keep this instance
@@ -14020,12 +14023,13 @@
needs: 'posts',
posts: Ember.computed.alias('controllers.posts')
});
```
- @method inject.controller
- @for Ember
+ @method controller
+ @since 1.10.0
+ @for Ember.inject
@param {String} name (optional) name of the controller to inject, defaults
to the property's name
@return {Ember.InjectedProperty} injection descriptor instance
*/
inject.createInjectionHelper('controller', controllerInjectionHelper);
@@ -14059,10 +14063,12 @@
@uses Ember.ControllerMixin
@deprecated
**/
exports['default'] = ObjectProxy['default'].extend(ControllerMixin['default'], {
init: function() {
+ this._super();
+
}
});
exports.objectControllerDeprecation = objectControllerDeprecation;
@@ -14437,17 +14443,17 @@
RSVP.configure('async', function(callback, promise) {
var async = !run['default'].currentRunLoop;
if (Ember['default'].testing && async) { asyncStart(); }
- run['default'].backburner.schedule('actions', function(){
+ run['default'].backburner.schedule('actions', function() {
if (Ember['default'].testing && async) { asyncEnd(); }
callback(promise);
});
});
- RSVP.Promise.prototype.fail = function(callback, label){
+ RSVP.Promise.prototype.fail = function(callback, label) {
return this['catch'](callback, label);
};
function onerrorDefault(e) {
var error;
@@ -14612,11 +14618,12 @@
given container type. Helpers are exported to the `inject` namespace as the
container type itself.
@private
@method createInjectionHelper
- @namespace Ember
+ @since 1.10.0
+ @for Ember
@param {String} type The container type the helper will inject
@param {Function} validator A validation callback that is executed at mixin-time
*/
function createInjectionHelper(type, validator) {
typeValidators[type] = validator;
@@ -14630,11 +14637,12 @@
Validation function that runs per-type validation functions once for each
injected type encountered.
@private
@method validatePropertyInjections
- @namespace Ember
+ @since 1.10.0
+ @for Ember
@param {Object} factory The factory object
*/
function validatePropertyInjections(factory) {
var proto = factory.proto();
var types = [];
@@ -18851,11 +18859,11 @@
// Remove "use strict"; from transpiled module until
// https://bugs.webkit.org/show_bug.cgi?id=138038 is fixed
//
- // REMOVE_USE_STRICT: true
+ "REMOVE_USE_STRICT: true";
/**
@module ember
@submodule ember-runtime
*/
@@ -20287,11 +20295,11 @@
if (Array.prototype[methodName]) {
ignore.push(methodName);
}
});
- NativeArray = NativeArray.without.apply(NativeArray, ignore);
+ exports.NativeArray = NativeArray = NativeArray.without.apply(NativeArray, ignore);
/**
Creates an `Ember.NativeArray` from an Array like object.
Does not modify the original object. Ember.A is not needed if
`Ember.EXTEND_PROTOTYPES` is `true` (the default value). However,
@@ -20344,22 +20352,21 @@
@return {void}
*/
NativeArray.activate = function() {
NativeArray.apply(Array.prototype);
- A = function(arr) { return arr || []; };
+ exports.A = A = function(arr) { return arr || []; };
};
if (Ember['default'].EXTEND_PROTOTYPES === true || Ember['default'].EXTEND_PROTOTYPES.Array) {
NativeArray.activate();
}
Ember['default'].A = A; // ES6TODO: Setting A onto the object returned by ember-metal/core to avoid circles
exports['default'] = NativeArray;
exports.A = A;
- exports.NativeArray = NativeArray;
});
enifed('ember-runtime/system/object', ['exports', 'ember-runtime/system/core_object', 'ember-runtime/mixins/observable'], function (exports, CoreObject, Observable) {
'use strict';
@@ -20392,9 +20399,10 @@
/**
@class Service
@namespace Ember
@extends Ember.Object
+ @since 1.10.0
*/
exports['default'] = Object['default'].extend();
});
enifed('ember-runtime/system/set', ['exports', 'ember-metal/core', 'ember-metal/property_get', 'ember-metal/property_set', 'ember-metal/utils', 'ember-metal/is_none', 'ember-runtime/system/string', 'ember-runtime/system/core_object', 'ember-runtime/mixins/mutable_enumerable', 'ember-runtime/mixins/enumerable', 'ember-runtime/mixins/copyable', 'ember-runtime/mixins/freezable', 'ember-metal/error', 'ember-metal/property_events', 'ember-metal/mixin', 'ember-metal/computed'], function (exports, Ember, property_get, property_set, utils, isNone, string, CoreObject, MutableEnumerable, Enumerable, Copyable, freezable, EmberError, property_events, mixin, computed) {