0x2620/oxjs
2
0
Fork 1
Code Issues 172 Pull requests Releases Wiki Activity

shift click to join places, part 8

Browse source
This commit is contained in:
rolux 2011-06-14 17:03:26 +02:00
parent fc9fa56e9c
commit 1e166359b8
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/Ox.UI/js/Map/Ox.ListMap.js
View file

@ -516,7 +516,9 @@ Ox.ListMap = function(options, self) {
}) })
.css({float: 'left', margin: '4px 2px 4px 4px'}) .css({float: 'left', margin: '4px 2px 4px 4px'})
.bindEvent({ .bindEvent({
click: self.$map.newPlace click: function() {
self.$map.newPlace();
}
}) })
.appendTo(self.$placeStatusbar); .appendTo(self.$placeStatusbar);

12
source/Ox.UI/js/Map/Ox.MapMarker.js
View file

@ -54,9 +54,15 @@ Ox.MapMarker = function(options) {
function click() { function click() {
if (!that.place.selected) { if (!that.place.selected) {
if (that.map.getKey() == 'shift') { if (that.map.getKey() == 'shift') {
var bounds = that.map.getSelectedPlace().bounds.union(that.place.bounds), var place = that.map.getSelectedPlace(),
southWest = bounds.getSouthWest(), bounds = new google.maps.LatLngBounds(
northEast = bounds.getNorthEast(); new google.maps.LatLng(place.south, place.west),
new google.maps.LatLng(place.north, place.east)
),
southWest, northEast;
bounds = bounds.union(that.place.bounds);
southWest = bounds.getSouthWest();
northEast = bounds.getNorthEast();
that.map.newPlace(new Ox.MapPlace({ that.map.newPlace(new Ox.MapPlace({
// fixme: duplicated, see Ox.Map.js // fixme: duplicated, see Ox.Map.js
alternativeNames: [], alternativeNames: [],