Merge pull request #12676 from sprintr/issue-12399

Marcel Gerber · web-flow · commit ca8b283f1aa8 · 2016-08-15T23:56:05.000+02:00
Add another assertion to be on the safe side
diff --git a/src/language/CSSUtils.js b/src/language/CSSUtils.js
@@ -90,7 +90,7 @@ define(function (require, exports, module) {
             return null;
         }
         var state = ctx.token.state.localState || ctx.token.state;
-        if (!state.context && ctx.token.state.html.localState) {
+        if (!state.context && ctx.token.state.html && ctx.token.state.html.localState) {
             state = ctx.token.state.html.localState;
         }
         return state;

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ define(function (require, exports, module) {`
`90`	`90`	`return null;`
`91`	`91`	`}`
`92`	`92`	`var state = ctx.token.state.localState \|\| ctx.token.state;`
`93`		`- if (!state.context && ctx.token.state.html.localState) {`
	`93`	`+ if (!state.context && ctx.token.state.html && ctx.token.state.html.localState) {`
`94`	`94`	`state = ctx.token.state.html.localState;`
`95`	`95`	`}`
`96`	`96`	`return state;`