Commit 47e3e569 authored by Mark VanLandingham's avatar Mark VanLandingham Committed by GitHub

FIX: Alias modules that are required AND imported (#8315)

parent 1998be3b
......@@ -151,7 +151,7 @@ var define, requirejs;
}
Module.prototype.makeRequire = function() {
var name = this.name;
var name = transformForAliases(this.name);
return (
this._require ||
......@@ -217,7 +217,7 @@ var define, requirejs;
}
function requireFrom(name, origin) {
name = checkForAlias(name);
name = transformForAliases(name);
var mod = EMBER_MODULES[name] || registry[name];
if (!mod) {
throw new Error(
......@@ -231,7 +231,7 @@ var define, requirejs;
throw new Error("Could not find module " + name);
}
function checkForAlias(name) {
function transformForAliases(name) {
return ALIASES[name] ? ALIASES[name] : name;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment