fix include & fix 示例 review by songym

liqian7 · liqian7 · commit 37ed3f64c514 · 2018-07-04T21:39:13.000+08:00
diff --git a/dist/classic/include-classic.js b/dist/classic/include-classic.js
@@ -70,12 +70,10 @@
             inputCSS("http://iclient.supermap.io/libs/iclient8c/examples/css/heatmap.css");
         }
         if (!inArray(excludes, 'iclient-classic')) {
-            if (!inArray(excludes, 'iclient-classic')) {
-                if (supportES6()) {
-                    inputScript("../../dist/classic/iclient-classic-es6.min.js");
-                } else {
-                    inputScript("../../dist/classic/iclient-classic.min.js");
-                }
+            if (supportES6()) {
+                inputScript("../../dist/classic/iclient-classic-es6.min.js");
+            } else {
+                inputScript("../../dist/classic/iclient-classic.min.js");
             }
         }
         if (inArray(includes, 'tianditu')) {
diff --git a/dist/mapboxgl/include-mapboxgl.js b/dist/mapboxgl/include-mapboxgl.js
@@ -75,12 +75,10 @@
             inputScript("http://iclient.supermap.io/web/libs/deck.gl/5.1.3/deck.gl.js");
         }
         if (!inArray(excludes, 'iclient9-mapboxgl')) {
-            if (!inArray(excludes, 'iclient9-mapboxgl')) {
-                if (supportES6()) {
-                    inputScript("../../dist/mapboxgl/iclient9-mapboxgl-es6.min.js");
-                } else {
-                    inputScript("../../dist/mapboxgl/iclient9-mapboxgl.min.js");
-                }
+            if (supportES6()) {
+                inputScript("../../dist/mapboxgl/iclient9-mapboxgl-es6.min.js");
+            } else {
+                inputScript("../../dist/mapboxgl/iclient9-mapboxgl.min.js");
             }
         }
         if (inArray(includes, 'LoaderSupport')) {
diff --git a/dist/openlayers/include-openlayers.js b/dist/openlayers/include-openlayers.js
@@ -67,12 +67,10 @@
             inputScript("http://iclient.supermap.io/web/libs/deck.gl/5.1.3/deck.gl.js");
         }
         if (!inArray(excludes, 'iclient9-openlayers')) {
-            if (!inArray(excludes, 'iclient9-openlayers')) {
-                if (supportES6()) {
-                    inputScript("../../dist/openlayers/iclient9-openlayers-es6.min.js");
-                } else {
-                    inputScript("../../dist/openlayers/iclient9-openlayers.min.js");
-                }
+            if (supportES6()) {
+                inputScript("../../dist/openlayers/iclient9-openlayers-es6.min.js");
+            } else {
+                inputScript("../../dist/openlayers/iclient9-openlayers.min.js");
             }
         }
         if (!inArray(excludes, 'iclient9-openlayers-css')) {
diff --git a/examples/openlayers/echartsLinesEffect.html b/examples/openlayers/echartsLinesEffect.html
@@ -2,7 +2,7 @@
 <html>
 <head>
     <meta charset="UTF-8">
-    <title>ECharts Lines Effect with Leaflet</title>
+    <title>ECharts Lines Effect</title>
     <script type="text/javascript" include="jquery" src="../js/include-web.js"></script>
     <script type="text/javascript" include="echarts,ol3-echarts" src="../../dist/openlayers/include-openlayers.js"></script>
 </head>

Original file line number	Diff line number	Diff line change
`@@ -70,12 +70,10 @@`
`70`	`70`	`inputCSS("http://iclient.supermap.io/libs/iclient8c/examples/css/heatmap.css");`
`71`	`71`	`}`
`72`	`72`	`if (!inArray(excludes, 'iclient-classic')) {`
`73`		`- if (!inArray(excludes, 'iclient-classic')) {`
`74`		`- if (supportES6()) {`
`75`		`- inputScript("../../dist/classic/iclient-classic-es6.min.js");`
`76`		`- } else {`
`77`		`- inputScript("../../dist/classic/iclient-classic.min.js");`
`78`		`- }`
	`73`	`+ if (supportES6()) {`
	`74`	`+ inputScript("../../dist/classic/iclient-classic-es6.min.js");`
	`75`	`+ } else {`
	`76`	`+ inputScript("../../dist/classic/iclient-classic.min.js");`
`79`	`77`	`}`
`80`	`78`	`}`
`81`	`79`	`if (inArray(includes, 'tianditu')) {`
Original file line number	Diff line number	Diff line change
`@@ -75,12 +75,10 @@`
`75`	`75`	`inputScript("http://iclient.supermap.io/web/libs/deck.gl/5.1.3/deck.gl.js");`
`76`	`76`	`}`
`77`	`77`	`if (!inArray(excludes, 'iclient9-mapboxgl')) {`
`78`		`- if (!inArray(excludes, 'iclient9-mapboxgl')) {`
`79`		`- if (supportES6()) {`
`80`		`- inputScript("../../dist/mapboxgl/iclient9-mapboxgl-es6.min.js");`
`81`		`- } else {`
`82`		`- inputScript("../../dist/mapboxgl/iclient9-mapboxgl.min.js");`
`83`		`- }`
	`78`	`+ if (supportES6()) {`
	`79`	`+ inputScript("../../dist/mapboxgl/iclient9-mapboxgl-es6.min.js");`
	`80`	`+ } else {`
	`81`	`+ inputScript("../../dist/mapboxgl/iclient9-mapboxgl.min.js");`
`84`	`82`	`}`
`85`	`83`	`}`
`86`	`84`	`if (inArray(includes, 'LoaderSupport')) {`
Original file line number	Diff line number	Diff line change
`@@ -67,12 +67,10 @@`
`67`	`67`	`inputScript("http://iclient.supermap.io/web/libs/deck.gl/5.1.3/deck.gl.js");`
`68`	`68`	`}`
`69`	`69`	`if (!inArray(excludes, 'iclient9-openlayers')) {`
`70`		`- if (!inArray(excludes, 'iclient9-openlayers')) {`
`71`		`- if (supportES6()) {`
`72`		`- inputScript("../../dist/openlayers/iclient9-openlayers-es6.min.js");`
`73`		`- } else {`
`74`		`- inputScript("../../dist/openlayers/iclient9-openlayers.min.js");`
`75`		`- }`
	`70`	`+ if (supportES6()) {`
	`71`	`+ inputScript("../../dist/openlayers/iclient9-openlayers-es6.min.js");`
	`72`	`+ } else {`
	`73`	`+ inputScript("../../dist/openlayers/iclient9-openlayers.min.js");`
`76`	`74`	`}`
`77`	`75`	`}`
`78`	`76`	`if (!inArray(excludes, 'iclient9-openlayers-css')) {`