Merge branch 'develop'

Conflicts: skel-nav-esri-atom/views/flickr.js
cmichaelgraham · Sep 7, 2015 · b822dee · b822dee
2 parents 459674c + 9c1df86
commit b822dee
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 60 deletions.
diff --git a/skel-nav-esri-atom/views/app.js b/skel-nav-esri-atom/views/app.js
@@ -1,18 +1,18 @@
-define(["require", "exports"], function (require, exports) {
+define(["require", "exports", "aurelia-router"], function (require, exports, aurelia_router_1) {
     var App = (function () {
-        function App() {
-        }
-        App.prototype.configureRouter = function (config, router) {
-            config.title = 'Aurelia';
-            config.map([
-                { route: ['', 'welcome'], name: 'welcome', moduleId: './welcome', nav: true, title: 'Welcome' },
-                { route: 'flickr', name: 'flickr', moduleId: './flickr', nav: true, title: 'Flickr' },
-                { route: 'users', name: 'users', moduleId: './users', nav: true, title: 'Github Users' },
-                { route: 'esri-map', name: 'esri-map', moduleId: './esri-map', nav: true, title: 'ESRI Map' },
-                { route: 'child-router', name: 'child-router', moduleId: './child-router', nav: true, title: 'Child Router' }
-            ]);
+        function App(router) {
             this.router = router;
-        };
+            this.router.configure(function (config) {
+                config.title = "Aurelia ESRI Atom Sample";
+                config.map([
+                    { route: ["", "welcome"], moduleId: "views/welcome", nav: true, title: "Welcome to VS/TS" },
+                    { route: "flickr", moduleId: "views/flickr", nav: true },
+                    { route: "esri-map", moduleId: "views/esri-map", nav: true, title: "ESRI Map V1" },
+                    { route: "child-router", moduleId: "views/child-router", nav: true, title: "Child Router" }
+                ]);
+            });
+        }
+        App.inject = [aurelia_router_1.Router];
         return App;
     })();
     exports.App = App;

diff --git a/skel-nav-esri-atom/views/child-router.js b/skel-nav-esri-atom/views/child-router.js
@@ -1,17 +1,18 @@
-define(["require", "exports"], function (require, exports) {
-    var ChildRouter = (function () {
-        function ChildRouter() {
-            this.heading = 'Child Router';
-        }
-        ChildRouter.prototype.configureRouter = function (config, router) {
-            config.map([
-                { route: ['', 'welcome'], moduleId: './welcome', nav: true, title: 'Welcome' },
-                { route: 'flickr', moduleId: './flickr', nav: true, title: 'Flickr' },
-                { route: 'child-router', moduleId: './child-router', nav: true, title: 'Child Router' }
-            ]);
+define(["require", "exports", "aurelia-router"], function (require, exports, aurelia_router_1) {
+    var Welcome = (function () {
+        function Welcome(router) {
             this.router = router;
-        };
-        return ChildRouter;
+            this.heading = "Child Router";
+            router.configure(function (config) {
+                config.map([
+                    { route: ["", "welcome"], moduleId: "views/welcome", nav: true, title: "Welcome" },
+                    { route: "flickr", moduleId: "views/flickr", nav: true },
+                    { route: "child-router", moduleId: "views/child-router", nav: true, title: "Child Router" }
+                ]);
+            });
+        }
+        Welcome.inject = [aurelia_router_1.Router];
+        return Welcome;
     })();
-    exports.ChildRouter = ChildRouter;
+    exports.Welcome = Welcome;
 });
diff --git a/skel-nav-esri-atom/views/esri-map.js b/skel-nav-esri-atom/views/esri-map.js
@@ -1,27 +1,13 @@
-define(["require", "exports", "esri/map", "esri/graphic", "esri/symbols/SimpleMarkerSymbol", "esri/geometry/Point", 'esri/SpatialReference', 'esri/geometry/webMercatorUtils'], function (require, exports, Map, Graphic, SimpleMarkerSymbol, Point, SpatialReference, webMercatorUtils) {
+define(["require", "exports", "esri/map"], function (require, exports, map_1) {
     var EsriMap = (function () {
         function EsriMap() {
         }
         EsriMap.prototype.attached = function () {
-            var _this = this;
-            this.map = new Map("map", {
+            var map = new map_1.default("map", {
                 center: [-118, 34.5],
                 zoom: 8,
                 basemap: "topo"
             });
-            this.map.on("load", function () {
-                console.log('on load: ' + _this.map);
-                var pm = new SimpleMarkerSymbol();
-                pm.size = 10;
-                var wgs = new SpatialReference({ "wkid": 4326 });
-                var p = new Point(-118, 34.5, wgs);
-                var p2 = webMercatorUtils.geographicToWebMercator(p);
-                var g = new Graphic(p2, pm);
-                console.log(g);
-                g.setGeometry(p);
-                console.log(_this.map.loaded);
-                _this.map.graphics.add(g);
-            });
         };
         return EsriMap;
     })();

diff --git a/skel-nav-esri-atom/views/flickr.js b/skel-nav-esri-atom/views/flickr.js
@@ -28,9 +28,10 @@ define(["require", "exports", 'aurelia-framework', 'aurelia-http-client'], funct
         };
         Flickr = __decorate([
             aurelia_framework_1.autoinject, 
-            __metadata('design:paramtypes', [aurelia_http_client_1.HttpClient])
+            __metadata('design:paramtypes', [(typeof (_a = typeof aurelia_http_client_1.HttpClient !== 'undefined' && aurelia_http_client_1.HttpClient) === 'function' && _a) || Object])
         ], Flickr);
         return Flickr;
+        var _a;
     })();
     exports.Flickr = Flickr;
 });
diff --git a/skel-nav-esri-atom/views/welcome.js b/skel-nav-esri-atom/views/welcome.js
@@ -1,15 +1,11 @@
 define(["require", "exports"], function (require, exports) {
     var Welcome = (function () {
         function Welcome() {
-            this.heading = 'Welcome to the Aurelia Navigation App!';
-            this.firstName = 'John';
-            this.lastName = 'Doe';
+            this.heading = "Welcome to the Aurelia Navigation App (VS/TS)!";
+            this.firstName = "John";
+            this.lastName = "Doe";
         }
         Object.defineProperty(Welcome.prototype, "fullName", {
-            //Getters can't be observed with Object.observe, so they must be dirty checked.
-            //However, if you tell Aurelia the dependencies, it no longer needs to dirty check the property.
-            //To optimize by declaring the properties that this getter is computed from, uncomment the line below.
-            //@computedFrom('firstName', 'lastName')
             get: function () {
                 return this.firstName + " " + this.lastName;
             },
@@ -22,13 +18,4 @@ define(["require", "exports"], function (require, exports) {
         return Welcome;
     })();
     exports.Welcome = Welcome;
-    var UpperValueConverter = (function () {
-        function UpperValueConverter() {
-        }
-        UpperValueConverter.prototype.toView = function (value) {
-            return value && value.toUpperCase();
-        };
-        return UpperValueConverter;
-    })();
-    exports.UpperValueConverter = UpperValueConverter;
 });