chore(sample): unused controller

ncuillery · Jun 13, 2014 · a474fe2 · a474fe2
1 parent e49eeac
commit a474fe2
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 28 deletions.
diff --git a/dist/angular-breadcrumb.js b/dist/angular-breadcrumb.js
@@ -1,4 +1,4 @@
-/*! angular-breadcrumb - v0.2.1 - 2014-05-16
+/*! angular-breadcrumb - v0.2.1-dev-2014-06-13
 * https://github.com/ncuillery/angular-breadcrumb
 * Copyright (c) 2014 Nicolas Cuillery; Licensed MIT */
 
@@ -23,7 +23,18 @@ function $Breadcrumb() {
         angular.extend($$options, options);
     };
 
-    this.$get = ['$state', function($state) {
+    this.$get = ['$state', '$rootScope', function($state, $rootScope) {
+
+        var $lastViewScope = $rootScope;
+
+        // Early catch of $viewContentLoaded event
+        $rootScope.$on('$viewContentLoaded', function (event) {
+            console.log('listener service');
+            // With nested views, the event occur several times, in "wrong" order
+            if(isAOlderThanB(event.targetScope.$id, $lastViewScope.$id)) {
+                $lastViewScope = event.targetScope;
+            }
+        });
 
         // Check if a property in state's data is inherited from the parent state
         var $$isInherited = function(state, dataProperty) {
@@ -128,6 +139,10 @@ function $Breadcrumb() {
                 while(state && state.name !== '');
 
                 return chain;
+            },
+
+            $getLastViewScope: function() {
+                return $lastViewScope;
             }
         };
     }];
@@ -162,22 +177,27 @@ function BreadcrumbDirective($interpolate, $breadcrumb, $rootScope) {
         templateUrl: $breadcrumb.getTemplateUrl(),
         link: {
             post: function postLink(scope) {
-                var lastScopeId;
-                $rootScope.$on('$viewContentLoaded', function (event) {
-                    // With nested views, the event occur several times, in "wrong" order
-                    if(!lastScopeId || isAOlderThanB(event.targetScope.$id, lastScopeId)) {
-                        lastScopeId = event.targetScope.$id;
-                        scope.steps = $breadcrumb.getStatesChain();
-                        angular.forEach(scope.steps, function (value) {
-                            if (value.data && value.data.ncyBreadcrumbLabel) {
-                                var parseLabel = $interpolate(value.data.ncyBreadcrumbLabel);
-                                value.ncyBreadcrumbLabel = parseLabel(event.targetScope);
-                            } else {
-                                value.ncyBreadcrumbLabel = value.name;
-                            }
-                        });
-                    }
+
+                var renderBreadcrumb = function() {
+                    var viewScope = $breadcrumb.$getLastViewScope();
+                    scope.steps = $breadcrumb.getStatesChain();
+                    angular.forEach(scope.steps, function (value) {
+                        if (value.data && value.data.ncyBreadcrumbLabel) {
+                            var parseLabel = $interpolate(value.data.ncyBreadcrumbLabel);
+                            value.ncyBreadcrumbLabel = parseLabel(viewScope);
+                        } else {
+                            value.ncyBreadcrumbLabel = value.name;
+                        }
+                    });
+                };
+
+                $rootScope.$on('$viewContentLoaded', function () {
+                    console.log('listener directive');
+                    renderBreadcrumb();
                 });
+
+                // View(s) may be already loaded while the directive's linking
+                renderBreadcrumb();
             }
         }
     };

diff --git a/dist/angular-breadcrumb.min.js b/dist/angular-breadcrumb.min.js
diff --git a/sample/controllers/home.js b/sample/controllers/home.js
diff --git a/sample/index.html b/sample/index.html
@@ -57,7 +57,6 @@
 
     <script src="app.js"></script>
 
-    <script src="controllers/home.js"></script>
     <script src="controllers/room_list.js"></script>
     <script src="controllers/room_detail.js"></script>
     <script src="controllers/booking_list.js"></script>