Merge pull request #7 from vgrafe/master

replaced (and removed) currentUrl() $scope method

Author: Amith92

app/scripts/directives/sidebar/sidebar.html

@@ -2,47 +2,49 @@
     <div class="sidebar-nav navbar-collapse">
         <ul class="nav in" id="side-menu">
             <sidebar-search></sidebar-search>
-            <li ng-class="{active: currentUrl()=='/dashboard/home'}">
-                <a ui-sref="dashboard.home"><i class="fa fa-dashboard fa-fw"></i> Dashboard</a> 
-            </li> 
-            <li ng-class="{active: currentUrl()=='/dashboard/chart'}">
+            <li ui-sref-active="active">
+                <a ui-sref="dashboard.home"><i class="fa fa-dashboard fa-fw"></i> Dashboard</a>
+            </li>
+            <li ui-sref-active="active">
 
                 <a ui-sref="dashboard.chart"><i class="fa fa-bar-chart-o fa-fw"></i> Charts<span></span></a>
-                
+
             </li>
-            <li ng-class="{active:currentUrl()=='/dashboard/tables'}">
+            <li ui-sref-active="active">
                 <a ui-sref="dashboard.table"><i class="fa fa-table fa-fw"></i> Tables</a>
             </li>
-            <li ng-class="{active: currentUrl()=='/dashboard/forms'}">
+            <li ui-sref-active="active">
                 <a ui-sref="dashboard.form"><i class="fa fa-edit fa-fw"></i> Forms</a>
             </li>
             <li ng-class="{active: collapseVar==1}">{{dropDown}}
-                <a href="" ng-click="check(1)"><i class="fa fa-wrench fa-fw"></i> UI Elements<span class="fa arrow"></span></a>
-                <ul class="nav nav-second-level" collapse ="collapseVar!=1">
-                    <li ng-class="{active: currentUrl()=='/dashboard/panels-wells'}">
+                <a href="" ng-click="check(1)"><i class="fa fa-wrench fa-fw"></i> UI Elements<span
+                        class="fa arrow"></span></a>
+                <ul class="nav nav-second-level" collapse="collapseVar!=1">
+                    <li ui-sref-active="active">
                         <a ui-sref="dashboard.panels-wells">Panels and Wells</a>
                     </li>
-                    <li ng-class="{active: currentUrl()=='/dashboard/buttons'}">
+                    <li ui-sref-active="active">
                         <a ui-sref="dashboard.buttons">Buttons</a>
                     </li>
-                    <li ng-class="{active: currentUrl()=='/dashboard/notifications'}">
+                    <li ui-sref-active="active">
                         <a ui-sref="dashboard.notifications">Notifications</a>
                     </li>
-                    <li ng-class="{active: currentUrl()=='/dashboard/typography'}">
+                    <li ui-sref-active="active">
                         <a ui-sref="dashboard.typography">Typography</a>
                     </li>
-                    <li ng-class="{active: currentUrl()=='/dashboard/icons'}">
+                    <li ui-sref-active="active">
                         <a ui-sref="dashboard.icons"> Icons</a>
                     </li>
-                    <li ng-class="{active: currentUrl()=='/dashboard/grid'}">
+                    <li ui-sref-active="active">
                         <a ui-sref="dashboard.grid">Grid</a>
                     </li>
                 </ul>
                 <!-- /.nav-second-level -->
             </li>
             <li ng-class="{active: collapseVar==2}">
-                <a href="" ng-click="check(2)"><i class="fa fa-sitemap fa-fw"></i> Multi-Level Dropdown<span class="fa arrow"></span></a>
-                <ul class="nav nav-second-level" collapse = "collapseVar!=2">
+                <a href="" ng-click="check(2)"><i class="fa fa-sitemap fa-fw"></i> Multi-Level Dropdown<span
+                        class="fa arrow"></span></a>
+                <ul class="nav nav-second-level" collapse="collapseVar!=2">
                     <li>
                         <a href="">Second Level Item</a>
                     </li>
@@ -64,24 +66,25 @@
                             <li>
                                 <a href="">Third Level Item</a>
                             </li>
-                            
+
                         </ul>
                         <!-- /.nav-third-level -->
                     </li>
                 </ul>
                 <!-- /.nav-second-level -->
             </li>
             <li ng-class="{active:collapseVar==4}">
-            <a href="" ng-click="check(4)"><i class="fa fa-files-o fa-fw"></i> Sample Pages<span class="fa arrow"></span></a>
-            <ul class="nav nav-second-level"collapse="collapseVar!=4">
-                <li ng-class="{active: selectedMenu=='blank'}">
-                    <a ui-sref="dashboard.blank" ng-click="selectedMenu='blank'">Blank Page</a>
-                </li>
-                <li>
-                    <a ui-sref="login">Login Page</a>
-                </li>
-            </ul>
-            <!-- /.nav-second-level -->
+                <a href="" ng-click="check(4)"><i class="fa fa-files-o fa-fw"></i> Sample Pages<span
+                        class="fa arrow"></span></a>
+                <ul class="nav nav-second-level" collapse="collapseVar!=4">
+                    <li ng-class="{active: selectedMenu=='blank'}">
+                        <a ui-sref="dashboard.blank" ng-click="selectedMenu='blank'">Blank Page</a>
+                    </li>
+                    <li>
+                        <a ui-sref="login">Login Page</a>
+                    </li>
+                </ul>
+                <!-- /.nav-second-level -->
             </li>
         </ul>
     </div>

app/scripts/directives/sidebar/sidebar.js

@@ -15,7 +15,7 @@ angular.module('sbAdminApp')
       replace: true,
       scope: {
       },
-      controller:function($scope,$location){
+      controller:function($scope){
         $scope.selectedMenu = 'dashboard';
         $scope.collapseVar = 0;
         $scope.multiCollapseVar = 0;
@@ -34,13 +34,7 @@ angular.module('sbAdminApp')
             $scope.multiCollapseVar = 0;
           else
             $scope.multiCollapseVar = y;
-        }
-
-        $scope.currentUrl = function(){
-            return $location.path();
-            console.log($location.path());
-        }
-
+        };
       }
     }
   }]);