handle include/exclude changing to non-valid types (fix #4749)

yyx990803 · yyx990803 · commit 458671b732c7 · 2017-01-19T10:14:08.000-05:00
diff --git a/src/core/components/keep-alive.js b/src/core/components/keep-alive.js
@@ -12,9 +12,10 @@ function getComponentName (opts: ?VNodeComponentOptions): ?string {
 function matches (pattern: string | RegExp, name: string): boolean {
   if (typeof pattern === 'string') {
     return pattern.split(',').indexOf(name) > -1
-  } else {
+  } else if (pattern instanceof RegExp) {
     return pattern.test(name)
   }
+  return false
 }
 
 function pruneCache (cache, filter) {

Original file line number	Diff line number	Diff line change
`@@ -12,9 +12,10 @@ function getComponentName (opts: ?VNodeComponentOptions): ?string {`
`12`	`12`	`function matches (pattern: string \| RegExp, name: string): boolean {`
`13`	`13`	`if (typeof pattern === 'string') {`
`14`	`14`	`return pattern.split(',').indexOf(name) > -1`
`15`		`- } else {`
	`15`	`+ } else if (pattern instanceof RegExp) {`
`16`	`16`	`return pattern.test(name)`
`17`	`17`	`}`
	`18`	`+ return false`
`18`	`19`	`}`
`19`	`20`
`20`	`21`	`function pruneCache (cache, filter) {`