chore: Bump version to 4.1.1

RafaelVidaurre · Oct 21, 2016 · fbf3cf0 · fbf3cf0
1 parent cb42f61
commit fbf3cf0
Show file tree

Hide file tree

Showing 11 changed files with 25 additions and 30 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-permission",
-  "version": "4.1.0",
+  "version": "4.1.1",
   "authors": [
 	"Rafael Vidaurre <narzerus@gmail.com> (http://www.rafaelvidaurre.com)",
 	"Blazej Krysiak <blazej.krysiak@gmail.com>"

diff --git a/dist/angular-permission-ng.js b/dist/angular-permission-ng.js
@@ -1,7 +1,7 @@
 /**
  * angular-permission-ng
  * Extension module of angular-permission for access control within angular-route
- * @version v4.1.0 - 2016-10-19
+ * @version v4.1.1 - 2016-10-21
  * @link https://github.com/Narzerus/angular-permission
  * @author Rafael Vidaurre <narzerus@gmail.com> (http://www.rafaelvidaurre.com), Blazej Krysiak <blazej.krysiak@gmail.com>
  * @license MIT License, http://www.opensource.org/licenses/MIT
@@ -50,7 +50,11 @@
        * @returns {boolean}
        */
       function areSetRoutePermissions() {
-        return angular.isDefined(next.$$route.data) && angular.isDefined(next.$$route.data.permissions);
+        try {
+          return !!next.$$route.data.permissions;
+        } catch (e) {
+          return false;
+        }
       }
 
       /**

diff --git a/dist/angular-permission-ng.min.js b/dist/angular-permission-ng.min.js
diff --git a/dist/angular-permission-ng.min.js.map b/dist/angular-permission-ng.min.js.map
diff --git a/dist/angular-permission-ui.js b/dist/angular-permission-ui.js
@@ -1,7 +1,7 @@
 /**
  * angular-permission-ui
  * Extension module of angular-permission for access control within ui-router
- * @version v4.1.0 - 2016-10-19
+ * @version v4.1.1 - 2016-10-21
  * @link https://github.com/Narzerus/angular-permission
  * @author Rafael Vidaurre <narzerus@gmail.com> (http://www.rafaelvidaurre.com), Blazej Krysiak <blazej.krysiak@gmail.com>
  * @license MIT License, http://www.opensource.org/licenses/MIT
@@ -201,7 +201,7 @@
      * @returns {boolean}
      */
     function areEventsDefaultPrevented() {
-      return isStateChangePermissionStartDefaultPrevented() || isStateChangeStartDefaultPrevented();
+      return isStateChangePermissionStartDefaultPrevented();
     }
 
     /**
@@ -257,20 +257,6 @@
         PermTransitionProperties.options).defaultPrevented;
     }
 
-    /**
-     * Checks if event $stateChangeStart hasn't been disabled by default
-     * @methodOf permission.ui.PermTransitionEvents
-     * @private
-     *
-     * @returns {boolean}
-     */
-    function isStateChangeStartDefaultPrevented() {
-      return $rootScope.$broadcast('$stateChangeStart',
-        PermTransitionProperties.toState, PermTransitionProperties.toParams,
-        PermTransitionProperties.fromState, PermTransitionProperties.fromParams,
-        PermTransitionProperties.options).defaultPrevented;
-    }
-
     return $delegate;
   }
 
@@ -483,13 +469,18 @@
 
     /**
      * Checks if state has set permissions
+     * We check for hasOwnProperty, because ui-router lets the `data` property inherit from its parent
      * @methodOf permission.ui.StatePermissionMap
      * @private
      *
      * @returns {boolean}
      */
     function areSetStatePermissions(state) {
-      return angular.isDefined(state.data) && angular.isDefined(state.data.permissions);
+      try {
+        return Object.prototype.hasOwnProperty.call(state.data, 'permissions');
+      } catch (e) {
+        return false;
+      }
     }
 
     return StatePermissionMap;