Discource-C/discourse
1
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-13 14:55:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX: plugin-outlet should do view injections

Browse Source
This commit is contained in:
Robin Ward 2015-06-17 11:09:19 -04:00
parent 56b9528de8
commit 874b2a628d
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/assets/javascripts/discourse/helpers/plugin-outlet.js.es6
View File

@ -99,6 +99,20 @@ function buildConnectorCache() {
}); });
} }
var _viewInjections;
function viewInjections(container) {
if (_viewInjections) { return _viewInjections; }
const injections = container._registry.getTypeInjections('view');
_viewInjections = {};
injections.forEach(function(i) {
_viewInjections[i.property] = container.lookup(i.fullName);
});
return _viewInjections;
}
Ember.HTMLBars._registerHelper('plugin-outlet', function(params, hash, options, env) { Ember.HTMLBars._registerHelper('plugin-outlet', function(params, hash, options, env) {
const connectionName = params[0]; const connectionName = params[0];
@ -112,7 +126,7 @@ Ember.HTMLBars._registerHelper('plugin-outlet', function(params, hash, options,
const viewClass = (childViews.length > 1) ? Ember.ContainerView : childViews[0]; const viewClass = (childViews.length > 1) ? Ember.ContainerView : childViews[0];
delete options.fn; // we don't need the default template since we have a connector delete options.fn; // we don't need the default template since we have a connector
env.helpers.view.helperFunction.call(this, [viewClass], hash, options, env); env.helpers.view.helperFunction.call(this, [viewClass], viewInjections(env.data.view.container), options, env);
const cvs = env.data.view._childViews; const cvs = env.data.view._childViews;
if (childViews.length > 1 && cvs && cvs.length) { if (childViews.length > 1 && cvs && cvs.length) {