Skip to content

Commit b2f4981

Browse files
nmccreadynmccready
committed
doc updates and hljs fixes
1 parent 356e0c1 commit b2f4981

File tree

9 files changed

+105
-20
lines changed

9 files changed

+105
-20
lines changed

‎app/changelog.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎app/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<link rel="stylesheet" href="styles/vendor.css">
2626
<!-- endbuild -->
2727

28-
<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootswatch/3.2.0/yeti/bootstrap.min.css">
28+
<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootswatch/3.3.5/yeti/bootstrap.min.css">
2929

3030
<!-- build:css styles/main.css -->
3131
<link rel="stylesheet" href="styles/main.css">

‎app/styles/main.css

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -280,3 +280,23 @@ ul.separated li:not(:first-child) {
280280
.label{
281281
display: inline-block;
282282
}
283+
284+
.badge.badge-info{
285+
background-color: #5bc0de;
286+
border-color: #46b8da;
287+
}
288+
289+
.badge.badge-warning{
290+
background-color: #e99002;
291+
border-color: #d08002;
292+
}
293+
294+
.badge.badge-success{
295+
background-color: #43ac6a;
296+
border-color: #3c9a5f;
297+
}
298+
299+
.badge.badge-danger{
300+
background-color: #f04124;
301+
border-color: #ea2f10;
302+
}

‎app/views/directive/markers.html

Lines changed: 72 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -83,29 +83,87 @@ <h4>Model Id/Key</h4>
8383
</td>
8484
</tr>
8585
<tr>
86-
<td>doCluster</td>
86+
<td>type <br/><span class="badge badge-info">New 2.1.6</span></td>
87+
<td><span class="label label-info">expression</span></td>
88+
<td> String evaluated expression which should evaluate to:
89+
<ul>
90+
<li>null/undefined (regular marker)</li>
91+
<li>spider (spiderfy)</li>
92+
<li>cluster (clusterer)</li>
93+
</ul>
94+
</td>
95+
</tr>
96+
<tr>
97+
<td>typeOptions <br/><span class="badge badge-info">New 2.1.6</span></td>
98+
<td><span class="label label-info">expression</span></td>
99+
<td>Object containing options to pass to the marker relative to clusterer or spiderfy.
100+
<a href="http://google-maps-utility-library-v3.googlecode.com/svn/tags/markerclustererplus/2.0.16/docs/reference.html">
101+
clusterer
102+
</a>
103+
<a href="https://github.com/nmccready/OverlappingMarkerSpiderfier">
104+
spiderfy
105+
</a>
106+
</td>
107+
</tr>
108+
<tr>
109+
<td>typeEvents <br/><span class="badge badge-info">New 2.1.6</span></td>
110+
<td><span class="label label-info">expression</span></td>
111+
<td>Object containing event options to pass to the marker relative to clusterer or spiderfy.
112+
<a href="http://google-maps-utility-library-v3.googlecode.com/svn/tags/markerclustererplus/2.0.16/docs/reference.html">
113+
clusterer
114+
</a>
115+
<a href="https://github.com/nmccready/OverlappingMarkerSpiderfier">
116+
spiderfy
117+
</a>
118+
events handle.
119+
<br/>
120+
<p>
121+
This companion object is expected to be an object of the following optional functions: click,
122+
mouseover,
123+
or mouseout.
124+
</p>
125+
<pre>
126+
# example
127+
# for more see example (grunt examples)
128+
# issue-393-cluster-events-mapped.html
129+
$scope.clickEventsObject =
130+
click: (cluster, clusterModels) ->
131+
mouseout: (cluster, clusterModels) ->
132+
mouseover: (cluster, clusterModels) ->
133+
</pre>
134+
135+
<p>
136+
The function handle signature is (cluster:Array[GMarkers], clusterModels:Array[YourModel]). This
137+
handler
138+
returns a directly mapped array of your models which belong to gMarker cluster sent along.
139+
</p>
140+
</td>
141+
</tr>
142+
<tr>
143+
<td>doCluster <span class="badge badge-warning">deprecated</span> <p>see type attribute</p></td>
87144
<td><span class="label label-info">expression</span></td>
88145
<td>boolean property to tell the directive to use clustering. This attribute is not really bindable at the
89146
moment. Therefore it just needs to evaluate to javascript true. "true" or even "".
90147
</td>
91148
</tr>
92149
<tr>
93-
<td>clusterOptions</td>
150+
<td>clusterOptions <span class="badge badge-warning">deprecated</span> <p>see typeOptions attribute</p></td>
94151
<td><span class="label label-info">expression</span></td>
95-
<td>object containing options to pass to the marker
152+
<td>Object containing options to pass to the marker.
96153
<a href="http://google-maps-utility-library-v3.googlecode.com/svn/tags/markerclustererplus/2.0.16/docs/reference.html">
97154
clusterer
98155
</a>
99156
</td>
100157
</tr>
101158
<tr>
102-
<td>clusterEvents</td>
159+
<td>clusterEvents <span class="badge badge-warning">deprecated</span> <p>see typeEvents attribute</p></td>
103160
<td><span class="label label-info">expression</span></td>
104-
<td>object containing event options to pass to the marker
161+
<td>Object containing event options to pass to the marker.
105162
<a href="http://google-maps-utility-library-v3.googlecode.com/svn/tags/markerclustererplus/2.0.16/docs/reference.html">
106163
clusterer
107164
</a>
108165
events handle.
166+
<br/>
109167
<p>
110168
This companion object is expected to be an object of the following optional functions: click,
111169
mouseover,
@@ -155,9 +213,11 @@ <h4>Model Id/Key</h4>
155213
<tr>
156214
<td>modelsbyref</td>
157215
<td><span class="label label-info">expression</span></td>
158-
<td>expression binding : To evaluate to truthy. This also means markers by default deep watches since
159-
modelsbyref is undefined. If set to true, 'true', 'T', and many more then shallow watching is turned on.
160-
Search the code base for uiGmapGmapUtil.isTrue
216+
<td>expression binding :
217+
<p>To evaluate to truthy.</p>
218+
<p>
219+
By default deep watches since modelsbyref is undefined. If set to true, 'true', 'T', and many more then shallow watching is turned on. Search the code base for uiGmapGmapUtil.isTrue
220+
</p>
161221
</td>
162222
</tr>
163223
<tr ng-include="'./views/directive/partials/options.html'"
@@ -196,6 +256,10 @@ <h4>Example</h4>
196256

197257
doCluster="{string or object}"
198258
clusterOptions='{expression}'
259+
clusterEvents='{expression}'
260+
type="{expression or string} (spider or cluster or null(default))"
261+
typeOptions='{expression}'
262+
typeEvents='{expression}'
199263
fit="{string or object}"
200264

201265
coords="'{string}'"

‎app/views/directive/search-box.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
.config(function(uiGmapGoogleMapApiProvider) {
66
uiGmapGoogleMapApiProvider.configure({
77
// key: 'your api key',
8-
v: '3.17',
8+
v: '3.20', //defaults to latest 3.X anyhow
99
libraries: 'places' // Required for SearchBox.
1010
});
1111
})
1212
</div>
1313
or HTML <br>
14-
<div hljs language="html" source="'<script src=\'http://maps.googleapis.com/maps/api/js?libraries=places&sensor=false&language=en&v=3.%3Cspan%20class="x x-first x-last">17\'></script>'">
14+
<div hljs language="html" source="'<script src=\'http://maps.googleapis.com/maps/api/js?libraries=places&sensor=false&language=en&v=3.%3Cspan%20class="x x-first x-last">20\'></script>'">
1515
</div>
1616

1717
<h4>Usage</h4>
@@ -52,8 +52,8 @@ <h4>Parameters</h4>
5252
<td>The id of another div on the page to which the the Search Box field should be appended. If this property is set the Search Box will not be added as a control on the map and the position parameter is not required.</td>
5353
</tr>
5454
<tr ng-include="'./views/directive/partials/options.html'" ng-init="thing='SearchBox';directive='search-box';hasAutocompleteOptions=true">
55-
56-
55+
56+
5757
</tbody>
5858
</table>
5959

‎app/views/examples/search-box/script.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ angular.module('appMaps', ['uiGmapgoogle-maps'])
22
.config(function(uiGmapGoogleMapApiProvider) {
33
uiGmapGoogleMapApiProvider.configure({
44
// key: 'your api key',
5-
v: '3.17',
5+
v: '3.20', //defaults to latest 3.X anyhow
66
libraries: 'places' // Required for SearchBox.
77
});
88
})
@@ -14,4 +14,3 @@ angular.module('appMaps', ['uiGmapgoogle-maps'])
1414
}
1515
$scope.searchbox = { template:'searchbox.tpl.html', events:events};
1616
});
17-

