Merge branch 'master' of https://www.github.com/ecomfe/echarts

100pah · 100pah · commit 7253eeb02617 · 2017-11-08T11:08:18.000+08:00
diff --git a/src/echarts.js b/src/echarts.js
@@ -125,7 +125,7 @@ function ECharts(dom, theme, opts) {
     var defaultRenderer = 'canvas';
     if (__DEV__) {
         defaultRenderer = (
-            typeof window === void 0 ? global : window
+            typeof window === 'undefined' ? global : window
         ).__ECHARTS__DEFAULT__RENDERER__ || defaultRenderer;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ function ECharts(dom, theme, opts) {`
`125`	`125`	`var defaultRenderer = 'canvas';`
`126`	`126`	`if (__DEV__) {`
`127`	`127`	`defaultRenderer = (`
`128`		`- typeof window === void 0 ? global : window`
	`128`	`+ typeof window === 'undefined' ? global : window`
`129`	`129`	`).__ECHARTS__DEFAULT__RENDERER__ \|\| defaultRenderer;`
`130`	`130`	`}`
`131`	`131`