Merge branch 'master' into featured-comments

This commit is contained in:
Kim Gardner
2017-07-05 14:29:17 +01:00
committed by GitHub
2 changed files with 5 additions and 3 deletions
+4 -2
View File
@@ -12,17 +12,19 @@ import camelize from './camelize';
function getSlotComponents(slot) {
const pluginConfig = getStore().getState().config.plugin_config;
// Filter out components that have been disabled in `plugin_config`
return flatten(plugins
// Filter out components that have been disabled in `plugin_config`
.filter((o) => !pluginConfig[o.plugin] || !pluginConfig[o.plugin].disable_components)
.filter((o) => !pluginConfig || !pluginConfig[o.plugin] || !pluginConfig[o.plugin].disable_components)
.filter((o) => o.module.slots[slot])
.map((o) => o.module.slots[slot]));
}
export function isSlotEmpty(slot) {
return !!getSlotComponents(slot).length;
return getSlotComponents(slot).length === 0;
}
/**
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "talk",
"version": "2.2.0",
"version": "2.2.1",
"description": "A better commenting experience from Mozilla, The New York Times, and the Washington Post. https://coralproject.net",
"main": "app.js",
"scripts": {