]> git.uio.no Git - u/erikhf/frm.git/commitdiff
git://git.uio.no / u / erikhf / frm.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 322acf9)
resdy to merge
authorJulie Hill Roa <julie.hill.roa@gmail.com>
Thu, 12 Nov 2015 08:25:05 +0000 (09:25 +0100)
committerJulie Hill Roa <julie.hill.roa@gmail.com>
Thu, 12 Nov 2015 08:25:05 +0000 (09:25 +0100)
src/components/app/app.ts patch | blob | blame | history
src/components/map/map.ts [new file with mode: 0644] patch | blob
src/index.html patch | blob | blame | history

diff --git a/src/components/app/app.ts b/src/components/app/app.ts
index 224d144bb9f607cb296a097e8864190d33411e35..39a3db0809c9f15f6638da981ce264c4b2a17f45 100644 (file)
--- a/src/components/app/app.ts
+++ b/src/components/app/app.ts
@@ -1,5 +1,5 @@
-import {bootstrap, Component, CORE_DIRECTIVES} from '../../../node_modules/angular2/angular2.d.ts';
-
+import {bootstrap, Component, CORE_DIRECTIVES} from 'angular2/angular2';
+import {map} from '../map/map';
 @Component({
     selector: 'hello-world',
     directives: [CORE_DIRECTIVES],
diff --git a/src/components/map/map.ts b/src/components/map/map.ts
new file mode 100644 (file)
index 0000000..c79ac10
--- /dev/null
+++ b/src/components/map/map.ts
@@ -0,0 +1,23 @@
+import {Component, CORE_DIRECTIVES} from '../../../node_modules/angular2/angular2.d.ts';
+
+@Component({
+    selector: 'map',
+    directives: [CORE_DIRECTIVES],
+    template: ` <div id="map"></div>`
+    //templateUrl: './map.html'
+
+
+})
+
+
+class Map {
+
+
+    initMap() {
+         let map = new google.maps.Map(document.getElementById('map'), {
+           center: {lat: -34.397, lng: 150.644},
+         zoom: 8
+        });
+
+    }
+}
diff --git a/src/index.html b/src/index.html
index d44cd76894bf3d1dcf53c2f03552d3c5996384e3..f51379f5b3775132c381dc704a7bdf65c8b31166 100644 (file)
--- a/src/index.html
+++ b/src/index.html
@@ -20,9 +20,6 @@
         });
         System.import('components/app/app');
     </script>
-    <!--
-
-    -->
 </head>
 <body>
     <hello-world>loading...</hello-world>