@@ -9,10 +9,12 @@ window.devToolsExtension = function(config = {}) {
99 let store = { } ;
1010 if ( ! window . devToolsOptions ) window . devToolsOptions = { } ;
1111
12+ let localFilter ;
1213 if ( config . actionsBlacklist || config . actionsWhitelist ) {
13- window . devToolsOptions . filter = true ;
14- window . devToolsOptions . blacklist = actionsArrToReg ( config . actionsBlacklist ) ;
15- window . devToolsOptions . whitelist = actionsArrToReg ( config . actionsWhitelist ) ;
14+ localFilter = {
15+ whitelist : actionsArrToReg ( config . actionsWhitelist ) ,
16+ blacklist : actionsArrToReg ( config . actionsBlacklist )
17+ } ;
1618 }
1719
1820 let shouldSerialize = false ;
@@ -84,18 +86,19 @@ window.devToolsExtension = function(config = {}) {
8486 }
8587
8688 function isFiltered ( action ) {
87- if ( ! window . devToolsOptions . filter ) return false ;
88- const { whitelist, blacklist } = window . devToolsOptions ;
89+ if ( ! localFilter && ! window . devToolsOptions . filter ) return false ;
90+ const { whitelist, blacklist } = localFilter || window . devToolsOptions ;
8991 return (
9092 whitelist && ! action . type . match ( whitelist ) ||
9193 blacklist && action . type . match ( blacklist )
9294 ) ;
9395 }
9496
9597 function addFilter ( state ) {
96- if ( window . devToolsOptions . filter ) {
97- if ( window . devToolsOptions . whitelist ) state . whitelist = [ window . devToolsOptions . whitelist ] ;
98- else if ( window . devToolsOptions . blacklist ) state . blacklist = [ window . devToolsOptions . blacklist ] ;
98+ if ( localFilter || window . devToolsOptions . filter ) {
99+ const { whitelist, blacklist } = localFilter || window . devToolsOptions ;
100+ if ( whitelist ) state . whitelist = [ whitelist ] ;
101+ else if ( blacklist ) state . blacklist = [ blacklist ] ;
99102 }
100103 }
101104
0 commit comments