> Eliminate ng-href on nav bar and home page hero button

> Instead, have NavController.selectPage() call $location.path()
cliffhall · Apr 2, 2016 · 3479bf4 · 3479bf4
1 parent 9b5984b
commit 3479bf4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/app/controllers/nav-controller.js b/app/controllers/nav-controller.js
@@ -12,12 +12,13 @@
             'NavController',
             [
                 '$rootScope',
+                '$location',
                 NavController
             ]
         );
 
     // Constructor
-    function NavController($rootScope)
+    function NavController($rootScope,$location)
     {
         var instance = this;
         instance.isSelected = isSelected;
@@ -26,6 +27,7 @@
         // Select a page
         function selectPage(setPage) {
             $rootScope.nav.page = setPage;
+            $location.path(setPage);
         }
 
         // Check selected page

diff --git a/app/views/home/try-me-button.html b/app/views/home/try-me-button.html
@@ -6,8 +6,7 @@
 -->
 <div ng-hide="account.profile">
     <a class="btn btn-lg btn-success btn-block"
-       ng-hide="account.profile"
-       ng-href="#{{nav.PAGES.ACCOUNT}}" role="button"
+       ng-hide="account.profile" role="button"
        ng-click="navCtrl.selectPage(nav.PAGES.ACCOUNT)">Try it now!</a>
 </div>
 <div ng-show="account.profile">

diff --git a/app/views/nav.html b/app/views/nav.html
@@ -8,7 +8,6 @@
     <div class="navbar-header">
         <div class="row center-block">
             <a role="button"
-               ng-href="#{{nav.PAGES.HOME}}"
                ng-click="navCtrl.selectPage(nav.PAGES.HOME)">
                 <!-- ICON -->
                 <img style="height:50px"
@@ -20,12 +19,12 @@
         <li role="button"
             ng-class="{active: navCtrl.isSelected(nav.PAGES.HOME)}"
             ng-click="navCtrl.selectPage(nav.PAGES.HOME)">
-            <a ng-href="#{{nav.PAGES.HOME}}">Home</a>
+            <a>Home</a>
         </li>
         <li role="button"
             ng-class="{active: navCtrl.isSelected(nav.PAGES.ACCOUNT)}"
             ng-click="navCtrl.selectPage(nav.PAGES.ACCOUNT)">
-            <a ng-href="#{{nav.PAGES.ACCOUNT}}">{{(account.authData != null)?"Account":"Sign In"}}</a>
+            <a>{{(account.authData != null)?"Account":"Sign In"}}</a>
         </li>
     </ul>
 </nav>