Skip to content

Commit 29fc55c

Browse files
leftstickleftstick
committed
move ak into configuration phase
1 parent 226708e commit 29fc55c

15 files changed

Lines changed: 241 additions & 190 deletions

File tree

‎demo/js/features/apidoc/components/subs/apiContent/subs/docBaiduMap.co‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ export default {
77
<h2 class="title">Usage</h2>
88
<div class="snippet" highlight>
99
<pre><code class="html">&lt;baidu-map
10-
ak="{string}"
1110
map-options="{expression}"
1211
offline-txt="{expression}"
1312
loaded="{expression}"
@@ -54,9 +53,9 @@ export default {
5453
</tbody>
5554
</table>
5655
<h2 class="title">Example</h2>
57-
<baidu-map ak="gd0GyxGUxSCoAbmdyQBhyhrZ" map-options="$ctrl.opts" click="$ctrl.onClick(e)"></baidu-map>
56+
<baidu-map map-options="$ctrl.opts" click="$ctrl.onClick(e)"></baidu-map>
5857
<div class="snippet" highlight>
59-
<pre><code class="html">&lt;baidu-map ak="your ak" map-options="opts" click="getCoord(e)"&gt;&lt;/baidu-map&gt;</code></pre>
58+
<pre><code class="html">&lt;baidu-map map-options="opts" click="getCoord(e)"&gt;&lt;/baidu-map&gt;</code></pre>
6059
</div>
6160
<br/>
6261
<div class="snippet" highlight>

‎demo/js/features/apidoc/components/subs/apiContent/subs/docControl.co‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ export default {
1010
</p>
1111
<h2 class="title">Usage</h2>
1212
<div class="snippet" highlight>
13-
<pre><code class="html">&lt;baidu-map ak="{string}" map-options="{expression}"&gt;
13+
<pre><code class="html">&lt;baidu-map map-options="{expression}"&gt;
1414
&lt;control type="{string}" options="{expression}""&gt;&lt;control&gt;
1515
&lt;/baidu-map&gt;</code></pre>
1616
</div>
@@ -40,13 +40,13 @@ export default {
4040
</tbody>
4141
</table>
4242
<h2 class="title">Example</h2>
43-
<baidu-map ak="gd0GyxGUxSCoAbmdyQBhyhrZ" map-options="$ctrl.opts" loaded="$ctrl.mapLoaded(map)">
43+
<baidu-map map-options="$ctrl.opts" loaded="$ctrl.mapLoaded(map)">
4444
<control type="navigation" options="$ctrl.navOpts"></control>
4545
<control type="overviewmap" options="$ctrl.overOpts"></control>
4646
<control ng-if="$ctrl.copyOpts" type="copyright" options="$ctrl.copyOpts"></control>
4747
</baidu-map>
4848
<div class="snippet" highlight>
49-
<pre><code class="html">&lt;baidu-map ak="your ak" map-options="opts" loaded="mapLoaded(map)"&gt;
49+
<pre><code class="html">&lt;baidu-map map-options="opts" loaded="mapLoaded(map)"&gt;
5050
&lt;control type="navigation" options="navOpts"&gt;&lt;/control&gt;
5151
&lt;control type="overviewmap" options="overOpts"&gt;&lt;/control&gt;
5252
&lt;control ng-if="copyOpts" type="copyright" options="copyOpts"&gt;&lt;/control&gt;

‎demo/js/features/apidoc/components/subs/apiContent/subs/docMarker.co‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export default {
1212
</p>
1313
<h2 class="title">Usage</h2>
1414
<div class="snippet" highlight>
15-
<pre><code class="html">&lt;baidu-map ak="{string}" map-options="{expression}"&gt;
15+
<pre><code class="html">&lt;baidu-map map-options="{expression}"&gt;
1616
&lt;marker point="{expression}" options="{expression}" click="{expression}"&gt;&lt;marker&gt;
1717
&lt;/baidu-map&gt;</code></pre>
1818
</div>
@@ -47,11 +47,11 @@ export default {
4747
</tbody>
4848
</table>
4949
<h2 class="title">Example</h2>
50-
<baidu-map ak="gd0GyxGUxSCoAbmdyQBhyhrZ" map-options="$ctrl.opts">
50+
<baidu-map map-options="$ctrl.opts">
5151
<marker point="$ctrl.point" options="$ctrl.markerOpts" click="$ctrl.showWindow(e, marker, map)"></marker>
5252
</baidu-map>
5353
<div class="snippet" highlight>
54-
<pre><code class="html">&lt;baidu-map ak="your ak" map-options="opts"&gt;
54+
<pre><code class="html">&lt;baidu-map map-options="opts"&gt;
5555
&lt;marker point="point" options="markerOpts" click="showWindow(e, marker, map)"&gt;&lt;/marker&gt;
5656
&lt;/baidu-map&gt;</code></pre>
5757
</div>

‎demo/js/features/home/components/home.co‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export default {
1111
template: `
1212
<h1 class="page-title">angular-baidu-map</h1>
1313

14-
<baidu-map ak="gd0GyxGUxSCoAbmdyQBhyhrZ" map-options="$ctrl.opts">
14+
<baidu-map map-options="$ctrl.opts">
1515
<marker point="$ctrl.markerPoint1" click="$ctrl.onMarker1Clicked(e, marker)"></marker>
1616
<control type="navigation"></control>
1717
<control type="overviewmap"></control>
@@ -27,7 +27,7 @@ export default {
2727
`,
2828
controller: class {
2929
/* @ngInject */
30-
constructor($timeout) {
30+
constructor($timeout, mapScriptService) {
3131
this.opts = {
3232
currentCity: '上海市',
3333
centerAndZoom: {
@@ -36,6 +36,7 @@ export default {
3636
}
3737
};
3838
this.markerPoint1 = ORIENTAL_PEARL;
39+
mapScriptService.load();
3940
}
4041

4142
onLoadMap(map) {

‎demo/js/features/quickstart/components/subs/usage/index.co‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,21 @@ export default {
1010
</div>
1111
</div>
1212
</li>
13+
<li>
14+
<div>
15+
<div class="type-name">Config <code>angular-baidu-map</code> with <code>ak</code>:</div>
16+
<div class="snippet">
17+
<pre><code class="javascript">app.config(['mapScriptServiceProvider', function(provider) {
18+
provider.setKey('your ak');
19+
}]);</code></pre>
20+
</div>
21+
</div>
22+
</li>
1323
<li>
1424
<div>
1525
<div class="type-name">Add <code>&lt;baidu-map&gt;</code> element in template:</div>
1626
<div class="snippet">
17-
<pre><code class="html">&lt;baidu-map ak="{your ak}" map-options="opts"&gt;&lt;/baidu-map&gt;</code></pre>
27+
<pre><code class="html">&lt;baidu-map map-options="opts"&gt;&lt;/baidu-map&gt;</code></pre>
1828
</div>
1929
</div>
2030
</li>

‎demo/js/fw/config/main.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import map from './mapScriptConfig';
12
import router from './routerConfig';
23

3-
export default [router];
4+
export default [map, router];

‎demo/js/fw/config/mapScriptConfig.js‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
2+
export default {
3+
type: 'configure',
4+
config(mapScriptServiceProvider) {
5+
'ngInject';
6+
7+
mapScriptServiceProvider.setKey('gd0GyxGUxSCoAbmdyQBhyhrZ');
8+
}
9+
};

‎demo/js/fw/ext/main.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import 'angular-route';
22
import 'highlight.js';
33
import 'highlight.js/styles/darcula.css';
4-
import {ngBaiduMap} from '../../../../dist/angular-baidu-map';
4+
import {ngBaiduMap} from '../../../../src';
55

66
export default ['ngRoute', ngBaiduMap];

0 commit comments

Comments
 (0)