diff --git a/bower.json b/bower.json
index 96b52f5..4496805 100644
--- a/bower.json
+++ b/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",
diff --git a/package.json b/package.json
index 6f773eb..44eb988 100644
--- a/package.json
+++ b/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",
diff --git a/release/angular-breadcrumb.js b/release/angular-breadcrumb.js
index ecbeeba..9ee5665 100644
--- a/release/angular-breadcrumb.js
+++ b/release/angular-breadcrumb.js
@@ -1,8 +1,8 @@
-/*! angular-breadcrumb - v0.5.0
-* http://ncuillery.github.io/angular-breadcrumb
-* Copyright (c) 2016 Nicolas Cuillery; Licensed MIT */
-
-(function (window, angular, undefined) {
+/*! angular-breadcrumb - v0.5.2
+* http://ncuillery.github.io/angular-breadcrumb
+* Copyright (c) 2016 Nicolas Cuillery; Licensed MIT */
+
+(function (window, angular, undefined) {
'use strict';
function isAOlderThanB(scopeA, scopeB) {
@@ -114,6 +114,17 @@ function $Breadcrumb() {
return $$parentState(conf);
};
+ var $getValuesFromResolve = function($scopeContext) {
+ $scopeContext.resolvedValues = {};
+ if($scopeContext && $scopeContext.hasOwnProperty('$resolve')) {
+ angular.forEach($scopeContext.$resolve, function(promise, key) {
+ $scopeContext.resolvedValues[key] = promise;
+ });
+ }
+
+ return $scopeContext;
+ };
+
return {
getTemplate: function(templates) {
@@ -174,7 +185,9 @@ function $Breadcrumb() {
$getLastViewScope: function() {
return $lastViewScope;
- }
+ },
+
+ $getValuesFromResolve: $getValuesFromResolve
};
}];
}
@@ -242,6 +255,8 @@ function BreadcrumbDirective($interpolate, $breadcrumb, $rootScope) {
labelWatchers = [];
var viewScope = $breadcrumb.$getLastViewScope();
+ viewScope = $breadcrumb.$resolveValues(viewScope);
+
scope.steps = $breadcrumb.getStatesChain();
angular.forEach(scope.steps, function (step) {
if (step.ncyBreadcrumb && step.ncyBreadcrumb.label) {
@@ -298,6 +313,7 @@ function BreadcrumbLastDirective($interpolate, $breadcrumb, $rootScope) {
labelWatchers = [];
var viewScope = $breadcrumb.$getLastViewScope();
+ viewScope = $breadcrumb.$resolveValues(viewScope);
var lastStep = $breadcrumb.getLastStep();
if(lastStep) {
scope.ncyBreadcrumbLink = lastStep.ncyBreadcrumbLink;
@@ -365,6 +381,7 @@ function BreadcrumbTextDirective($interpolate, $breadcrumb, $rootScope) {
labelWatchers = [];
var viewScope = $breadcrumb.$getLastViewScope();
+ viewScope = $breadcrumb.$resolveValues(viewScope);
var steps = $breadcrumb.getStatesChain();
var combinedLabels = [];
angular.forEach(steps, function (step) {
@@ -402,4 +419,4 @@ angular.module('ncy-angular-breadcrumb', ['ui.router.state'])
.directive('ncyBreadcrumb', BreadcrumbDirective)
.directive('ncyBreadcrumbLast', BreadcrumbLastDirective)
.directive('ncyBreadcrumbText', BreadcrumbTextDirective);
-})(window, window.angular);
+})(window, window.angular);
diff --git a/release/angular-breadcrumb.min.js b/release/angular-breadcrumb.min.js
index 1f3a44b..00511c8 100644
--- a/release/angular-breadcrumb.min.js
+++ b/release/angular-breadcrumb.min.js
@@ -1,4 +1,4 @@
-/*! angular-breadcrumb - v0.5.0
-* http://ncuillery.github.io/angular-breadcrumb
-* Copyright (c) 2016 Nicolas Cuillery; Licensed MIT */
-!function(a,b,c){"use strict";function d(a,c){return b.equals(a.length,c.length)?a>c:a.length>c.length}function e(a){var b=a.replace(/\n/g," ").match(/^([^(]+?)\s*(\((.*)\))?$/);if(!b||4!==b.length)throw new Error("Invalid state ref '"+a+"'");return{state:b[1],paramExpr:b[3]||null}}function f(a,b,d,e){var f=k[a];f!==c&&f(),f=b.$on(d,e),k[a]=f}function g(){var a={prefixStateName:null,template:"bootstrap3",templateUrl:null,templateLast:"default",templateLastUrl:null,includeAbstract:!1};this.setOptions=function(c){b.extend(a,c)},this.$get=["$state","$stateParams","$rootScope",function(b,g,h){var i=h;f("$Breadcrumb.$viewContentLoaded",h,"$viewContentLoaded",function(a){!a.targetScope.ncyBreadcrumbIgnore&&d(a.targetScope.$id,i.$id)&&(i=a.targetScope)});var j=function(a){var b=a.parent||(/^(.+)\.[^.]+$/.exec(a.name)||[])[1],c="object"==typeof b;return c?b.name:b},k=function(c,d){for(var f,h,j=e(d),k=!1,l=!1,m=0,n=c.length;n>m;m+=1)if(c[m].name===j.state)return;f=b.get(j.state),f.ncyBreadcrumb&&(f.ncyBreadcrumb.force&&(k=!0),f.ncyBreadcrumb.skip&&(l=!0)),f["abstract"]&&!a.includeAbstract&&!k||l||(j.paramExpr&&(h=i.$eval(j.paramExpr)),f.ncyBreadcrumbLink=b.href(j.state,h||g||{}),f.ncyBreadcrumbStateRef=d,c.unshift(f))},l=function(a){var c=e(a),d=b.get(c.state);if(d.ncyBreadcrumb&&d.ncyBreadcrumb.parent){var f="function"==typeof d.ncyBreadcrumb.parent,g=f?d.ncyBreadcrumb.parent(i):d.ncyBreadcrumb.parent;if(g)return g}return j(d)};return{getTemplate:function(b){return a.templateUrl?null:b[a.template]?b[a.template]:a.template},getTemplateUrl:function(){return a.templateUrl},getTemplateLast:function(b){return a.templateLastUrl?null:b[a.templateLast]?b[a.templateLast]:a.templateLast},getTemplateLastUrl:function(){return a.templateLastUrl},getStatesChain:function(c){for(var d=[],e=b.$current.self.name;e;e=l(e))if(k(d,e),c&&d.length)return d;return a.prefixStateName&&k(d,a.prefixStateName),d},getLastStep:function(){var a=this.getStatesChain(!0);return a.length?a[0]:c},$getLastViewScope:function(){return i}}}]}function h(a,c,d){var e={bootstrap2:'',bootstrap3:'- {{step.ncyBreadcrumbLabel}}{{step.ncyBreadcrumbLabel}}
'};return{restrict:"AE",replace:!0,scope:{},template:c.getTemplate(e),templateUrl:c.getTemplateUrl(),link:{post:function(e){var g=[],h=function(){n(g),g=[];var d=c.$getLastViewScope();e.steps=c.getStatesChain(),b.forEach(e.steps,function(b){if(b.ncyBreadcrumb&&b.ncyBreadcrumb.label){var c=a(b.ncyBreadcrumb.label);b.ncyBreadcrumbLabel=c(d),m(g,c,d,b)}else b.ncyBreadcrumbLabel=b.name})};f("BreadcrumbDirective.$viewContentLoaded",d,"$viewContentLoaded",function(a){a.targetScope.ncyBreadcrumbIgnore||h()}),h()}}}}function i(a,b,c){var d={"default":"{{ncyBreadcrumbLabel}}"};return{restrict:"A",scope:{},template:b.getTemplateLast(d),templateUrl:b.getTemplateLastUrl(),compile:function(d,e){var g=d.attr(e.$attr.ncyBreadcrumbLast);return g&&d.html(g),{post:function(d){var e=[],g=function(){n(e),e=[];var c=b.$getLastViewScope(),f=b.getLastStep();if(f)if(d.ncyBreadcrumbLink=f.ncyBreadcrumbLink,f.ncyBreadcrumb&&f.ncyBreadcrumb.label){var g=a(f.ncyBreadcrumb.label);d.ncyBreadcrumbLabel=g(c),m(e,g,c,d)}else d.ncyBreadcrumbLabel=f.name};f("BreadcrumbLastDirective.$viewContentLoaded",c,"$viewContentLoaded",function(a){a.targetScope.ncyBreadcrumbIgnore||g()}),g()}}}}}function j(a,c,d){return{restrict:"A",scope:{},template:"{{ncyBreadcrumbChain}}",compile:function(e,g){var h=e.attr(g.$attr.ncyBreadcrumbText);h&&e.html(h);var i=e.attr(g.$attr.ncyBreadcrumbTextSeparator)||" / ";return{post:function(e){var g=[],h=function(a,c,d){b.forEach(l(c),function(b){var c=d.$watch(b,function(a,b){a!==b&&j()});a.push(c)})},j=function(){n(g),g=[];var d=c.$getLastViewScope(),f=c.getStatesChain(),j=[];b.forEach(f,function(b){if(b.ncyBreadcrumb&&b.ncyBreadcrumb.label){var c=a(b.ncyBreadcrumb.label);j.push(c(d)),h(g,c,d)}else j.push(b.name)}),e.ncyBreadcrumbChain=j.join(i)};f("BreadcrumbTextDirective.$viewContentLoaded",d,"$viewContentLoaded",function(a){a.targetScope.ncyBreadcrumbIgnore||j()}),j()}}}}}var k={},l=function(a){if(a.expressions)return a.expressions;var c=[];return b.forEach(a.parts,function(a){b.isFunction(a)&&c.push(a.exp)}),c},m=function(a,c,d,e){b.forEach(l(c),function(b){var f=d.$watch(b,function(){e.ncyBreadcrumbLabel=c(d)});a.push(f)})},n=function(a){b.forEach(a,function(a){a()})};h.$inject=["$interpolate","$breadcrumb","$rootScope"],i.$inject=["$interpolate","$breadcrumb","$rootScope"],j.$inject=["$interpolate","$breadcrumb","$rootScope"],b.module("ncy-angular-breadcrumb",["ui.router.state"]).provider("$breadcrumb",g).directive("ncyBreadcrumb",h).directive("ncyBreadcrumbLast",i).directive("ncyBreadcrumbText",j)}(window,window.angular);
\ No newline at end of file
+/*! angular-breadcrumb - v0.5.2
+* http://ncuillery.github.io/angular-breadcrumb
+* Copyright (c) 2016 Nicolas Cuillery; Licensed MIT */
+!function(a,b,c){"use strict";function d(a,c){return b.equals(a.length,c.length)?a>c:a.length>c.length}function e(a){var b=a.replace(/\n/g," ").match(/^([^(]+?)\s*(\((.*)\))?$/);if(!b||4!==b.length)throw new Error("Invalid state ref '"+a+"'");return{state:b[1],paramExpr:b[3]||null}}function f(a,b,d,e){var f=k[a];f!==c&&f(),f=b.$on(d,e),k[a]=f}function g(){var a={prefixStateName:null,template:"bootstrap3",templateUrl:null,templateLast:"default",templateLastUrl:null,includeAbstract:!1};this.setOptions=function(c){b.extend(a,c)},this.$get=["$state","$stateParams","$rootScope",function(g,h,i){var j=i;f("$Breadcrumb.$viewContentLoaded",i,"$viewContentLoaded",function(a){!a.targetScope.ncyBreadcrumbIgnore&&d(a.targetScope.$id,j.$id)&&(j=a.targetScope)});var k=function(a){var b=a.parent||(/^(.+)\.[^.]+$/.exec(a.name)||[])[1],c="object"==typeof b;return c?b.name:b},l=function(b,c){for(var d,f,i=e(c),k=!1,l=!1,m=0,n=b.length;n>m;m+=1)if(b[m].name===i.state)return;d=g.get(i.state),d.ncyBreadcrumb&&(d.ncyBreadcrumb.force&&(k=!0),d.ncyBreadcrumb.skip&&(l=!0)),d["abstract"]&&!a.includeAbstract&&!k||l||(i.paramExpr&&(f=j.$eval(i.paramExpr)),d.ncyBreadcrumbLink=g.href(i.state,f||h||{}),d.ncyBreadcrumbStateRef=c,b.unshift(d))},m=function(a){var b=e(a),c=g.get(b.state);if(c.ncyBreadcrumb&&c.ncyBreadcrumb.parent){var d="function"==typeof c.ncyBreadcrumb.parent,f=d?c.ncyBreadcrumb.parent(j):c.ncyBreadcrumb.parent;if(f)return f}return k(c)},n=function(a){return a.resolvedValues={},a&&a.hasOwnProperty("$resolve")&&b.forEach(a.$resolve,function(b,c){a.resolvedValues[c]=b}),a};return{getTemplate:function(b){return a.templateUrl?null:b[a.template]?b[a.template]:a.template},getTemplateUrl:function(){return a.templateUrl},getTemplateLast:function(b){return a.templateLastUrl?null:b[a.templateLast]?b[a.templateLast]:a.templateLast},getTemplateLastUrl:function(){return a.templateLastUrl},getStatesChain:function(b){for(var c=[],d=g.$current.self.name;d;d=m(d))if(l(c,d),b&&c.length)return c;return a.prefixStateName&&l(c,a.prefixStateName),c},getLastStep:function(){var a=this.getStatesChain(!0);return a.length?a[0]:c},$getLastViewScope:function(){return j},$getValuesFromResolve:n}}]}function h(a,c,d){var e={bootstrap2:'',bootstrap3:'- {{step.ncyBreadcrumbLabel}}{{step.ncyBreadcrumbLabel}}
'};return{restrict:"AE",replace:!0,scope:{},template:c.getTemplate(e),templateUrl:c.getTemplateUrl(),link:{post:function(e){var g=[],h=function(){n(g),g=[];var d=c.$getLastViewScope();d=c.$resolveValues(d),e.steps=c.getStatesChain(),b.forEach(e.steps,function(b){if(b.ncyBreadcrumb&&b.ncyBreadcrumb.label){var c=a(b.ncyBreadcrumb.label);b.ncyBreadcrumbLabel=c(d),m(g,c,d,b)}else b.ncyBreadcrumbLabel=b.name})};f("BreadcrumbDirective.$viewContentLoaded",d,"$viewContentLoaded",function(a){a.targetScope.ncyBreadcrumbIgnore||h()}),h()}}}}function i(a,b,c){var d={"default":"{{ncyBreadcrumbLabel}}"};return{restrict:"A",scope:{},template:b.getTemplateLast(d),templateUrl:b.getTemplateLastUrl(),compile:function(d,e){var g=d.attr(e.$attr.ncyBreadcrumbLast);return g&&d.html(g),{post:function(d){var e=[],g=function(){n(e),e=[];var c=b.$getLastViewScope();c=b.$resolveValues(c);var f=b.getLastStep();if(f)if(d.ncyBreadcrumbLink=f.ncyBreadcrumbLink,f.ncyBreadcrumb&&f.ncyBreadcrumb.label){var g=a(f.ncyBreadcrumb.label);d.ncyBreadcrumbLabel=g(c),m(e,g,c,d)}else d.ncyBreadcrumbLabel=f.name};f("BreadcrumbLastDirective.$viewContentLoaded",c,"$viewContentLoaded",function(a){a.targetScope.ncyBreadcrumbIgnore||g()}),g()}}}}}function j(a,c,d){return{restrict:"A",scope:{},template:"{{ncyBreadcrumbChain}}",compile:function(e,g){var h=e.attr(g.$attr.ncyBreadcrumbText);h&&e.html(h);var i=e.attr(g.$attr.ncyBreadcrumbTextSeparator)||" / ";return{post:function(e){var g=[],h=function(a,c,d){b.forEach(l(c),function(b){var c=d.$watch(b,function(a,b){a!==b&&j()});a.push(c)})},j=function(){n(g),g=[];var d=c.$getLastViewScope();d=c.$resolveValues(d);var f=c.getStatesChain(),j=[];b.forEach(f,function(b){if(b.ncyBreadcrumb&&b.ncyBreadcrumb.label){var c=a(b.ncyBreadcrumb.label);j.push(c(d)),h(g,c,d)}else j.push(b.name)}),e.ncyBreadcrumbChain=j.join(i)};f("BreadcrumbTextDirective.$viewContentLoaded",d,"$viewContentLoaded",function(a){a.targetScope.ncyBreadcrumbIgnore||j()}),j()}}}}}var k={},l=function(a){if(a.expressions)return a.expressions;var c=[];return b.forEach(a.parts,function(a){b.isFunction(a)&&c.push(a.exp)}),c},m=function(a,c,d,e){b.forEach(l(c),function(b){var f=d.$watch(b,function(){e.ncyBreadcrumbLabel=c(d)});a.push(f)})},n=function(a){b.forEach(a,function(a){a()})};h.$inject=["$interpolate","$breadcrumb","$rootScope"],i.$inject=["$interpolate","$breadcrumb","$rootScope"],j.$inject=["$interpolate","$breadcrumb","$rootScope"],b.module("ncy-angular-breadcrumb",["ui.router.state"]).provider("$breadcrumb",g).directive("ncyBreadcrumb",h).directive("ncyBreadcrumbLast",i).directive("ncyBreadcrumbText",j)}(window,window.angular);
\ No newline at end of file
diff --git a/src/angular-breadcrumb.js b/src/angular-breadcrumb.js
index 696ec56..f4812b7 100644
--- a/src/angular-breadcrumb.js
+++ b/src/angular-breadcrumb.js
@@ -109,6 +109,17 @@ function $Breadcrumb() {
return $$parentState(conf);
};
+ var $getValuesFromResolve = function($scopeContext) {
+ $scopeContext.resolvedValues = {};
+ if($scopeContext && $scopeContext.hasOwnProperty('$resolve')) {
+ angular.forEach($scopeContext.$resolve, function(promise, key) {
+ $scopeContext.resolvedValues[key] = promise;
+ });
+ }
+
+ return $scopeContext;
+ };
+
return {
getTemplate: function(templates) {
@@ -169,7 +180,9 @@ function $Breadcrumb() {
$getLastViewScope: function() {
return $lastViewScope;
- }
+ },
+
+ $getValuesFromResolve: $getValuesFromResolve
};
}];
}
@@ -237,6 +250,8 @@ function BreadcrumbDirective($interpolate, $breadcrumb, $rootScope) {
labelWatchers = [];
var viewScope = $breadcrumb.$getLastViewScope();
+ viewScope = $breadcrumb.$resolveValues(viewScope);
+
scope.steps = $breadcrumb.getStatesChain();
angular.forEach(scope.steps, function (step) {
if (step.ncyBreadcrumb && step.ncyBreadcrumb.label) {
@@ -293,6 +308,7 @@ function BreadcrumbLastDirective($interpolate, $breadcrumb, $rootScope) {
labelWatchers = [];
var viewScope = $breadcrumb.$getLastViewScope();
+ viewScope = $breadcrumb.$resolveValues(viewScope);
var lastStep = $breadcrumb.getLastStep();
if(lastStep) {
scope.ncyBreadcrumbLink = lastStep.ncyBreadcrumbLink;
@@ -360,6 +376,7 @@ function BreadcrumbTextDirective($interpolate, $breadcrumb, $rootScope) {
labelWatchers = [];
var viewScope = $breadcrumb.$getLastViewScope();
+ viewScope = $breadcrumb.$resolveValues(viewScope);
var steps = $breadcrumb.getStatesChain();
var combinedLabels = [];
angular.forEach(steps, function (step) {