dist/ember.prod.js in ember-source-2.8.1 vs dist/ember.prod.js in ember-source-2.8.2
- 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.8.1
+ * @version 2.8.2
*/
var enifed, requireModule, require, Ember;
var mainContext = this;
@@ -11081,12 +11081,14 @@
var COMPONENT_PATH = _emberMetalSymbol.default('COMPONENT_PATH');
exports.COMPONENT_PATH = COMPONENT_PATH;
var COMPONENT_POSITIONAL_PARAMS = _emberMetalSymbol.default('COMPONENT_POSITIONAL_PARAMS');
exports.COMPONENT_POSITIONAL_PARAMS = COMPONENT_POSITIONAL_PARAMS;
var COMPONENT_HASH = _emberMetalSymbol.default('COMPONENT_HASH');
-
exports.COMPONENT_HASH = COMPONENT_HASH;
+ var COMPONENT_SOURCE = _emberMetalSymbol.default('COMPONENT_SOURCE');
+
+ exports.COMPONENT_SOURCE = COMPONENT_SOURCE;
var ClosureComponentStream = _emberHtmlbarsStreamsStream.default.extend({
init: function (env, path, params, hash) {
this._env = env;
this._path = path;
this._params = params;
@@ -11133,11 +11135,11 @@
return createNewClosureComponentCell(env, componentPath, params, newHash);
}
}
function isValidComponentPath(env, path) {
- var result = _emberViewsUtilsLookupComponent.default(env.owner, path);
+ var result = _emberViewsUtilsLookupComponent.default(env.owner, path, { source: env.meta.moduleName && 'template:' + env.meta.moduleName });
return !!(result.component || result.layout);
}
function isComponentCell(component) {
@@ -11148,11 +11150,11 @@
var _ref;
// This needs to be done in each nesting level to avoid raising assertions.
processPositionalParamsFromCell(componentCell, params, hash);
- return _ref = {}, _ref[COMPONENT_PATH] = componentCell[COMPONENT_PATH], _ref[COMPONENT_HASH] = mergeInNewHash(componentCell[COMPONENT_HASH], hash, componentCell[COMPONENT_POSITIONAL_PARAMS], params), _ref[COMPONENT_POSITIONAL_PARAMS] = componentCell[COMPONENT_POSITIONAL_PARAMS], _ref[COMPONENT_CELL] = true, _ref;
+ return _ref = {}, _ref[COMPONENT_PATH] = componentCell[COMPONENT_PATH], _ref[COMPONENT_SOURCE] = componentCell[COMPONENT_SOURCE], _ref[COMPONENT_HASH] = mergeInNewHash(componentCell[COMPONENT_HASH], hash, componentCell[COMPONENT_POSITIONAL_PARAMS], params), _ref[COMPONENT_POSITIONAL_PARAMS] = componentCell[COMPONENT_POSITIONAL_PARAMS], _ref[COMPONENT_CELL] = true, _ref;
}
function processPositionalParamsFromCell(componentCell, params, hash) {
var positionalParams = componentCell[COMPONENT_POSITIONAL_PARAMS];
@@ -11165,11 +11167,11 @@
var positionalParams = getPositionalParams(env.owner, componentPath);
// This needs to be done in each nesting level to avoid raising assertions.
_emberHtmlbarsUtilsExtractPositionalParams.processPositionalParams(null, positionalParams, params, hash);
- return _ref2 = {}, _ref2[COMPONENT_PATH] = componentPath, _ref2[COMPONENT_HASH] = hash, _ref2[COMPONENT_POSITIONAL_PARAMS] = positionalParams, _ref2[COMPONENT_CELL] = true, _ref2;
+ return _ref2 = {}, _ref2[COMPONENT_PATH] = componentPath, _ref2[COMPONENT_SOURCE] = env.meta.moduleName, _ref2[COMPONENT_HASH] = hash, _ref2[COMPONENT_POSITIONAL_PARAMS] = positionalParams, _ref2[COMPONENT_CELL] = true, _ref2;
}
/*
Returns the positional parameters for component `componentPath`.
If it has no positional parameters, it returns the empty array.
@@ -11621,10 +11623,11 @@
// This needs to be done in each nesting level to avoid raising assertions
_emberHtmlbarsKeywordsClosureComponent.processPositionalParamsFromCell(closureComponent, params, hash);
hash = _emberHtmlbarsKeywordsClosureComponent.mergeInNewHash(closureComponent[_emberHtmlbarsKeywordsClosureComponent.COMPONENT_HASH], hash, closureComponent[_emberHtmlbarsKeywordsClosureComponent.COMPONENT_POSITIONAL_PARAMS], params);
params = [];
+ env = env.childWithMeta(_emberMetalAssign.default({}, env.meta, { moduleName: closureComponent[_emberHtmlbarsKeywordsClosureComponent.COMPONENT_SOURCE] }));
}
var templates = { default: template, inverse: inverse };
env.hooks.component(morph, env, scope, componentPath, params, hash, templates, visitor);
}
@@ -41909,11 +41912,11 @@
*/
});
enifed("ember/version", ["exports"], function (exports) {
"use strict";
- exports.default = "2.8.1";
+ exports.default = "2.8.2";
});
enifed('htmlbars-runtime', ['exports', 'htmlbars-runtime/hooks', 'htmlbars-runtime/render', 'htmlbars-util/morph-utils', 'htmlbars-util/template-utils'], function (exports, _htmlbarsRuntimeHooks, _htmlbarsRuntimeRender, _htmlbarsUtilMorphUtils, _htmlbarsUtilTemplateUtils) {
'use strict';
var internal = {
@@ -45826,11 +45829,11 @@
}
pathLen = path.length;
if (pathLen > 1 && path.charAt(pathLen - 1) === "/") {
path = path.substr(0, pathLen - 1);
- originalPath = originalPath.substr(0, pathLen - 1);
+ originalPath = originalPath.substr(0, originalPath.length - 1);
isSlashDropped = true;
}
for (i = 0; i < path.length; i++) {
states = recognizeChar(states, path.charAt(i));
@@ -45861,10 +45864,10 @@
}
};
RouteRecognizer.prototype.map = map;
- RouteRecognizer.VERSION = '0.2.6';
+ RouteRecognizer.VERSION = '0.2.7';
// Set to false to opt-out of encoding and decoding path segments.
// See https://github.com/tildeio/route-recognizer/pull/55
RouteRecognizer.ENCODE_AND_DECODE_PATH_SEGMENTS = true;