Skip to content

Commit

Permalink
Merge pull request #5 from ember-admin/remove-coffee
Browse files Browse the repository at this point in the history
Remove coffee
  • Loading branch information
OpakAlex committed Jan 19, 2015
2 parents ad4a194 + c455f7f commit 9b8eb74
Show file tree
Hide file tree
Showing 12 changed files with 170 additions and 196 deletions.
56 changes: 0 additions & 56 deletions addon/mixins/abstract-map.coffee

This file was deleted.

1 change: 0 additions & 1 deletion addon/mixins/abstract-map.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// Generated by CoffeeScript 1.8.0
import Ember from 'ember';
var abstractMapMixin;

Expand Down
63 changes: 0 additions & 63 deletions app/components/google-map.coffee

This file was deleted.

77 changes: 77 additions & 0 deletions app/components/google-map.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
import Ember from 'ember';
import AbstractMapMixin from 'ember-cli-map/mixins/abstract-map';
var gmapView;

gmapView = Ember.Component.extend(AbstractMapMixin, {
mapType: 'asGoogleMap',
initialize: (function() {
var map, marker, options;
options = {
zoom: this.get('zoom'),
center: this.get('center'),
mapTypeId: this.get('mapTypeId')
};
map = new google.maps.Map(this.$().find(".map")[0], options);
marker = this.initMarker(map);
this.initAutocomplete(map, marker);
return google.maps.event.addListener(map, 'zoom_changed', (function(_this) {
return function() {
return _this.setZoom(map.getZoom());
};
})(this));
}).on('didInsertElement'),
center: (function() {
var coord;
coord = this.centerCoords();
return new google.maps.LatLng(coord[0], coord[1]);
}).property(),
mapTypeId: (function() {
return google.maps.MapTypeId.ROADMAP;
}).property(),
initMarker: function(map) {
var marker, options;
options = {
position: this.get('center'),
map: map,
draggable: true
};
marker = new google.maps.Marker(options);
google.maps.event.addListener(marker, 'dragend', (function(_this) {
return function(event) {
var pos;
map.setCenter(event.latLng);
pos = marker.getPosition();
return _this.setAttrs(pos.lat(), pos.lng());
};
})(this));
return marker;
},
initAutocomplete: function(map, marker) {
var autocomplete, autocompleteView, input;
autocompleteView = this.get('MapAutocomplete');
input = autocompleteView.$()[0];
autocomplete = new google.maps.places.Autocomplete(input, {
types: ['geocode']
});
return google.maps.event.addListener(autocomplete, 'place_changed', (function(_this) {
return function() {
var place, pos;
place = autocomplete.getPlace();
if (!place.geometry) {
return;
}
pos = place.geometry.location;
if (place.geometry.viewport) {
map.fitBounds(place.geometry.viewport);
} else {
map.setCenter(pos);
map.setZoom(17);
}
marker.setPosition(pos);
return _this.setAttrs(pos.lat(), pos.lng());
};
})(this));
}
});

export default gmapView;
51 changes: 0 additions & 51 deletions app/components/yandex-map.coffee

This file was deleted.

59 changes: 59 additions & 0 deletions app/components/yandex-map.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
import Ember from 'ember';
import AbstractMapMixin from 'ember-cli-map/mixins/abstract-map';
var yandexMapView;

yandexMapView = Ember.Component.extend(AbstractMapMixin, {
mapType: 'asYandexMap',
didInsertElement: function() {
var self;
self = this;
return ymaps.ready((function(_this) {
return function() {
return _this.initMap.call(self);
};
})(this));
},
initMap: function() {
var map;
map = new ymaps.Map(this.get('childId'), {
center: this.get('center'),
zoom: this.get('zoom')
});
this.initMarker(map);
map.controls.add('zoomControl', {
left: 5,
top: 5
}).add('typeSelector').add('mapTools', {
left: 35,
top: 5
});
return this.initAutocomplete();
},
center: (function() {
return this.centerCoords();
}).property(),
initMarker: function(map) {
var mark;
mark = new ymaps.Placemark(this.get('center'), {
iconContent: '1',
balloonContent: '',
hintContent: ''
}, {
preset: 'twirl#violetIcon',
draggable: true
});
map.geoObjects.add(mark);
return mark.events.add("dragend", (function(_this) {
return function(e) {
return _this.setAttrs(mark.geometry.getCoordinates());
};
})(this));
},
initAutocomplete: function(map, marker) {
var autocompleteView, input;
autocompleteView = this.get('MapAutocomplete');
return input = autocompleteView.$().hide();
}
});

export default yandexMapView;
9 changes: 0 additions & 9 deletions app/views/map-autocomplete.coffee

This file was deleted.

12 changes: 12 additions & 0 deletions app/views/map-autocomplete.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import Ember from 'ember';
var mapAutocompleteView;

mapAutocompleteView = Ember.TextField.extend({
keyPress: function(event) {
if (event.keyCode === 13) {
return event.preventDefault();
}
}
});

export default mapAutocompleteView;
6 changes: 3 additions & 3 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"name": "ember-cli-map",
"dependencies": {
"handlebars": "1.3.0",
"handlebars": "2.0.0",
"jquery": "1.11.1",
"ember": "1.7.0",
"ember-data": "1.0.0-beta.10",
"ember": "1.9.1",
"ember-data": "1.0.0-beta.14",
"ember-resolver": "0.1.7",
"loader.js": "stefanpenner/loader.js#1.0.1",
"ember-cli-shims": "stefanpenner/ember-cli-shims#0.0.3",
Expand Down
8 changes: 3 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,16 @@
"devDependencies": {
"body-parser": "1.2.0",
"broccoli-asset-rev": "0.3.0",
"broccoli-ember-hbs-template-compiler": "1.6.1",
"ember-cli": "git://github.com/OpakAlex/ember-cli.git",
"ember-cli": "0.1.7",
"ember-cli-6to5": "^0.2.1",
"ember-cli-htmlbars": "^0.6.0",
"ember-cli-content-security-policy": "0.2.0",
"ember-cli-ic-ajax": "0.1.1",
"ember-cli-inject-live-reload": "1.2.2",
"ember-cli-qunit": "0.1.0",
"ember-data": "1.0.0-beta.10",
"express": "4.8.5",
"glob": "4.0.5",
"broccoli-sass": "0.2.2",
"broccoli-coffee": "0.1.1",
"ember-cli-coffeescript": "0.1.0",
"broccoli-merge-trees": "0.1.4"
},
"keywords": [
Expand Down
8 changes: 0 additions & 8 deletions tests/dummy/app/routes/application.coffee

This file was deleted.

Loading

0 comments on commit 9b8eb74

Please sign in to comment.