IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Raw plugin outlets were not working properly

Browse Source
This commit is contained in:
Robin Ward 2016-11-25 16:13:56 -05:00
parent 655b8a0540
commit 47a235e06a
1 changed files with 11 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,7 +29,7 @@
The list of disabled plugins is returned via the `Site` singleton. The list of disabled plugins is returned via the `Site` singleton.
**/ **/
let _connectorCache, _rawCache, _templateCache; let _connectorCache, _templateCache;
function findOutlets(collection, callback) { function findOutlets(collection, callback) {
const disabledPlugins = Discourse.Site.currentProp('disabled_plugins') || []; const disabledPlugins = Discourse.Site.currentProp('disabled_plugins') || [];
@ -55,29 +55,20 @@ function findOutlets(collection, callback) {
export function clearCache() { export function clearCache() {
_templateCache = null; _templateCache = null;
_connectorCache = null; _connectorCache = null;
_rawCache = null;
} }
function buildConnectorCache() { function buildConnectorCache() {
_connectorCache = {}; _connectorCache = {};
_rawCache = {};
_templateCache = []; _templateCache = [];
findOutlets(Ember.TEMPLATES, function(outletName, resource, uniqueName) { findOutlets(Ember.TEMPLATES, function(outletName, resource, uniqueName) {
if (/\.raw$/.test(uniqueName)) { _connectorCache[outletName] = _connectorCache[outletName] || [];
if (!_rawCache[outletName]) {
_rawCache[outletName] = [];
}
_rawCache[outletName].push(Ember.TEMPLATES[resource]);
} else {
_connectorCache[outletName] = _connectorCache[outletName] || [];
_connectorCache[outletName].push({ _connectorCache[outletName].push({
templateName: resource.replace('javascripts/', ''), templateName: resource.replace('javascripts/', ''),
template: Ember.TEMPLATES[resource], template: Ember.TEMPLATES[resource],
classNames: `${outletName}-outlet ${uniqueName}` classNames: `${outletName}-outlet ${uniqueName}`
}); });
}
}); });
Object.keys(_connectorCache).forEach(outletName => { Object.keys(_connectorCache).forEach(outletName => {
@ -91,16 +82,11 @@ function buildConnectorCache() {
// unbound version of outlets, only has a template // unbound version of outlets, only has a template
Handlebars.registerHelper('plugin-outlet', function(name) { Handlebars.registerHelper('plugin-outlet', function(name) {
if (!_rawCache) { buildConnectorCache(); } if (!_connectorCache) { buildConnectorCache(); }
const functions = _rawCache[name];
if (functions) {
var output = [];
for(var i=0; i<functions.length; i++){
output.push(functions[i]({context: this}));
}
const connector = _connectorCache[name];
if (connector && connector.length) {
const output = connector.map(c => c.template({context: this}));
return new Handlebars.SafeString(output.join("")); return new Handlebars.SafeString(output.join(""));
} }
}); });