Skip to content

Commit c06eb50

Browse files
nmccreadynmccready
committed
Merge pull request angular-ui#1742 from kandizzy/master
fix(examples): searchbox
2 parents cb5c8c2 + 039fb68 commit c06eb50

File tree

6 files changed

+82
-87
lines changed

6 files changed

+82
-87
lines changed

‎example/assets/scripts/controllers/search-box-autocomplete.js‎

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,16 @@ angular.module("search-box-example", ['uiGmapgoogle-maps'])
4646
});
4747

4848
angular.extend($scope, {
49-
selected: {
49+
window: {
50+
show: false,
5051
options: {
51-
visible:false
52-
52+
pixelOffset: { width: 0, height: -40 }
5353
},
5454
templateurl:'window.tpl.html',
55-
templateparameter: {}
55+
templateparameter: {},
56+
closeClick: function () {
57+
$scope.window.show = false;
58+
}
5659
},
5760
map: {
5861
control: {},
@@ -97,16 +100,24 @@ angular.module("search-box-example", ['uiGmapgoogle-maps'])
97100
var bounds = new google.maps.LatLngBounds();
98101

99102
var marker = {
100-
id:place.place_id,
103+
idKey:place.place_id,
101104
place_id: place.place_id,
102105
name: place.address_components[0].long_name,
103106
latitude: place.geometry.location.lat(),
104107
longitude: place.geometry.location.lng(),
105-
options: {
106-
visible:false
107-
},
108108
templateurl:'window.tpl.html',
109-
templateparameter: place
109+
templateparameter: place,
110+
events: {
111+
click: function (marker) {
112+
$scope.window.coords = {
113+
latitude: marker.model.latitude,
114+
longitude: marker.model.longitude
115+
}
116+
$scope.window.templateparameter = marker.model.templateparameter;
117+
$scope.window.show = true;
118+
119+
}
120+
}
110121
};
111122

112123
newMarkers.push(marker);
@@ -124,19 +135,6 @@ angular.module("search-box-example", ['uiGmapgoogle-maps'])
124135
}
125136
}
126137

127-
_.each(newMarkers, function(marker) {
128-
marker.closeClick = function() {
129-
$scope.selected.options.visible = false;
130-
marker.options.visble = false;
131-
return $scope.$apply();
132-
};
133-
marker.onClicked = function() {
134-
$scope.selected.options.visible = false;
135-
$scope.selected = marker;
136-
$scope.selected.options.visible = true;
137-
};
138-
});
139-
140138
$scope.map.markers = newMarkers;
141139
} else {
142140
console.log("do something else with the search string: " + place.name);

‎example/assets/scripts/controllers/search-box-ngmodel.js‎

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,16 @@ angular.module("search-box-example", ['uiGmapgoogle-maps'])
5656
});
5757

5858
angular.extend($scope, {
59-
selected: {
59+
window: {
60+
show: false,
6061
options: {
61-
visible:false
62-
62+
pixelOffset: { width: 0, height: -40 }
6363
},
6464
templateurl:'window.tpl.html',
65-
templateparameter: {}
65+
templateparameter: {},
66+
closeClick: function () {
67+
$scope.window.show = false;
68+
}
6669
},
6770
searchModel: {
6871
searchTerm : "Pizza"
@@ -114,16 +117,24 @@ angular.module("search-box-example", ['uiGmapgoogle-maps'])
114117
for (var i = 0, place; place = places[i]; i++) {
115118
// Create a marker for each place.
116119
var marker = {
117-
id:i,
120+
idKey:i,
118121
place_id: place.place_id,
119122
name: place.name,
120123
latitude: place.geometry.location.lat(),
121124
longitude: place.geometry.location.lng(),
122-
options: {
123-
visible:false
124-
},
125125
templateurl:'window.tpl.html',
126-
templateparameter: place
126+
templateparameter: place,
127+
events: {
128+
click: function (marker) {
129+
$scope.window.coords = {
130+
latitude: marker.model.latitude,
131+
longitude: marker.model.longitude
132+
}
133+
$scope.window.templateparameter = marker.model.templateparameter;
134+
$scope.window.show = true;
135+
136+
}
137+
}
127138
};
128139
newMarkers.push(marker);
129140

@@ -141,18 +152,6 @@ angular.module("search-box-example", ['uiGmapgoogle-maps'])
141152
}
142153
}
143154

144-
_.each(newMarkers, function(marker) {
145-
marker.closeClick = function() {
146-
$scope.selected.options.visible = false;
147-
marker.options.visble = false;
148-
return $scope.$apply();
149-
};
150-
marker.onClicked = function() {
151-
$scope.selected.options.visible = false;
152-
$scope.selected = marker;
153-
$scope.selected.options.visible = true;
154-
};
155-
});
156155

157156
$scope.map.markers = newMarkers;
158157
}

‎example/assets/scripts/controllers/search-box.js‎

Lines changed: 20 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,16 @@ angular.module("search-box-example", ['uiGmapgoogle-maps'])
5050
});
5151

