github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-23 13:31:18 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Support for importing @ember/component and @ember/routing/route (#8214)

Browse Source 
This will allow us to take the first step in updating our modules
to be consistent with example Ember code and to align with Ember CLI.
This commit is contained in:
Robin Ward
2019-10-22 09:47:27 -04:00
committed by GitHub
parent e5311ab645
commit 283a0add80
4 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/assets/javascripts/discourse-loader.js
View File

@ -1,6 +1,15 @@
var define, requirejs;
(function() {
// In future versions of ember we don't need this
var EMBER_MODULES = {};
if (typeof Ember !== "undefined") {
EMBER_MODULES = {
"@ember/component": { default: Ember.Component },
"@ember/routing/route": { default: Ember.Route }
};
}
var _isArray;
if (!Array.isArray) {
_isArray = function(x) {
@ -111,7 +120,7 @@ var define, requirejs;
}
function requireFrom(name, origin) {
var mod = registry[name];
var mod = EMBER_MODULES[name] || registry[name];
if (!mod) {
throw new Error(
"Could not find module `" + name + "` imported from `" + origin + "`"
@ -125,6 +134,10 @@ var define, requirejs;
}
requirejs = require = function(name) {
if (EMBER_MODULES[name]) {
return EMBER_MODULES[name];
}
var mod = registry[name];
if (mod && mod.callback instanceof Alias) {