Merge bdb89f3 into 301df63

CHANGELOG.md

@@ -1,3 +1,7 @@
+<a name="0.5.2"></a>
+### 0.5.2 (2016-11-30)
+
+
 <a name="0.5.0"></a>
 ## 0.5.0 (2016-11-14)
 

bower.json

@@ -1,7 +1,7 @@
 {
   "name": "angular-breadcrumb",
   "description": "AngularJS module that generates a breadcrumb from ui-router's states",
-  "version": "0.5.0",
+  "version": "0.5.2",
   "main": "release/angular-breadcrumb.js",
   "ignore": [
     "sample",

package.json

@@ -1,7 +1,7 @@
 {
   "name": "angular-breadcrumb",
   "description": "AngularJS module that generates a breadcrumb from ui-router's states",
-  "version": "0.5.0",
+  "version": "0.5.2",
   "homepage": "http://ncuillery.github.io/angular-breadcrumb",
   "author": {
     "name": "Nicolas Cuillery",

release/angular-breadcrumb.js

@@ -1,4 +1,4 @@
-/*! angular-breadcrumb - v0.5.0
+/*! angular-breadcrumb - v0.5.2
 * http://ncuillery.github.io/angular-breadcrumb
 * Copyright (c) 2016 Nicolas Cuillery; Licensed MIT */
 
@@ -48,8 +48,8 @@ function $Breadcrumb() {
 
         var $lastViewScope = $rootScope;
 
-        // Early catch of $viewContentLoaded event
-        registerListenerOnce('$Breadcrumb.$viewContentLoaded', $rootScope, '$viewContentLoaded', function (event) {
+        // Early catch of $stateChangeSuccess event
+        registerListenerOnce('$Breadcrumb.$stateChangeSuccess', $rootScope, '$stateChangeSuccess', function (event) {
             // With nested views, the event occur several times, in "wrong" order
             if(!event.targetScope.ncyBreadcrumbIgnore &&
                 isAOlderThanB(event.targetScope.$id, $lastViewScope.$id)) {
@@ -255,7 +255,7 @@ function BreadcrumbDirective($interpolate, $breadcrumb, $rootScope) {
                     });
                 };
 
-                registerListenerOnce('BreadcrumbDirective.$viewContentLoaded', $rootScope, '$viewContentLoaded', function (event) {
+                registerListenerOnce('BreadcrumbDirective.$stateChangeSuccess', $rootScope, '$stateChangeSuccess', function (event) {
                     if(!event.targetScope.ncyBreadcrumbIgnore) {
                         renderBreadcrumb();
                     }
@@ -313,7 +313,7 @@ function BreadcrumbLastDirective($interpolate, $breadcrumb, $rootScope) {
                         }
                     };
 
-                    registerListenerOnce('BreadcrumbLastDirective.$viewContentLoaded', $rootScope, '$viewContentLoaded', function (event) {
+                    registerListenerOnce('BreadcrumbLastDirective.$stateChangeSuccess', $rootScope, '$stateChangeSuccess', function (event) {
                         if(!event.targetScope.ncyBreadcrumbIgnore) {
                             renderLabel();
                         }
@@ -381,7 +381,7 @@ function BreadcrumbTextDirective($interpolate, $breadcrumb, $rootScope) {
                         scope.ncyBreadcrumbChain = combinedLabels.join(separator);
                     };
 
-                    registerListenerOnce('BreadcrumbTextDirective.$viewContentLoaded', $rootScope, '$viewContentLoaded', function (event) {
+                    registerListenerOnce('BreadcrumbTextDirective.$stateChangeSuccess', $rootScope, '$stateChangeSuccess', function (event) {
                         if(!event.targetScope.ncyBreadcrumbIgnore) {
                             renderLabel();
                         }

sample/views/home.html

@@ -16,7 +16,7 @@ <h2>Key features</h2>
     <a href="https://github.com/ncuillery/angular-breadcrumb" class="btn btn-large">
         <img src="img/GitHub-Mark-24px.png" alt="GitHub"/> View on GitHub
     </a>
-    <a href="angular-breadcrumb-0.5.0.zip" class="btn btn-large btn-primary">
-        <img src="img/download-24px.png" alt="Download"/> Download <small>(0.5.0)</small>
+    <a href="angular-breadcrumb-0.5.2.zip" class="btn btn-large btn-primary">
+        <img src="img/download-24px.png" alt="Download"/> Download <small>(0.5.2)</small>
     </a>
 </div>

src/angular-breadcrumb.js

@@ -43,8 +43,8 @@ function $Breadcrumb() {
 
         var $lastViewScope = $rootScope;
 
-        // Early catch of $viewContentLoaded event
-        registerListenerOnce('$Breadcrumb.$viewContentLoaded', $rootScope, '$viewContentLoaded', function (event) {
+        // Early catch of $stateChangeSuccess event
+        registerListenerOnce('$Breadcrumb.$stateChangeSuccess', $rootScope, '$stateChangeSuccess', function (event) {
             // With nested views, the event occur several times, in "wrong" order
             if(!event.targetScope.ncyBreadcrumbIgnore &&
                 isAOlderThanB(event.targetScope.$id, $lastViewScope.$id)) {
@@ -250,7 +250,7 @@ function BreadcrumbDirective($interpolate, $breadcrumb, $rootScope) {
                     });
                 };
 
-                registerListenerOnce('BreadcrumbDirective.$viewContentLoaded', $rootScope, '$viewContentLoaded', function (event) {
+                registerListenerOnce('BreadcrumbDirective.$stateChangeSuccess', $rootScope, '$stateChangeSuccess', function (event) {
                     if(!event.targetScope.ncyBreadcrumbIgnore) {
                         renderBreadcrumb();
                     }
@@ -308,7 +308,7 @@ function BreadcrumbLastDirective($interpolate, $breadcrumb, $rootScope) {
                         }
                     };
 
-                    registerListenerOnce('BreadcrumbLastDirective.$viewContentLoaded', $rootScope, '$viewContentLoaded', function (event) {
+                    registerListenerOnce('BreadcrumbLastDirective.$stateChangeSuccess', $rootScope, '$stateChangeSuccess', function (event) {
                         if(!event.targetScope.ncyBreadcrumbIgnore) {
                             renderLabel();
                         }
@@ -376,7 +376,7 @@ function BreadcrumbTextDirective($interpolate, $breadcrumb, $rootScope) {
                         scope.ncyBreadcrumbChain = combinedLabels.join(separator);
                     };
 
-                    registerListenerOnce('BreadcrumbTextDirective.$viewContentLoaded', $rootScope, '$viewContentLoaded', function (event) {
+                    registerListenerOnce('BreadcrumbTextDirective.$stateChangeSuccess', $rootScope, '$stateChangeSuccess', function (event) {
                         if(!event.targetScope.ncyBreadcrumbIgnore) {
                             renderLabel();
                         }

test/spec/directive-basic-test.js

@@ -18,7 +18,7 @@ describe('Breadcrumb directive with basic conf', function() {
 
     it('renders the correct state chain', inject(function() {
         goToState('D');
-        scope.$emit('$viewContentLoaded');
+        scope.$emit('$stateChangeSuccess');
         scope.$digest();
 
         console.info('Directive content : ' + element.text());
@@ -37,7 +37,7 @@ describe('Breadcrumb directive with basic conf', function() {
 
     it('should work with one state', inject(function() {
         goToState('A');
-        scope.$emit('$viewContentLoaded');
+        scope.$emit('$stateChangeSuccess');
         scope.$digest();
 
         console.info('Directive content : ' + element.text());

test/spec/directive-dynamic-parent-test.js

@@ -22,7 +22,7 @@ describe('Breadcrumb directive with dynamic parent conf', function() {
         compile(scope);
         expect(scope.parentState).toBeDefined();
 
-        scope.$emit('$viewContentLoaded');
+        scope.$emit('$stateChangeSuccess');
         scope.$digest();
 
         console.info('Directive content : ' + element.text());
@@ -39,7 +39,7 @@ describe('Breadcrumb directive with dynamic parent conf', function() {
         compile(scope);
         expect(scope.parentState).toBeUndefined();
 
-        scope.$emit('$viewContentLoaded');
+        scope.$emit('$stateChangeSuccess');
         scope.$digest();
 
         console.info('Directive content : ' + element.text());
@@ -55,7 +55,7 @@ describe('Breadcrumb directive with dynamic parent conf', function() {
 
         compile(scope);
 
-        scope.$emit('$viewContentLoaded');
+        scope.$emit('$stateChangeSuccess');
         scope.$digest();
 
         console.info('Directive content : ' + element.text());

test/spec/directive-interpolation-test.js

@@ -23,7 +23,7 @@ describe('Breadcrumb directive with interpolation conf', function() {
 
         expect(scope.tripleB).toBeDefined();
 
-        scope.$emit('$viewContentLoaded');
+        scope.$emit('$stateChangeSuccess');
         scope.$digest();
 
         console.info('Directive content : ' + element.text());
@@ -39,7 +39,7 @@ describe('Breadcrumb directive with interpolation conf', function() {
         controller('BCtrl', {'$scope' : scope} );
         compile(scope);
 
-        scope.$emit('$viewContentLoaded');
+        scope.$emit('$stateChangeSuccess');
         scope.$digest();
 
         console.info('Directive content : ' + element.text());