5252
angular.extend($scope, {
53-
selected: {
53+
window: {
54+
show: false,
5455
options: {
55-
visible:false
56-
56+
pixelOffset: { width: 0, height: -40 }
5757
},
5858
templateurl:'window.tpl.html',
59-
templateparameter: {}
59+
templateparameter: {},
60+
closeClick: function () {
61+
$scope.window.show = false;
62+
}
6063
},
6164
map: {
6265
control: {},
@@ -106,19 +109,26 @@ angular.module("search-box-example", ['uiGmapgoogle-maps'])
106109
for (var i = 0, place; place = places[i]; i++) {
107110
// Create a marker for each place.
108111
var marker = {
109-
id:i,
112+
idKey:i,
110113
place_id: place.place_id,
111114
name: place.name,
112115
latitude: place.geometry.location.lat(),
113116
longitude: place.geometry.location.lng(),
114-
options: {
115-
visible:false
116-
},
117117
templateurl:'window.tpl.html',
118-
templateparameter: place
118+
templateparameter: place,
119+
events: {
120+
click: function (marker) {
121+
$scope.window.coords = {
122+
latitude: marker.model.latitude,
123+
longitude: marker.model.longitude
124+
}
125+
$scope.window.templateparameter = marker.model.templateparameter;
126+
$scope.window.show = true;
127+
128+
}
129+
}
119130
};
120131
newMarkers.push(marker);
121-
122132
bounds.extend(place.geometry.location);
123133
}
124134

@@ -133,19 +143,6 @@ angular.module("search-box-example", ['uiGmapgoogle-maps'])
133143
}
134144
}
135145

136-
_.each(newMarkers, function(marker) {
137-
marker.closeClick = function() {
138-
$scope.selected.options.visible = false;
139-
marker.options.visble = false;
140-
return $scope.$apply();
141-
};
142-
marker.onClicked = function() {
143-
$scope.selected.options.visible = false;
144-
$scope.selected = marker;
145-
$scope.selected.options.visible = true;
146-
};
147-
});
148-
149146
$scope.map.markers = newMarkers;
150147
}
151148
}

‎example/search-box-autocomplete.html‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@
3737

3838
<ui-gmap-markers idkey="map.idkey" models="map.markers" coords="'self'" icon="'icon'"
3939
click="'onClicked'"></ui-gmap-markers>
40-
<ui-gmap-window coords="selected" idkey="selected.place_id" templateurl="selected.templateurl"
41-
templateparameter="selected.templateparameter" options="selected.options"
42-
closeClick='selected.closeClick()' ng-cloak>
40+
<ui-gmap-window show="window.show" coords="window.coords" idkey="window.place_id" templateurl="window.templateurl"
41+
templateparameter="window.templateparameter" options="window.options"
42+
closeClick='window.closeClick()' ng-cloak>
4343

4444
</ui-gmap-window>
4545

@@ -48,10 +48,10 @@
4848
</div>
4949
</div>
5050
<script src="../website_libs/dev_deps.js"></script>
51-
<!--<script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.2.26/angular.js"></script>-->
52-
<script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.3.8/angular.js"></script>
53-
<script src="//cdnjs.cloudflare.com/ajax/libs/lodash.js/2.4.1/lodash.min.js" type="text/javascript"></script>
54-
<script src="http://cdn.rawgit.com/nmccready/angular-simple-logger/0.0.1/dist/index.js"></script><script src="../dist/angular-google-maps.js"></script>
51+
<script src="//cdnjs.cloudflare.com/ajax/libs/lodash.js/4.0.1/lodash.js" type="text/javascript"></script>
52+
<script src="//cdnjs.cloudflare.com/ajax/libs/angular.js/1.5.0/angular.js"></script>
53+
<script src="http://cdn.rawgit.com/nmccready/angular-simple-logger/0.0.1/dist/index.js"></script>
54+
<script src="../dist/angular-google-maps.js"></script>
5555
<script src="assets/scripts/controllers/search-box-autocomplete.js"></script>
5656
</body>
5757
</html>

