Merge branch 'master' of github.com:coralproject/talk into featured-comments

client/coral-framework/actions/auth.js

@@ -7,8 +7,12 @@ import pym from '../services/PymConnection';
 
 import {resetWebsocket} from 'coral-framework/services/client';
 import t from 'coral-framework/services/i18n';
+import {isSlotEmpty} from 'plugin-api/beta/client/services';
 
 export const showSignInDialog = () => (dispatch, getState) => {
+  if (isSlotEmpty('login')) {
+    return;
+  }
   const signInPopUp = window.open(
     '/embed/stream/login',
     'Login',

client/coral-framework/helpers/plugins.js

@@ -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;
 }
 
 /**

package.json

@@ -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": {