Merge pull request #7137 from NativeScript/mdonev/release-to-master-7135

manoldonev · web-flow · commit e0bddd77485b · 2019-04-12T14:40:07.000+03:00
chore: merge release to master (#7135)
diff --git a/tns-core-modules/ui/styling/style-scope.ts b/tns-core-modules/ui/styling/style-scope.ts
@@ -168,7 +168,8 @@ class CSSSource {
                 if (!this._source && this._file) {
                     this.load();
                 }
-                if (this._source) {
+                // [object Object] check guards against empty app.css file
+                if (this._source && this.source !== "[object Object]") {
                     this.parseCSSAst();
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,8 @@ class CSSSource {`
`168`	`168`	`if (!this._source && this._file) {`
`169`	`169`	`this.load();`
`170`	`170`	`}`
`171`		`- if (this._source) {`
	`171`	`+ // [object Object] check guards against empty app.css file`
	`172`	`+ if (this._source && this.source !== "[object Object]") {`
`172`	`173`	`this.parseCSSAst();`
`173`	`174`	`}`
`174`	`175`	`}`