Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

The initializer arguments changed in future Ember releases

This commit is contained in:
Robin Ward 2016-11-03 14:52:14 -04:00
parent e18ae34493
commit 5febbd58cc
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/assets/javascripts/discourse.js.es6
View File

@ -104,7 +104,14 @@ const Discourse = Ember.Application.extend({
if (/\/pre\-initializers\//.test(key)) {
const module = require(key, null, null, true);
if (!module) { throw new Error(key + ' must export an initializer.'); }
Discourse.initializer(module.default);
const init = module.default;
const oldInitialize = init.initialize;
init.initialize = function() {
oldInitialize.call(this, Discourse.__container__, Discourse);
};
Discourse.initializer(init);
}
});
@ -115,8 +122,8 @@ const Discourse = Ember.Application.extend({
const init = module.default;
const oldInitialize = init.initialize;
init.initialize = function(app) {
oldInitialize.call(this, app.container, Discourse);
init.initialize = function() {
oldInitialize.call(this, Discourse.__container__, Discourse);
};
Discourse.instanceInitializer(init);