‎example/search-box-ngmodel.html‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@
3535

3636
<ui-gmap-markers idkey="map.idkey" models="map.markers" coords="'self'" icon="'icon'"
3737
click="'onClicked'"></ui-gmap-markers>
38-
<ui-gmap-window coords="selected" idkey="selected.place_id" templateurl="selected.templateurl"
39-
templateparameter="selected.templateparameter" options="selected.options"
40-
closeClick='selected.closeClick()' ng-cloak>
38+
<ui-gmap-window show="window.show" coords="window.coords" idkey="window.place_id" templateurl="window.templateurl"
39+
templateparameter="window.templateparameter" options="window.options"
40+
closeClick='window.closeClick()' ng-cloak>
4141

4242
</ui-gmap-window>
4343

@@ -46,10 +46,11 @@
4646
</div>
4747
</div>
4848
<script src="../website_libs/dev_deps.js"></script>
49-
<!--<script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.2.26/angular.js"></script>-->
50-
<script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.3.8/angular.js"></script>
51-
<script src="//cdnjs.cloudflare.com/ajax/libs/lodash.js/2.4.1/lodash.min.js" type="text/javascript"></script>
52-
<script src="http://cdn.rawgit.com/nmccready/angular-simple-logger/0.0.1/dist/index.js"></script><script src="../dist/angular-google-maps.js"></script>
49+
50+
<script src="//cdnjs.cloudflare.com/ajax/libs/lodash.js/4.0.1/lodash.js" type="text/javascript"></script>
51+
<script src="//cdnjs.cloudflare.com/ajax/libs/angular.js/1.5.0/angular.js"></script>
52+
<script src="http://cdn.rawgit.com/nmccready/angular-simple-logger/0.0.1/dist/index.js"></script>
53+
<script src="../dist/angular-google-maps.js"></script>
5354
<script src="assets/scripts/controllers/search-box-ngmodel.js"></script>
5455
</body>
5556
</html>

‎example/search-box.html‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@
3535

3636
<ui-gmap-markers idkey="map.idkey" models="map.markers" coords="'self'" icon="'icon'"
3737
click="'onClicked'"></ui-gmap-markers>
38-
<ui-gmap-window coords="selected" idkey="selected.place_id" templateurl="selected.templateurl"
39-
templateparameter="selected.templateparameter" options="selected.options"
40-
closeClick='selected.closeClick()' ng-cloak>
38+
<ui-gmap-window show="window.show" coords="window.coords" idkey="window.place_id" templateurl="window.templateurl"
39+
templateparameter="window.templateparameter" options="window.options"
40+
closeClick='window.closeClick()' ng-cloak>
4141

4242
</ui-gmap-window>
4343

@@ -48,10 +48,10 @@
4848
</div>
4949
</div>
5050
<script src="../website_libs/dev_deps.js"></script>
51-
<!--<script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.2.26/angular.js"></script>-->
52-
<script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.3.8/angular.js"></script>
53-
<script src="//cdnjs.cloudflare.com/ajax/libs/lodash.js/2.4.1/lodash.min.js" type="text/javascript"></script>
54-
<script src="http://cdn.rawgit.com/nmccready/angular-simple-logger/0.0.1/dist/index.js"></script><script src="../dist/angular-google-maps_dev_mapped.js"></script>
51+
<script src="//cdnjs.cloudflare.com/ajax/libs/lodash.js/4.0.1/lodash.js" type="text/javascript"></script>
52+
<script src="//cdnjs.cloudflare.com/ajax/libs/angular.js/1.5.0/angular.js"></script>
53+
<script src="http://cdn.rawgit.com/nmccready/angular-simple-logger/0.0.1/dist/index.js"></script>
54+
<script src="../dist/angular-google-maps.js"></script>
5555
<script src="assets/scripts/controllers/search-box.js"></script>
5656
</body>
5757
</html>

0 commit comments

Comments
 (0)