Prepare new release

Author: mdmunir

composer.json

@@ -16,7 +16,7 @@
     ],
     "require": {
         "yiisoft/yii2": ">=2.0.4",
-        "deesoft/yii2-angular": "~1.1",
+        "deesoft/yii2-angular": "~1.2",
         "deesoft/yii2-adminlte": "~1.0"
     },
     "autoload": {

views/default/index.js

@@ -1,8 +1,10 @@
 var prefixApiUrl = options.currentUrl + '/';
 
-dAdmin.controller('HeaderMenuCtrl', ['$scope', '$location', function ($scope, $location) {
+module.run(['$rootScope', '$location', function ($scope, $location) {
         $scope.headerMenu = [];
-        $scope.location = $location;
+        $scope.isRouteActive = function (id){
+            return $location.path().indexOf(id)===0;
+        };
         angular.forEach(options.headerMenus, function (label, id) {
             $scope.headerMenu.push({
                 id:id,
@@ -12,15 +14,15 @@ dAdmin.controller('HeaderMenuCtrl', ['$scope', '$location', function ($scope, $l
         });
     }]);
 
-dAdmin.factory('Assignment', ['$resource', function ($resource) {
+module.factory('Assignment', ['$resource', function ($resource) {
 
         return $resource(prefixApiUrl + 'assignment/:id', {}, {
             assign: {method: 'POST', url: prefixApiUrl + 'assignment/assign/:id'},
             revoke: {method: 'POST', url: prefixApiUrl + 'assignment/revoke/:id'},
         });
     }]);
 
-dAdmin.factory('Item', ['$resource', function ($resource) {
+module.factory('Item', ['$resource', function ($resource) {
 
         return $resource(prefixApiUrl + 'item/:id', {}, {
             assign: {method: 'POST', url: prefixApiUrl + 'item/assign/:id'},
@@ -29,13 +31,13 @@ dAdmin.factory('Item', ['$resource', function ($resource) {
         });
     }]);
 
-dAdmin.factory('Rule', ['$resource', function ($resource) {
+module.factory('Rule', ['$resource', function ($resource) {
 
         return $resource(prefixApiUrl + 'rule/:id', {}, {
         });
     }]);
 
-dAdmin.factory('Route', ['$resource', function ($resource) {
+module.factory('Route', ['$resource', function ($resource) {
 
         return $resource(prefixApiUrl + 'route', {}, {
             query: {method: 'GET', isArray: false},
@@ -44,13 +46,13 @@ dAdmin.factory('Route', ['$resource', function ($resource) {
         });
     }]);
 
-dAdmin.factory('Menu', ['$resource', function ($resource) {
+module.factory('Menu', ['$resource', function ($resource) {
 
         return $resource(prefixApiUrl + 'menu/:id', {}, {
             values: {method: 'GET', url: prefixApiUrl + 'menu/values'}
         });
     }]);
 
-dAdmin.filter('escape', function () {
+module.filter('escape', function () {
     return window.encodeURI;
 });

views/layouts/header.php

@@ -14,8 +14,8 @@
                 </button>
             </div>
             <div class="collapse navbar-collapse pull-left" id="navbar-collapse">
-                <ul class="nav navbar-nav" ng-controller="HeaderMenuCtrl">
-                    <li ng-repeat="menu in headerMenu" ng-class="{active:location.path().indexOf(menu.id)===0}">
+                <ul class="nav navbar-nav">
+                    <li ng-repeat="menu in headerMenu" ng-class="{active:isRouteActive(menu.id)}">
                         <a ng-href="{{menu.url}}" ng-bind="menu.label"></a>
                     </li>
                 </ul>