Skip to content

Commit

Permalink
Merge pull request #17 from SamvelRaja/patch_add_dummy_app
Browse files Browse the repository at this point in the history
Added the dummy app to make it easy for development

And a version bump to 0.0.9
  • Loading branch information
SamvelRaja committed Sep 26, 2015
2 parents 15f14d5 + 1f94f79 commit 8c6ad9e
Show file tree
Hide file tree
Showing 7 changed files with 95 additions and 7 deletions.
6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ mapOptions : {
latitude : 'Your infowindow latitude if empty will takes up the center latitude',
longitude : 'Your infowindow longitude if empty will takes up the center longitude',
maxWidth : 'The maximum width of the infowindow' //in number
pixelOffset : 'The offset, in pixels, of the tip of the info window from the point on the map at whose geographical coordinates the info window is anchored. If an InfoWindow is opened with an anchor, the pixelOffset will be calculated from the anchors anchorPoint property.
pixelOffset : 'The offset, in pixels, of the tip of the info window from the point on the map at whose geographical coordinates the info window is anchored. If an InfoWindow is opened with an anchor, the pixelOffset will be calculated from the anchors anchorPoint property.'
}

}
Expand Down Expand Up @@ -101,4 +101,8 @@ More info window support (events, adding it to markers)

Need more interactions back into the component than getting out of component

#Contributions

Contributions are welcome!

For more information on using ember-cli, visit [http://www.ember-cli.com/](http://www.ember-cli.com/).
3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "google-maps-addon",
"version": "0.0.8",
"version": "0.0.9",
"description": "Google maps Ember addon easy to consume",
"directories": {
"doc": "doc",
Expand All @@ -22,7 +22,6 @@
"broccoli-asset-rev": "^2.0.2",
"ember-cli": "0.2.3",
"ember-cli-app-version": "0.3.3",
"ember-cli-content-security-policy": "0.4.0",
"ember-cli-dependency-checker": "0.0.8",
"ember-cli-htmlbars": "0.7.4",
"ember-cli-ic-ajax": "0.1.1",
Expand Down
69 changes: 69 additions & 0 deletions tests/dummy/app/controllers/application.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
import Ember from 'ember';

export default Ember.Controller.extend({
inputObj: {
latitude : '12.976299881670053',
longitude : '80.13112306594849',
zoom : 7,
click : function(rec_event) {
console.log('map_click' + rec_event);
},
dblclick : function(rec_event) {
console.log('map_double_click' + rec_event);
},
drag : function() {
console.log('map_drag');
},
dragend : function() {
console.log('map_dragend');
},
dragstart : function() {
console.log('map_dragstart');
},
mousemove : function(rec_event) {
console.log('map_mousemove' + rec_event);
},
mouseout : function(rec_event) {
console.log('map_mouseout' + rec_event);
},
mouseover : function(rec_event) {
console.log('map_mouseover' + rec_event);
},
rightclick : function(rec_event) {
console.log('map_rightclick' + rec_event);
},
infowindow : {
content : '<div>Info Window</div>',
latitude : '12.976299881670053',
longitude : '80.13112306594849',
maxWidth : 200
},
markers : [
{
latitude : '12.976299881670053',
longitude : '80.13112306594849',
title : 'first marker',
click : function(rec_event) {
console.log('Marker_1_click' + rec_event);
},
animation : 'DROP',
timeout : 2000,
draggable : true,
infowindow : {
content : '<div>Marker 1</div>'
}
},
{
latitude : '13.976299881670053',
longitude : '80.13112306594849',
title : 'first marker',
click : function(rec_event) {
console.log('Marker_2_Click' + rec_event);
},
animation : 'BOUNCE',
timeout : 4000,
draggable : false
}
]
}
});
2 changes: 1 addition & 1 deletion tests/dummy/app/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
</head>
<body>
{{content-for 'body'}}

<script src="//maps.googleapis.com/maps/api/js?v=3"></script>
<script src="assets/vendor.js"></script>
<script src="assets/dummy.js"></script>

Expand Down
4 changes: 4 additions & 0 deletions tests/dummy/app/styles/app.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
.map-canvas{
width:500px;
height:500px;
}
5 changes: 2 additions & 3 deletions tests/dummy/app/templates/application.hbs
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
<h2 id="title">Welcome to Ember.js</h2>

{{outlet}}
<h2 id="title">Google Maps addon</h2>
{{google-maps-addon MapOptions=inputObj}}
13 changes: 13 additions & 0 deletions tests/dummy/config/environment.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,19 @@ module.exports = function(environment) {
environment: environment,
baseURL: '/',
locationType: 'auto',
/*
Need to include this after a deep study
and should include "ember-cli-content-security-policy": "0.4.0", in package.json
contentSecurityPolicy: {
'default-src': "'none'",
'script-src': "'self' www.storage.googleapis.com www.maps.googleapis.com",
'font-src': "'self' www.fonts.googleapis.com www.maps.googleapis.com",
'connect-src': "'self'",
'img-src': "'self' www.gravatar.com www.maps.googleapis.com",
'style-src': "'self' www.fonts.googleapis.com www.storage.googleapis.com",
'media-src': "'self'"
},
*/
EmberENV: {
FEATURES: {
// Here you can enable experimental features on an ember canary build
Expand Down

0 comments on commit 8c6ad9e

Please sign in to comment.