‎app/views/provider/GoogleMapApi.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ <h3> Configure</h3>
2222
.config(function(uiGmapGoogleMapApiProvider) {
2323
uiGmapGoogleMapApiProvider.configure({
2424
// key: 'your api key',
25-
v: '3.17',
25+
v: '3.20', //defaults to latest 3.X anyhow
2626
libraries: 'weather,geometry,visualization'
2727
});
2828
})

‎bower.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,22 @@
88
"angular-cookies": ">=1.3.*",
99
"angular-sanitize": ">=1.3.*",
1010
"angular-google-maps": "~2.1.0",
11-
"angular-highlightjs": ">=0.2.5",
11+
"angular-highlightjs": ">=0.4.3",
1212
"angular-semver-sort": ">=0.2.0",
1313
"angular-ui-router": "~0.2.10",
1414
"json3": "~3.2.4",
1515
"jquery": "~2.1.x",
1616
"es5-shim": "~2.0.8",
1717
"share-button": "~0.0.3",
1818
"bootstrap": "~3.2.0",
19-
"lodash": ">=2.4.1"
19+
"lodash": ">=2.4.1",
20+
"highlightjs": "~8.7.0"
2021
},
2122
"devDependencies": {
2223
"angular-mocks": ">=1.3.*",
2324
"angular-scenario": ">=1.3.*"
2425
},
2526
"resolutions": {
26-
"angular": "1.4.3"
27+
"angular": "1.4.4"
2728
}
2829
}

‎grunt/concat.coffee

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ vendor_js =
44
src: [
55
'<%= yeoman.dist %>/vendor/scripts/jquery.js'
66
'<%= yeoman.dist %>/vendor/scripts/lodash*'
7+
'<%= yeoman.dist %>/vendor/scripts/highlight*'
78
'<%= yeoman.dist %>/vendor/scripts/angular.js'
89
'<%= yeoman.dist %>/vendor/scripts/*.js'
910
]

0 commit comments

Comments
 (0)