Skip to content

Commit 9b8eb74

Browse files
committed
Merge pull request #5 from ember-admin/remove-coffee
Remove coffee
2 parents ad4a194 + c455f7f commit 9b8eb74

12 files changed

Lines changed: 170 additions & 196 deletions

File tree

addon/mixins/abstract-map.coffee

Lines changed: 0 additions & 56 deletions
This file was deleted.

addon/mixins/abstract-map.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// Generated by CoffeeScript 1.8.0
21
import Ember from 'ember';
32
var abstractMapMixin;
43

app/components/google-map.coffee

Lines changed: 0 additions & 63 deletions
This file was deleted.

app/components/google-map.js

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
import Ember from 'ember';
2+
import AbstractMapMixin from 'ember-cli-map/mixins/abstract-map';
3+
var gmapView;
4+
5+
gmapView = Ember.Component.extend(AbstractMapMixin, {
6+
mapType: 'asGoogleMap',
7+
initialize: (function() {
8+
var map, marker, options;
9+
options = {
10+
zoom: this.get('zoom'),
11+
center: this.get('center'),
12+
mapTypeId: this.get('mapTypeId')
13+
};
14+
map = new google.maps.Map(this.$().find(".map")[0], options);
15+
marker = this.initMarker(map);
16+
this.initAutocomplete(map, marker);
17+
return google.maps.event.addListener(map, 'zoom_changed', (function(_this) {
18+
return function() {
19+
return _this.setZoom(map.getZoom());
20+
};
21+
})(this));
22+
}).on('didInsertElement'),
23+
center: (function() {
24+
var coord;
25+
coord = this.centerCoords();
26+
return new google.maps.LatLng(coord[0], coord[1]);
27+
}).property(),
28+
mapTypeId: (function() {
29+
return google.maps.MapTypeId.ROADMAP;
30+
}).property(),
31+
initMarker: function(map) {
32+
var marker, options;
33+
options = {
34+
position: this.get('center'),
35+
map: map,
36+
draggable: true
37+
};
38+
marker = new google.maps.Marker(options);
39+
google.maps.event.addListener(marker, 'dragend', (function(_this) {
40+
return function(event) {
41+
var pos;
42+
map.setCenter(event.latLng);
43+
pos = marker.getPosition();
44+
return _this.setAttrs(pos.lat(), pos.lng());
45+
};
46+
})(this));
47+
return marker;
48+
},
49+
initAutocomplete: function(map, marker) {
50+
var autocomplete, autocompleteView, input;
51+
autocompleteView = this.get('MapAutocomplete');
52+
input = autocompleteView.$()[0];
53+
autocomplete = new google.maps.places.Autocomplete(input, {
54+
types: ['geocode']
55+
});
56+
return google.maps.event.addListener(autocomplete, 'place_changed', (function(_this) {
57+
return function() {
58+
var place, pos;
59+
place = autocomplete.getPlace();
60+
if (!place.geometry) {
61+
return;
62+
}
63+
pos = place.geometry.location;
64+
if (place.geometry.viewport) {
65+
map.fitBounds(place.geometry.viewport);
66+
} else {
67+
map.setCenter(pos);
68+
map.setZoom(17);
69+
}
70+
marker.setPosition(pos);
71+
return _this.setAttrs(pos.lat(), pos.lng());
72+
};
73+
})(this));
74+
}
75+
});
76+
77+
export default gmapView;

app/components/yandex-map.coffee

Lines changed: 0 additions & 51 deletions
This file was deleted.

app/components/yandex-map.js

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
import Ember from 'ember';
2+
import AbstractMapMixin from 'ember-cli-map/mixins/abstract-map';
3+
var yandexMapView;
4+
5+
yandexMapView = Ember.Component.extend(AbstractMapMixin, {
6+
mapType: 'asYandexMap',
7+
didInsertElement: function() {
8+
var self;
9+
self = this;
10+
return ymaps.ready((function(_this) {
11+
return function() {
12+
return _this.initMap.call(self);
13+
};
14+
})(this));
15+
},
16+
initMap: function() {
17+
var map;
18+
map = new ymaps.Map(this.get('childId'), {
19+
center: this.get('center'),
20+
zoom: this.get('zoom')
21+
});
22+
this.initMarker(map);
23+
map.controls.add('zoomControl', {
24+
left: 5,
25+
top: 5
26+
}).add('typeSelector').add('mapTools', {
27+
left: 35,
28+
top: 5
29+
});
30+
return this.initAutocomplete();
31+
},
32+
center: (function() {
33+
return this.centerCoords();
34+
}).property(),
35+
initMarker: function(map) {
36+
var mark;
37+
mark = new ymaps.Placemark(this.get('center'), {
38+
iconContent: '1',
39+
balloonContent: '',
40+
hintContent: ''
41+
}, {
42+
preset: 'twirl#violetIcon',
43+
draggable: true
44+
});
45+
map.geoObjects.add(mark);
46+
return mark.events.add("dragend", (function(_this) {
47+
return function(e) {
48+
return _this.setAttrs(mark.geometry.getCoordinates());
49+
};
50+
})(this));
51+
},
52+
initAutocomplete: function(map, marker) {
53+
var autocompleteView, input;
54+
autocompleteView = this.get('MapAutocomplete');
55+
return input = autocompleteView.$().hide();
56+
}
57+
});
58+
59+
export default yandexMapView;

app/views/map-autocomplete.coffee

Lines changed: 0 additions & 9 deletions
This file was deleted.

app/views/map-autocomplete.js

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
import Ember from 'ember';
2+
var mapAutocompleteView;
3+
4+
mapAutocompleteView = Ember.TextField.extend({
5+
keyPress: function(event) {
6+
if (event.keyCode === 13) {
7+
return event.preventDefault();
8+
}
9+
}
10+
});
11+
12+
export default mapAutocompleteView;

bower.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"name": "ember-cli-map",
33
"dependencies": {
4-
"handlebars": "1.3.0",
4+
"handlebars": "2.0.0",
55
"jquery": "1.11.1",
6-
"ember": "1.7.0",
7-
"ember-data": "1.0.0-beta.10",
6+
"ember": "1.9.1",
7+
"ember-data": "1.0.0-beta.14",
88
"ember-resolver": "0.1.7",
99
"loader.js": "stefanpenner/loader.js#1.0.1",
1010
"ember-cli-shims": "stefanpenner/ember-cli-shims#0.0.3",

package.json

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,16 @@
2020
"devDependencies": {
2121
"body-parser": "1.2.0",
2222
"broccoli-asset-rev": "0.3.0",
23-
"broccoli-ember-hbs-template-compiler": "1.6.1",
24-
"ember-cli": "git://github.com/OpakAlex/ember-cli.git",
23+
"ember-cli": "0.1.7",
24+
"ember-cli-6to5": "^0.2.1",
25+
"ember-cli-htmlbars": "^0.6.0",
2526
"ember-cli-content-security-policy": "0.2.0",
2627
"ember-cli-ic-ajax": "0.1.1",
2728
"ember-cli-inject-live-reload": "1.2.2",
2829
"ember-cli-qunit": "0.1.0",
2930
"ember-data": "1.0.0-beta.10",
3031
"express": "4.8.5",
3132
"glob": "4.0.5",
32-
"broccoli-sass": "0.2.2",
33-
"broccoli-coffee": "0.1.1",
34-
"ember-cli-coffeescript": "0.1.0",
3533
"broccoli-merge-trees": "0.1.4"
3634
},
3735
"keywords": [

0 commit comments

Comments
 (0)