dist/ember.js in ember-source-2.5.0 vs dist/ember.js in ember-source-2.5.1
- old
+ new
@@ -4,11 +4,11 @@
* @copyright Copyright 2011-2016 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 2.5.0
+ * @version 2.5.1
*/
var enifed, requireModule, require, requirejs, Ember;
var mainContext = this;
@@ -7528,11 +7528,11 @@
isHelperFactory: true
});
/**
In many cases, the ceremony of a full `Ember.Helper` class is not required.
- The `helper` method create pure-function helpers without instances. For
+ The `helper` method creates pure-function helpers without instances. For
example:
```js
// app/helpers/format-currency.js
export default Ember.Helper.helper(function(params, hash) {
@@ -10600,11 +10600,11 @@
@submodule ember-templates
*/
'use strict';
- _emberHtmlbarsTemplatesTopLevelView.default.meta.revision = 'Ember@2.5.0';
+ _emberHtmlbarsTemplatesTopLevelView.default.meta.revision = 'Ember@2.5.1';
/**
The `{{outlet}}` helper lets you specify where a child route will render in
your template. An important use of the `{{outlet}}` helper is in your
application's `application.hbs` file:
@@ -16153,11 +16153,11 @@
cross-platform libraries such as jQuery. For more details, see
[Ember-Runtime](http://emberjs.com/api/modules/ember-runtime.html).
@class Ember
@static
- @version 2.5.0
+ @version 2.5.1
@public
*/
if ('undefined' === typeof Ember) {
// Create core object. Make it act like an instance of Ember.Namespace so that
@@ -16195,15 +16195,15 @@
/**
The semantic version.
@property VERSION
@type String
- @default '2.5.0'
+ @default '2.5.1'
@static
@public
*/
- Ember.VERSION = '2.5.0';
+ Ember.VERSION = '2.5.1';
/**
The hash of environment variables used to control various configuration
settings. To specify your own or override default settings, add the
desired properties to a global hash named `EmberENV` (or `ENV` for
@@ -17335,11 +17335,11 @@
AliasedPropertyPrototype.oneWay.call(this);
}
function injectedPropertyGet(keyName) {
var desc = this[keyName];
- var owner = _containerOwner.getOwner(this);
+ var owner = _containerOwner.getOwner(this) || this.container; // fallback to `container` for backwards compat
_emberMetalDebug.assert('InjectedProperties should be defined with the Ember.inject computed property macros.', desc && desc.isDescriptor && desc.type);
_emberMetalDebug.assert('Attempting to lookup an injected property on an object without a container, ensure that the object was instantiated via a container.', owner);
return owner.lookup(desc.type + ':' + (desc.name || keyName));
@@ -18483,15 +18483,11 @@
exports.default = Map;
exports.OrderedSet = OrderedSet;
exports.Map = Map;
exports.MapWithDefault = MapWithDefault;
});
-enifed('ember-metal/merge', ['exports', 'ember-metal/debug', 'ember-metal/features'], function (exports, _emberMetalDebug, _emberMetalFeatures) {
- 'use strict';
-
- exports.default = merge;
-
+enifed('ember-metal/merge', ['exports'], function (exports) {
/**
Merge the contents of two objects together into the first object.
```javascript
Ember.merge({first: 'Tom'}, {last: 'Dale'}); // {first: 'Tom', last: 'Dale'}
@@ -18505,16 +18501,15 @@
@param {Object} original The object to merge into
@param {Object} updates The object to copy properties from
@return {Object}
@public
*/
+ 'use strict';
- function merge(original, updates) {
- _emberMetalDebug.deprecate('Usage of `Ember.merge` is deprecated, use `Ember.assign` instead.', false, {
- id: 'ember-metal.merge', until: '3.0.0', url: 'http://emberjs.com/deprecations/v2.x/#toc_ember-merge'
- });
+ exports.default = merge;
+ function merge(original, updates) {
if (!updates || typeof updates !== 'object') {
return original;
}
var props = Object.keys(updates);
@@ -30276,11 +30271,11 @@
@submodule ember-routing-views
*/
'use strict';
- _emberHtmlbarsTemplatesLinkTo.default.meta.revision = 'Ember@2.5.0';
+ _emberHtmlbarsTemplatesLinkTo.default.meta.revision = 'Ember@2.5.1';
/**
`Ember.LinkComponent` renders an element whose `click` event triggers a
transition of the application's instance of `Ember.Router` to
a supplied route by name.
@@ -30779,11 +30774,11 @@
@submodule ember-routing-views
*/
'use strict';
- _emberHtmlbarsTemplatesTopLevelView.default.meta.revision = 'Ember@2.5.0';
+ _emberHtmlbarsTemplatesTopLevelView.default.meta.revision = 'Ember@2.5.1';
var CoreOutletView = _emberViewsViewsView.default.extend({
defaultTemplate: _emberHtmlbarsTemplatesTopLevelView.default,
init: function () {
@@ -36963,22 +36958,15 @@
}, _Mixin$create.toString = function () {
var hasToStringExtension = typeof this.toStringExtension === 'function';
var extension = hasToStringExtension ? ':' + this.toStringExtension() : '';
var ret = '<' + this.constructor.toString() + ':' + _emberMetalUtils.guidFor(this) + extension + '>';
- this.toString = makeToString(ret);
return ret;
}, _Mixin$create));
CoreObject.PrototypeMixin.ownerConstructor = CoreObject;
- function makeToString(ret) {
- return function () {
- return ret;
- };
- }
-
CoreObject.__super__ = null;
var ClassMixinProps = {
ClassMixin: _emberMetalMixin.REQUIRED,
@@ -39914,11 +39902,11 @@
options.plugins = plugins;
options.buildMeta = function buildMeta(program) {
return {
fragmentReason: fragmentReason(program),
- revision: 'Ember@2.5.0',
+ revision: 'Ember@2.5.1',
loc: program.loc,
moduleName: options.moduleName
};
};
@@ -40137,11 +40125,11 @@
var keyboardEventTypes, mouseEventTypes, buildKeyboardEvent, buildMouseEvent, buildBasicEvent, fireEvent, focus;
var defaultEventOptions = { canBubble: true, cancelable: true };
keyboardEventTypes = ['keydown', 'keypress', 'keyup'];
- mouseEventTypes = ['click', 'mousedown', 'mouseup', 'dblclick', 'mousenter', 'mouseleave', 'mousemove', 'mouseout', 'mouseover'];
+ mouseEventTypes = ['click', 'mousedown', 'mouseup', 'dblclick', 'mouseenter', 'mouseleave', 'mousemove', 'mouseout', 'mouseover'];
buildKeyboardEvent = function buildKeyboardEvent(type) {
var options = arguments.length <= 1 || arguments[1] === undefined ? {} : arguments[1];
var event = undefined;
@@ -45436,10 +45424,10 @@
exports.DeprecatedCollectionView = DeprecatedCollectionView;
});
enifed('ember-views/views/container_view', ['exports', 'ember-metal/core', 'ember-metal/debug', 'ember-runtime/mixins/mutable_array', 'ember-runtime/system/native_array', 'ember-views/views/view', 'ember-metal/property_get', 'ember-metal/property_set', 'ember-metal/mixin', 'ember-metal/events', 'ember-htmlbars/templates/container-view'], function (exports, _emberMetalCore, _emberMetalDebug, _emberRuntimeMixinsMutable_array, _emberRuntimeSystemNative_array, _emberViewsViewsView, _emberMetalProperty_get, _emberMetalProperty_set, _emberMetalMixin, _emberMetalEvents, _emberHtmlbarsTemplatesContainerView) {
'use strict';
- _emberHtmlbarsTemplatesContainerView.default.meta.revision = 'Ember@2.5.0';
+ _emberHtmlbarsTemplatesContainerView.default.meta.revision = 'Ember@2.5.1';
/**
@module ember
@submodule ember-views
*/