Check if window.devToolsOptions was injected

Related to #589
zalmoxisus · Nov 28, 2018 · 969619c · 969619c
1 parent 0f14bb5
commit 969619c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/app/api/filters.js b/src/app/api/filters.js
@@ -25,7 +25,7 @@ export const noFiltersApplied = (localFilter) => (
 export function isFiltered(action, localFilter) {
   if (noFiltersApplied(localFilter) || typeof action.type.match !== 'function') return false;
 
-  const { whitelist, blacklist } = localFilter || window.devToolsOptions;
+  const { whitelist, blacklist } = localFilter || window.devToolsOptions || {};
   return (
     whitelist && !action.type.match(whitelist) ||
     blacklist && action.type.match(blacklist)

diff --git a/src/browser/extension/inject/pageScript.js b/src/browser/extension/inject/pageScript.js
@@ -235,7 +235,7 @@ const __REDUX_DEVTOOLS_EXTENSION__ = function(reducer, preloadedState, config) {
   }
 
   const getMaxAge = () => {
-    return config && config.maxAge || window.devToolsOptions.maxAge || 50;
+    return config && config.maxAge || window.devToolsOptions && window.devToolsOptions.maxAge || 50;
   };
 
   function init() {