From 09dda3715d28657df272adf23fe3b0bcd5353c7d Mon Sep 17 00:00:00 2001 From: Muhammed Baderdien Date: Thu, 20 Jul 2017 12:14:51 +0200 Subject: [PATCH 1/6] Ensuring that nesting only starts from current navigated to id --- sample/angular-breadcrumb-0.5.1.zip | Bin 0 -> 5597 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 sample/angular-breadcrumb-0.5.1.zip diff --git a/sample/angular-breadcrumb-0.5.1.zip b/sample/angular-breadcrumb-0.5.1.zip new file mode 100644 index 0000000000000000000000000000000000000000..08959316f65b5698d66301aad9033859f527a08e GIT binary patch literal 5597 zcmb7|XEYp+(#97-^e$LLudDYGtQIVSL|MJ}Mf6@mSiSc|FNxlJNmdVwD2ouHvwEV3 zc=JE^(|hlE-*fKFhdF2FoZoz$c^(}I)+0&)0Pq-~*y5%RDJ5)WCjtOu&zmULx4)~qDj!Z1PmOIG8t}4UD@+hcyU!}SHwp1CD zl&VB(22Qdae~&Dkm}X;J*G!crZ#g{M@AiB0@HmZ$U1svUf{&40?-M_Dcl`G?%=7Cp zX1p{NGTf!v@dO;*9I9%_&kR%fUk_+`8GpsBclF65n`|H>`q@L2gXXgwDDgm^68Vd_CO)ZU5?S1O>|NOKgIdWNl%>}L13*H7DEj~~c*wk?nryxmGY z!%fw=hKxH6J_%JUW$u)rp_F2mnlc*2O^?J<8vdEyELpO2BdoUSACObGKL&?CtT8b} z4DS?Jqi5IRnI`8YH$KlyQQ1>V!t z0Bc_IcV((~{1}&YP=WBxnpgSxls@*R8H?JRbjL)k+smqtq33jWp?Ut>!fdeW4+`iF z$&dcfhs32iMhzFr*^^2adgcrmbt4W%GjKgq9+y{;%h<)XOUf*Qx1<<1n@RL=!t#Ez zXz8IIhWx_H6>3QP#=xM1Tvo?@46e>Gfy$hsxx=<4%8x%P0xfaC&S;m&CUF z1sdFZLDEOMe+Wu}U(L?a)ulXTIV!=_YiXodnCiP_VML1jH zJ>EX7NfdgnmKV`&D5(gSr)-fU5f)5XQC9aisoTD1Q5Vq&y)IVdg7Zq1ja5vQ=pr9q zFE{joT!~D?7PWXpO@6g87$n~Kc?i71i_)Bn^~kC+Ik(GRENzR4FD8E9Z#Hv^&zeWL z15rbs+cPw$ynZ&m#Mx9F<lGPmVvBFJfpM@W$8;q`BRkM_Es0!7L|b;J$sgTt)PvM9m``AD3h} z+k^HK1w5zh-6J9CJ-$n9b=y$=##;LmrnsoaHBNVIlJT84`)b24dk zdSdh7ivI~xO?;)7d(o`Z!Gg18?-x3R>RQmtC^?Usubfh4D~Q{6993Q%r}-n5 zC+Bx0IWcX0jh(OFT;#%J?0Jm!y)1+?u@APL4b#_n#XM}Wk7y|E^(=^{*uZIPXw_i9 zXm|^%j`-56HlkqhA;{lhZnF7}wll9|rK$^{Q8+H%*W?LGhBCM%Xya0BY^HwKZZ88< zae_U@TKwvZP7Drf+tT>uOHnW%{mbx=VygVh;-SvyZ7fKg22el*Z!9FUh1dGW&sw&m z6F-xY9;EuY{S26bk-^rQf>OQD){7rxv}IN!3RMCqlhMz_QXp+m8)k9l z_N3>B(tozbsAfUwzM5CA&7W{Q5#<+Ns?m2N8^SUE9$Dd+k-Ol@;S#rS)YFSTrd4Ed zVOV}gk9aoF!x03#-3p&B&tc5syZ6`O!G{frSF8K z`_aL>4*d=71xMj;`;4Uq<8gXlX%@<3QP2qQrW4U7*LxgJJ-egAZ>c)Nzh%;Swx1rV zSffUMve{k|t=bYlW!%w?3$8Sb4bLKwbk|aGr;&%OHiAa(-r_&R4j+<#vC=L^2&8cl z#ZwI`P4@$2!|%9NLM2Ze)J}=iRj`YyqT``_wbqg9t5&(V<$h2P@`AXsXsWPCMVrf> z33;BFD=G^4$}`jOpX#w*6SFPY_8CUSNGxEvPU#;fV@9BVZ@F;IChq!W+PWj( zkHS~xN5zV?mv8Aj!NIQM=<&3!OhR|N@i(bXU$y*f8S0Z$$D;@t-=w4D4cXc*TG^WC z^fOB(d$R`%KQA_x2*VSk(vGNG>eew9xNoPV_pw$!)%7v z-+;SQZsfe5VkP0Er<|#_IGnJ=ravJ zEj|XOo(%m&S-yL!DZ}mWQDpMO{7yB}+D)JihR#|+@|gGNLrMan-jpsB5Ao~vGU+CxKR-`h`eWG`+~te$&&3si4JlcbXce8x2+dvNi=2lT?B(^Np_D`x+(}X3SLM+@-%}sit3-A5@JiPNSVg68=6?|94ZCD z+66`;Z0dp;*b?^z?GAsu^@bhJX|Vbd`Gj&%_eXJ-7p_*n=Dm@$ud|51&h)9)H%~7n zntk466(4XZd=i#TWRj5bhHNWIKWE_`=^mIAYse4VGAsS%xFx#j-iSUiOMaJ}Zv|$S zU5sM9sPD;Zo9v_zxjO|yGTPMzNQ7V3Lj+B6K z(p0&6yie5aiS5jhH7lf!1MU2z{#OII-PdlE5#+z@;Bnb;Ow>kv<+rvZGd<$h)x7{a z0bU(fbpDK| z-UiIf1%s8E+K>iiQ-%0?m6~3zJ~Hl2?W6S6T%ftNYmhhGsSgps=I^)rrTa>)B+?y{ z)$z$)EeE}Y)XuZ&GLBrYC6|{?s1-JbEQ5SUHsS2#8gl_4bm$$1|Zh7n~lMKOvxNHSZqiY9<%iqfA z(u+%^xtzRSmvZeEG-KZmb1;oL(rsW6=gsj|N%vJgJoLBCiGjrwwVEhF_&I-8FC7Sd zU6bk!czjEtCx`D?J)oq^f+gE>Y%L}U#Kirt;XJ*+_b*SMEKBYeb%)ep^)tre*!v)UpP4}uoQbpa=rMy;o3D4m6ghB7bxLiBFyF{=dOLAb{ zV<$I8saAlR8iHW4U&_qJ+xb-^>5t01@IShn?fipA#AQgkp$?*+2q&prj^UNZ;ZLRR z-v+bn^=l*-3e&27X_9K|>+8G8zDVD4n(#c(w?VY7YVfC-UZaxTS52NA)Kh~~J=kXl z?FU)u3w2Tncnx#6@H=a#e}V}SnjcsopeeF`YS1KXXOIO?U)ldx_{k#QTFXHDk;gnO zx%fck^DHQ%oi<03&?drsjq@OdiNI?26J_$@1#Zyq&#Pvu>%Z?1eeJMa%r%?fc2gTe zoJ$1nco>N5;+wvHM)?Z^mV%lEXqLTrV7hFR(QN}+MO0?&r@#pQCHBCG1{3!UTVzv*)pua)NtaL=vAecb@Wr}I1wLU^Cj*`su-N%_ja z@-i(4P6-7`Kj3%Q+5&eJGVnz67_QghT;aTk80pl zbVPn#!t1Zsi*>x?vp6*2 zq9px$YTLJBSPpAv=Z~8vGoCAw&v$2vdSU_j`VUCapr_^jftef)X@U8|7T0iPODFpd zTy{CWoKhp4)tvcvQDJCUA6~jBMKzVboSv~pq1t`CA+O0yDyiY(Jmc}cM<#U|0Q2QtUb1_9n~sG|vL;Po)dTA0XM`2=G9xeuqg?Uhtv98UWdKnhD0G+hDA6!A z2HX*w`~t&rP5}?Ip%QV4A@2QJ$@<=_Xo0O5w%;*!^!b_T43O~C?()DSO?k#KLpqtM zz^*ePg8Ile=h3DPn2Cdx*#9%Lzc?r)q~c_Y*_rr8<}yZKWIBMwH|_T>)p+&I4dC_{2r%hR8o+A2k|r!7U8r0 zY;I*zOf^rW61w0ggUfN=XS@$}7zkI{%=7*Ao_u889PNcTJy{F@#x+=cxcrd>tM>z% zr`p*Z^(&M`Z`dPPtE;|U#ORfMG#5!V*PVXpcOKjuaMlFpBQ{gg)?KqGTF!24Njt@# zbp1@JBGutGHaPR(RmOgk9@U&*!akvI05y((OD)ad?pQv2inqF5x@e@@iFr^X@%n-? z_R$w2X~GDQ7M|d`t?T>Os@Pr*b`umH(fy{)%h@-n><%b>1Gqy4Iskb%46~5au&}k~ zB$E}(S7|>m2x5R-b8jp^DU+XMuGlY(-*-SDg}-q4lt4sJT41etEBY7$`zkVcJfPD>FBw zC2NYO)-F~JmEfd$$3I?opf+b31<7+-lEs#8%&0lP96j1H|BnwZu-;WC)hdP9 zDx*nVOtlmi&ji8+=_5&X_>4(CL*(8^rik)c1f?uie8f8qaInd%&W%3kdHzm30*fme zFci=zV>Sr@MR`#daltWcu!f+>+n)CT-4pcH=g|jFOF|-=0lI`|bXP|hH+H1?igPI# z3g`4nq{-3+WK?3&2r0te7$EIm&7m>(BNh#b5B8mrDeiX7wD*93QQs6{slj9qV)@5X zAQY6I+=xhR4JwzL-z5Q;Af1fece!zHUC{L@zT*D*7z9A3+&{I40VA!yeD0ObNkq?OnzV%v()iGAFES zn=aXrBHZpc5WTp6L zMqbY4q0&BJlKCRuXz}r7n9m;-(o{a4vh;Fnni}_B$C!2Tv^+)><1%sMW_yt+bwBWN z=@fy_7z>MhebIW-D5K$Jy5`+^?A*hB|&i?ni{}1tB?AL$o*Z+q7uP;Ccf{pVJ1M_e8{H+9k{|Nx#e*mWIaqs{D literal 0 HcmV?d00001 From da5ccbf45285004c02d73d1833dcaab5abb9d71a Mon Sep 17 00:00:00 2001 From: Muhammed Baderdien Date: Thu, 20 Jul 2017 12:15:02 +0200 Subject: [PATCH 2/6] Ensuring that nesting only starts from current navigated to id closes --- CHANGELOG.md | 6 +++ bower.json | 2 +- dist/angular-breadcrumb.js | 61 +++++++++++++++++++++------- dist/angular-breadcrumb.min.js | 4 +- package.json | 2 +- release/angular-breadcrumb.js | 61 +++++++++++++++++++++------- release/angular-breadcrumb.min.js | 4 +- sample/angular-breadcrumb-0.5.0.zip | Bin 6241 -> 0 bytes 8 files changed, 106 insertions(+), 34 deletions(-) delete mode 100644 sample/angular-breadcrumb-0.5.0.zip diff --git a/CHANGELOG.md b/CHANGELOG.md index 7fa0e4f..b2f8e9c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ + +## 0.5.1 (2017-07-20) + +#### Bug Fixes +* Ensuring that nesting only starts from current navigated to id closes [#159] + ## 0.5.0 (2016-11-14) diff --git a/bower.json b/bower.json index 96b52f5..eb991c9 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.3", "main": "release/angular-breadcrumb.js", "ignore": [ "sample", diff --git a/dist/angular-breadcrumb.js b/dist/angular-breadcrumb.js index 53d025d..925beed 100644 --- a/dist/angular-breadcrumb.js +++ b/dist/angular-breadcrumb.js @@ -1,4 +1,4 @@ -/*! angular-breadcrumb - v0.4.1-dev-2016-04-12 +/*! angular-breadcrumb - v0.5.1 * http://ncuillery.github.io/angular-breadcrumb * Copyright (c) 2016 Nicolas Cuillery; Licensed MIT */ @@ -37,7 +37,8 @@ function $Breadcrumb() { templateUrl: null, templateLast: 'default', templateLastUrl: null, - includeAbstract : false + includeAbstract: false, + useRootParams: false }; this.setOptions = function(options) { @@ -148,12 +149,42 @@ function $Breadcrumb() { return $$options.templateLastUrl; }, - getStatesChain: function(exitOnFirst) { // Deliberately undocumented param, see getLastStep + getStatesChain: function (exitOnFirst, $routeParams) { // Deliberately undocumented param, see getLastStep var chain = []; + //Ensuring that nesting only starts from current navigated to id + var startInsertingChain = false; + // From current state to the root - for(var stateRef = $state.$current.self.name; stateRef; stateRef=$$breadcrumbParentState(stateRef)) { - $$addStateInChain(chain, stateRef); + for (var stateRef = $state.$current.self.name; stateRef; stateRef = $$breadcrumbParentState(stateRef)) { + + if ($routeParams && $routeParams.id && $$options.useRootParams ) { + + //Ensuring that nesting only starts from current navigated to id + + var ref = parseStateRef(stateRef), + conf = $state.get(ref.state); + + var getCurrentURLState = $state.get('myReportsNew.' + $routeParams.id); + + if (conf.ncyBreadcrumb && conf.ncyBreadcrumb.parent) { + + if (conf.ncyBreadcrumb.parent == getCurrentURLState.ncyBreadcrumb.parent) { + startInsertingChain = true; + } + + if (startInsertingChain) { + $$addStateInChain(chain, stateRef); + } + } + else { + $$addStateInChain(chain, stateRef); + } + } + else { + $$addStateInChain(chain, stateRef); + } + if(exitOnFirst && chain.length) { return chain; } @@ -168,7 +199,7 @@ function $Breadcrumb() { }, getLastStep: function() { - var chain = this.getStatesChain(true); + var chain = this.getStatesChain(true, $routeParams); return chain.length ? chain[0] : undefined; }, @@ -210,7 +241,7 @@ var deregisterWatchers = function(labelWatcherArray) { }); }; -function BreadcrumbDirective($interpolate, $breadcrumb, $rootScope) { +function BreadcrumbDirective($interpolate, $breadcrumb, $rootScope, $routeParams) { var $$templates = { bootstrap2: '
    ' + '
  • ' + @@ -242,7 +273,8 @@ function BreadcrumbDirective($interpolate, $breadcrumb, $rootScope) { labelWatchers = []; var viewScope = $breadcrumb.$getLastViewScope(); - scope.steps = $breadcrumb.getStatesChain(); + + scope.steps = $breadcrumb.getStatesChain(false, $routeParams); angular.forEach(scope.steps, function (step) { if (step.ncyBreadcrumb && step.ncyBreadcrumb.label) { var parseLabel = $interpolate(step.ncyBreadcrumb.label); @@ -267,9 +299,10 @@ function BreadcrumbDirective($interpolate, $breadcrumb, $rootScope) { } }; } -BreadcrumbDirective.$inject = ['$interpolate', '$breadcrumb', '$rootScope']; -function BreadcrumbLastDirective($interpolate, $breadcrumb, $rootScope) { +BreadcrumbDirective.$inject = ['$interpolate', '$breadcrumb', '$rootScope', '$routeParams']; + +function BreadcrumbLastDirective($interpolate, $breadcrumb, $rootScope, $routeParams) { var $$templates = { 'default': '{{ncyBreadcrumbLabel}}' }; @@ -327,9 +360,9 @@ function BreadcrumbLastDirective($interpolate, $breadcrumb, $rootScope) { } }; } -BreadcrumbLastDirective.$inject = ['$interpolate', '$breadcrumb', '$rootScope']; +BreadcrumbLastDirective.$inject = ['$interpolate', '$breadcrumb', '$rootScope', '$routeParams']; -function BreadcrumbTextDirective($interpolate, $breadcrumb, $rootScope) { +function BreadcrumbTextDirective($interpolate, $breadcrumb, $rootScope, $routeParams) { return { restrict: 'A', @@ -365,7 +398,7 @@ function BreadcrumbTextDirective($interpolate, $breadcrumb, $rootScope) { labelWatchers = []; var viewScope = $breadcrumb.$getLastViewScope(); - var steps = $breadcrumb.getStatesChain(); + var steps = $breadcrumb.getStatesChain(false, $routeParams); var combinedLabels = []; angular.forEach(steps, function (step) { if (step.ncyBreadcrumb && step.ncyBreadcrumb.label) { @@ -395,7 +428,7 @@ function BreadcrumbTextDirective($interpolate, $breadcrumb, $rootScope) { } }; } -BreadcrumbTextDirective.$inject = ['$interpolate', '$breadcrumb', '$rootScope']; +BreadcrumbTextDirective.$inject = ['$interpolate', '$breadcrumb', '$rootScope', '$routeParams']; angular.module('ncy-angular-breadcrumb', ['ui.router.state']) .provider('$breadcrumb', $Breadcrumb) diff --git a/dist/angular-breadcrumb.min.js b/dist/angular-breadcrumb.min.js index e91e05e..5856fd5 100644 --- a/dist/angular-breadcrumb.min.js +++ b/dist/angular-breadcrumb.min.js @@ -1,4 +1,4 @@ -/*! angular-breadcrumb - v0.4.1-dev-2016-04-12 +/*! angular-breadcrumb - v0.5.1 * 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:'
    1. {{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 +!function(e,t,r){"use strict";function a(e,r){return t.equals(e.length,r.length)?e>r:e.length>r.length}function n(e){var t=e.replace(/\n/g," ").match(/^([^(]+?)\s*(\((.*)\))?$/);if(!t||4!==t.length)throw new Error("Invalid state ref '"+e+"'");return{state:t[1],paramExpr:t[3]||null}}function c(e,t,a,n){var c=l[e];c!==r&&c(),c=t.$on(a,n),l[e]=c}function u(){var e={prefixStateName:null,template:"bootstrap3",templateUrl:null,templateLast:"default",templateLastUrl:null,includeAbstract:!1,useRootParams:!1};this.setOptions=function(r){t.extend(e,r)},this.$get=["$state","$stateParams","$rootScope",function(t,u,i){var o=i;c("$Breadcrumb.$viewContentLoaded",i,"$viewContentLoaded",function(e){!e.targetScope.ncyBreadcrumbIgnore&&a(e.targetScope.$id,o.$id)&&(o=e.targetScope)});var s=function(e){var t=e.parent||(/^(.+)\.[^.]+$/.exec(e.name)||[])[1],r="object"==typeof t;return r?t.name:t},l=function(r,a){for(var c,i,s=n(a),l=!1,m=!1,p=0,d=r.length;d>p;p+=1)if(r[p].name===s.state)return;c=t.get(s.state),c.ncyBreadcrumb&&(c.ncyBreadcrumb.force&&(l=!0),c.ncyBreadcrumb.skip&&(m=!0)),c["abstract"]&&!e.includeAbstract&&!l||m||(s.paramExpr&&(i=o.$eval(s.paramExpr)),c.ncyBreadcrumbLink=t.href(s.state,i||u||{}),c.ncyBreadcrumbStateRef=a,r.unshift(c))},m=function(e){var r=n(e),a=t.get(r.state);if(a.ncyBreadcrumb&&a.ncyBreadcrumb.parent){var c="function"==typeof a.ncyBreadcrumb.parent,u=c?a.ncyBreadcrumb.parent(o):a.ncyBreadcrumb.parent;if(u)return u}return s(a)};return{getTemplate:function(t){return e.templateUrl?null:t[e.template]?t[e.template]:e.template},getTemplateUrl:function(){return e.templateUrl},getTemplateLast:function(t){return e.templateLastUrl?null:t[e.templateLast]?t[e.templateLast]:e.templateLast},getTemplateLastUrl:function(){return e.templateLastUrl},getStatesChain:function(r,a){for(var c=[],u=!1,i=t.$current.self.name;i;i=m(i)){if(a&&a.id&&e.useRootParams){var o=n(i),s=t.get(o.state),p=t.get("myReportsNew."+a.id);s.ncyBreadcrumb&&s.ncyBreadcrumb.parent?(s.ncyBreadcrumb.parent==p.ncyBreadcrumb.parent&&(u=!0),u&&l(c,i)):l(c,i)}else l(c,i);if(r&&c.length)return c}return e.prefixStateName&&l(c,e.prefixStateName),c},getLastStep:function(){var e=this.getStatesChain(!0,$routeParams);return e.length?e[0]:r},$getLastViewScope:function(){return o}}}]}function i(e,r,a,n){var u={bootstrap2:'',bootstrap3:'
    1. {{step.ncyBreadcrumbLabel}}{{step.ncyBreadcrumbLabel}}
    '};return{restrict:"AE",replace:!0,scope:{},template:r.getTemplate(u),templateUrl:r.getTemplateUrl(),link:{post:function(u){var i=[],o=function(){d(i),i=[];var a=r.$getLastViewScope();u.steps=r.getStatesChain(!1,n),t.forEach(u.steps,function(t){if(t.ncyBreadcrumb&&t.ncyBreadcrumb.label){var r=e(t.ncyBreadcrumb.label);t.ncyBreadcrumbLabel=r(a),p(i,r,a,t)}else t.ncyBreadcrumbLabel=t.name})};c("BreadcrumbDirective.$viewContentLoaded",a,"$viewContentLoaded",function(e){e.targetScope.ncyBreadcrumbIgnore||o()}),o()}}}}function o(e,t,r,a){var n={"default":"{{ncyBreadcrumbLabel}}"};return{restrict:"A",scope:{},template:t.getTemplateLast(n),templateUrl:t.getTemplateLastUrl(),compile:function(a,n){var u=a.attr(n.$attr.ncyBreadcrumbLast);return u&&a.html(u),{post:function(a){var n=[],u=function(){d(n),n=[];var r=t.$getLastViewScope(),c=t.getLastStep();if(c)if(a.ncyBreadcrumbLink=c.ncyBreadcrumbLink,c.ncyBreadcrumb&&c.ncyBreadcrumb.label){var u=e(c.ncyBreadcrumb.label);a.ncyBreadcrumbLabel=u(r),p(n,u,r,a)}else a.ncyBreadcrumbLabel=c.name};c("BreadcrumbLastDirective.$viewContentLoaded",r,"$viewContentLoaded",function(e){e.targetScope.ncyBreadcrumbIgnore||u()}),u()}}}}}function s(e,r,a,n){return{restrict:"A",scope:{},template:"{{ncyBreadcrumbChain}}",compile:function(u,i){var o=u.attr(i.$attr.ncyBreadcrumbText);o&&u.html(o);var s=u.attr(i.$attr.ncyBreadcrumbTextSeparator)||" / ";return{post:function(u){var i=[],o=function(e,r,a){t.forEach(m(r),function(t){var r=a.$watch(t,function(e,t){e!==t&&l()});e.push(r)})},l=function(){d(i),i=[];var a=r.$getLastViewScope(),c=r.getStatesChain(!1,n),l=[];t.forEach(c,function(t){if(t.ncyBreadcrumb&&t.ncyBreadcrumb.label){var r=e(t.ncyBreadcrumb.label);l.push(r(a)),o(i,r,a)}else l.push(t.name)}),u.ncyBreadcrumbChain=l.join(s)};c("BreadcrumbTextDirective.$viewContentLoaded",a,"$viewContentLoaded",function(e){e.targetScope.ncyBreadcrumbIgnore||l()}),l()}}}}}var l={},m=function(e){if(e.expressions)return e.expressions;var r=[];return t.forEach(e.parts,function(e){t.isFunction(e)&&r.push(e.exp)}),r},p=function(e,r,a,n){t.forEach(m(r),function(t){var c=a.$watch(t,function(){n.ncyBreadcrumbLabel=r(a)});e.push(c)})},d=function(e){t.forEach(e,function(e){e()})};i.$inject=["$interpolate","$breadcrumb","$rootScope","$routeParams"],o.$inject=["$interpolate","$breadcrumb","$rootScope","$routeParams"],s.$inject=["$interpolate","$breadcrumb","$rootScope","$routeParams"],t.module("ncy-angular-breadcrumb",["ui.router.state"]).provider("$breadcrumb",u).directive("ncyBreadcrumb",i).directive("ncyBreadcrumbLast",o).directive("ncyBreadcrumbText",s)}(window,window.angular); \ No newline at end of file diff --git a/package.json b/package.json index 6f773eb..e8540da 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.1", "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..925beed 100644 --- a/release/angular-breadcrumb.js +++ b/release/angular-breadcrumb.js @@ -1,4 +1,4 @@ -/*! angular-breadcrumb - v0.5.0 +/*! angular-breadcrumb - v0.5.1 * http://ncuillery.github.io/angular-breadcrumb * Copyright (c) 2016 Nicolas Cuillery; Licensed MIT */ @@ -37,7 +37,8 @@ function $Breadcrumb() { templateUrl: null, templateLast: 'default', templateLastUrl: null, - includeAbstract : false + includeAbstract: false, + useRootParams: false }; this.setOptions = function(options) { @@ -148,12 +149,42 @@ function $Breadcrumb() { return $$options.templateLastUrl; }, - getStatesChain: function(exitOnFirst) { // Deliberately undocumented param, see getLastStep + getStatesChain: function (exitOnFirst, $routeParams) { // Deliberately undocumented param, see getLastStep var chain = []; + //Ensuring that nesting only starts from current navigated to id + var startInsertingChain = false; + // From current state to the root - for(var stateRef = $state.$current.self.name; stateRef; stateRef=$$breadcrumbParentState(stateRef)) { - $$addStateInChain(chain, stateRef); + for (var stateRef = $state.$current.self.name; stateRef; stateRef = $$breadcrumbParentState(stateRef)) { + + if ($routeParams && $routeParams.id && $$options.useRootParams ) { + + //Ensuring that nesting only starts from current navigated to id + + var ref = parseStateRef(stateRef), + conf = $state.get(ref.state); + + var getCurrentURLState = $state.get('myReportsNew.' + $routeParams.id); + + if (conf.ncyBreadcrumb && conf.ncyBreadcrumb.parent) { + + if (conf.ncyBreadcrumb.parent == getCurrentURLState.ncyBreadcrumb.parent) { + startInsertingChain = true; + } + + if (startInsertingChain) { + $$addStateInChain(chain, stateRef); + } + } + else { + $$addStateInChain(chain, stateRef); + } + } + else { + $$addStateInChain(chain, stateRef); + } + if(exitOnFirst && chain.length) { return chain; } @@ -168,7 +199,7 @@ function $Breadcrumb() { }, getLastStep: function() { - var chain = this.getStatesChain(true); + var chain = this.getStatesChain(true, $routeParams); return chain.length ? chain[0] : undefined; }, @@ -210,7 +241,7 @@ var deregisterWatchers = function(labelWatcherArray) { }); }; -function BreadcrumbDirective($interpolate, $breadcrumb, $rootScope) { +function BreadcrumbDirective($interpolate, $breadcrumb, $rootScope, $routeParams) { var $$templates = { bootstrap2: '
      ' + '
    • ' + @@ -242,7 +273,8 @@ function BreadcrumbDirective($interpolate, $breadcrumb, $rootScope) { labelWatchers = []; var viewScope = $breadcrumb.$getLastViewScope(); - scope.steps = $breadcrumb.getStatesChain(); + + scope.steps = $breadcrumb.getStatesChain(false, $routeParams); angular.forEach(scope.steps, function (step) { if (step.ncyBreadcrumb && step.ncyBreadcrumb.label) { var parseLabel = $interpolate(step.ncyBreadcrumb.label); @@ -267,9 +299,10 @@ function BreadcrumbDirective($interpolate, $breadcrumb, $rootScope) { } }; } -BreadcrumbDirective.$inject = ['$interpolate', '$breadcrumb', '$rootScope']; -function BreadcrumbLastDirective($interpolate, $breadcrumb, $rootScope) { +BreadcrumbDirective.$inject = ['$interpolate', '$breadcrumb', '$rootScope', '$routeParams']; + +function BreadcrumbLastDirective($interpolate, $breadcrumb, $rootScope, $routeParams) { var $$templates = { 'default': '{{ncyBreadcrumbLabel}}' }; @@ -327,9 +360,9 @@ function BreadcrumbLastDirective($interpolate, $breadcrumb, $rootScope) { } }; } -BreadcrumbLastDirective.$inject = ['$interpolate', '$breadcrumb', '$rootScope']; +BreadcrumbLastDirective.$inject = ['$interpolate', '$breadcrumb', '$rootScope', '$routeParams']; -function BreadcrumbTextDirective($interpolate, $breadcrumb, $rootScope) { +function BreadcrumbTextDirective($interpolate, $breadcrumb, $rootScope, $routeParams) { return { restrict: 'A', @@ -365,7 +398,7 @@ function BreadcrumbTextDirective($interpolate, $breadcrumb, $rootScope) { labelWatchers = []; var viewScope = $breadcrumb.$getLastViewScope(); - var steps = $breadcrumb.getStatesChain(); + var steps = $breadcrumb.getStatesChain(false, $routeParams); var combinedLabels = []; angular.forEach(steps, function (step) { if (step.ncyBreadcrumb && step.ncyBreadcrumb.label) { @@ -395,7 +428,7 @@ function BreadcrumbTextDirective($interpolate, $breadcrumb, $rootScope) { } }; } -BreadcrumbTextDirective.$inject = ['$interpolate', '$breadcrumb', '$rootScope']; +BreadcrumbTextDirective.$inject = ['$interpolate', '$breadcrumb', '$rootScope', '$routeParams']; angular.module('ncy-angular-breadcrumb', ['ui.router.state']) .provider('$breadcrumb', $Breadcrumb) diff --git a/release/angular-breadcrumb.min.js b/release/angular-breadcrumb.min.js index 1f3a44b..5856fd5 100644 --- a/release/angular-breadcrumb.min.js +++ b/release/angular-breadcrumb.min.js @@ -1,4 +1,4 @@ -/*! angular-breadcrumb - v0.5.0 +/*! angular-breadcrumb - v0.5.1 * 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:'
      1. {{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 +!function(e,t,r){"use strict";function a(e,r){return t.equals(e.length,r.length)?e>r:e.length>r.length}function n(e){var t=e.replace(/\n/g," ").match(/^([^(]+?)\s*(\((.*)\))?$/);if(!t||4!==t.length)throw new Error("Invalid state ref '"+e+"'");return{state:t[1],paramExpr:t[3]||null}}function c(e,t,a,n){var c=l[e];c!==r&&c(),c=t.$on(a,n),l[e]=c}function u(){var e={prefixStateName:null,template:"bootstrap3",templateUrl:null,templateLast:"default",templateLastUrl:null,includeAbstract:!1,useRootParams:!1};this.setOptions=function(r){t.extend(e,r)},this.$get=["$state","$stateParams","$rootScope",function(t,u,i){var o=i;c("$Breadcrumb.$viewContentLoaded",i,"$viewContentLoaded",function(e){!e.targetScope.ncyBreadcrumbIgnore&&a(e.targetScope.$id,o.$id)&&(o=e.targetScope)});var s=function(e){var t=e.parent||(/^(.+)\.[^.]+$/.exec(e.name)||[])[1],r="object"==typeof t;return r?t.name:t},l=function(r,a){for(var c,i,s=n(a),l=!1,m=!1,p=0,d=r.length;d>p;p+=1)if(r[p].name===s.state)return;c=t.get(s.state),c.ncyBreadcrumb&&(c.ncyBreadcrumb.force&&(l=!0),c.ncyBreadcrumb.skip&&(m=!0)),c["abstract"]&&!e.includeAbstract&&!l||m||(s.paramExpr&&(i=o.$eval(s.paramExpr)),c.ncyBreadcrumbLink=t.href(s.state,i||u||{}),c.ncyBreadcrumbStateRef=a,r.unshift(c))},m=function(e){var r=n(e),a=t.get(r.state);if(a.ncyBreadcrumb&&a.ncyBreadcrumb.parent){var c="function"==typeof a.ncyBreadcrumb.parent,u=c?a.ncyBreadcrumb.parent(o):a.ncyBreadcrumb.parent;if(u)return u}return s(a)};return{getTemplate:function(t){return e.templateUrl?null:t[e.template]?t[e.template]:e.template},getTemplateUrl:function(){return e.templateUrl},getTemplateLast:function(t){return e.templateLastUrl?null:t[e.templateLast]?t[e.templateLast]:e.templateLast},getTemplateLastUrl:function(){return e.templateLastUrl},getStatesChain:function(r,a){for(var c=[],u=!1,i=t.$current.self.name;i;i=m(i)){if(a&&a.id&&e.useRootParams){var o=n(i),s=t.get(o.state),p=t.get("myReportsNew."+a.id);s.ncyBreadcrumb&&s.ncyBreadcrumb.parent?(s.ncyBreadcrumb.parent==p.ncyBreadcrumb.parent&&(u=!0),u&&l(c,i)):l(c,i)}else l(c,i);if(r&&c.length)return c}return e.prefixStateName&&l(c,e.prefixStateName),c},getLastStep:function(){var e=this.getStatesChain(!0,$routeParams);return e.length?e[0]:r},$getLastViewScope:function(){return o}}}]}function i(e,r,a,n){var u={bootstrap2:'',bootstrap3:'
      1. {{step.ncyBreadcrumbLabel}}{{step.ncyBreadcrumbLabel}}
      '};return{restrict:"AE",replace:!0,scope:{},template:r.getTemplate(u),templateUrl:r.getTemplateUrl(),link:{post:function(u){var i=[],o=function(){d(i),i=[];var a=r.$getLastViewScope();u.steps=r.getStatesChain(!1,n),t.forEach(u.steps,function(t){if(t.ncyBreadcrumb&&t.ncyBreadcrumb.label){var r=e(t.ncyBreadcrumb.label);t.ncyBreadcrumbLabel=r(a),p(i,r,a,t)}else t.ncyBreadcrumbLabel=t.name})};c("BreadcrumbDirective.$viewContentLoaded",a,"$viewContentLoaded",function(e){e.targetScope.ncyBreadcrumbIgnore||o()}),o()}}}}function o(e,t,r,a){var n={"default":"{{ncyBreadcrumbLabel}}"};return{restrict:"A",scope:{},template:t.getTemplateLast(n),templateUrl:t.getTemplateLastUrl(),compile:function(a,n){var u=a.attr(n.$attr.ncyBreadcrumbLast);return u&&a.html(u),{post:function(a){var n=[],u=function(){d(n),n=[];var r=t.$getLastViewScope(),c=t.getLastStep();if(c)if(a.ncyBreadcrumbLink=c.ncyBreadcrumbLink,c.ncyBreadcrumb&&c.ncyBreadcrumb.label){var u=e(c.ncyBreadcrumb.label);a.ncyBreadcrumbLabel=u(r),p(n,u,r,a)}else a.ncyBreadcrumbLabel=c.name};c("BreadcrumbLastDirective.$viewContentLoaded",r,"$viewContentLoaded",function(e){e.targetScope.ncyBreadcrumbIgnore||u()}),u()}}}}}function s(e,r,a,n){return{restrict:"A",scope:{},template:"{{ncyBreadcrumbChain}}",compile:function(u,i){var o=u.attr(i.$attr.ncyBreadcrumbText);o&&u.html(o);var s=u.attr(i.$attr.ncyBreadcrumbTextSeparator)||" / ";return{post:function(u){var i=[],o=function(e,r,a){t.forEach(m(r),function(t){var r=a.$watch(t,function(e,t){e!==t&&l()});e.push(r)})},l=function(){d(i),i=[];var a=r.$getLastViewScope(),c=r.getStatesChain(!1,n),l=[];t.forEach(c,function(t){if(t.ncyBreadcrumb&&t.ncyBreadcrumb.label){var r=e(t.ncyBreadcrumb.label);l.push(r(a)),o(i,r,a)}else l.push(t.name)}),u.ncyBreadcrumbChain=l.join(s)};c("BreadcrumbTextDirective.$viewContentLoaded",a,"$viewContentLoaded",function(e){e.targetScope.ncyBreadcrumbIgnore||l()}),l()}}}}}var l={},m=function(e){if(e.expressions)return e.expressions;var r=[];return t.forEach(e.parts,function(e){t.isFunction(e)&&r.push(e.exp)}),r},p=function(e,r,a,n){t.forEach(m(r),function(t){var c=a.$watch(t,function(){n.ncyBreadcrumbLabel=r(a)});e.push(c)})},d=function(e){t.forEach(e,function(e){e()})};i.$inject=["$interpolate","$breadcrumb","$rootScope","$routeParams"],o.$inject=["$interpolate","$breadcrumb","$rootScope","$routeParams"],s.$inject=["$interpolate","$breadcrumb","$rootScope","$routeParams"],t.module("ncy-angular-breadcrumb",["ui.router.state"]).provider("$breadcrumb",u).directive("ncyBreadcrumb",i).directive("ncyBreadcrumbLast",o).directive("ncyBreadcrumbText",s)}(window,window.angular); \ No newline at end of file diff --git a/sample/angular-breadcrumb-0.5.0.zip b/sample/angular-breadcrumb-0.5.0.zip deleted file mode 100644 index 985e4bcfb287a1fc85a79db9060b25f41de63812..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6241 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 WLrv)e+&@oY{!Yx_vk(8D+y4NQ3*gNF From 874e5e04bc5fa0807cd9f2a72328334127debeca Mon Sep 17 00:00:00 2001 From: Muhammed Baderdien Date: Thu, 20 Jul 2017 12:48:59 +0200 Subject: [PATCH 3/6] Bug on this change below --- CHANGELOG.md | 6 ++++++ bower.json | 2 +- dist/angular-breadcrumb.js | 4 ++-- dist/angular-breadcrumb.min.js | 4 ++-- package.json | 2 +- release/angular-breadcrumb.js | 4 ++-- release/angular-breadcrumb.min.js | 4 ++-- sample/angular-breadcrumb-0.5.1.zip | Bin 5597 -> 0 bytes sample/angular-breadcrumb-0.5.2.zip | Bin 0 -> 5933 bytes 9 files changed, 16 insertions(+), 10 deletions(-) delete mode 100644 sample/angular-breadcrumb-0.5.1.zip create mode 100644 sample/angular-breadcrumb-0.5.2.zip diff --git a/CHANGELOG.md b/CHANGELOG.md index b2f8e9c..435945c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ + +## 0.5.2 (2017-07-20) + +#### Bug Fixes +* Ensuring that nesting only starts from current navigated to id closes [#159] - Bug on this change below + ## 0.5.1 (2017-07-20) diff --git a/bower.json b/bower.json index eb991c9..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.3", + "version": "0.5.2", "main": "release/angular-breadcrumb.js", "ignore": [ "sample", diff --git a/dist/angular-breadcrumb.js b/dist/angular-breadcrumb.js index 925beed..c9e94a9 100644 --- a/dist/angular-breadcrumb.js +++ b/dist/angular-breadcrumb.js @@ -1,4 +1,4 @@ -/*! angular-breadcrumb - v0.5.1 +/*! angular-breadcrumb - v0.5.2 * http://ncuillery.github.io/angular-breadcrumb * Copyright (c) 2016 Nicolas Cuillery; Licensed MIT */ @@ -167,7 +167,7 @@ function $Breadcrumb() { var getCurrentURLState = $state.get('myReportsNew.' + $routeParams.id); - if (conf.ncyBreadcrumb && conf.ncyBreadcrumb.parent) { + if (conf && conf.ncyBreadcrumb && conf.ncyBreadcrumb.parent) { if (conf.ncyBreadcrumb.parent == getCurrentURLState.ncyBreadcrumb.parent) { startInsertingChain = true; diff --git a/dist/angular-breadcrumb.min.js b/dist/angular-breadcrumb.min.js index 5856fd5..693045b 100644 --- a/dist/angular-breadcrumb.min.js +++ b/dist/angular-breadcrumb.min.js @@ -1,4 +1,4 @@ -/*! angular-breadcrumb - v0.5.1 +/*! angular-breadcrumb - v0.5.2 * http://ncuillery.github.io/angular-breadcrumb * Copyright (c) 2016 Nicolas Cuillery; Licensed MIT */ -!function(e,t,r){"use strict";function a(e,r){return t.equals(e.length,r.length)?e>r:e.length>r.length}function n(e){var t=e.replace(/\n/g," ").match(/^([^(]+?)\s*(\((.*)\))?$/);if(!t||4!==t.length)throw new Error("Invalid state ref '"+e+"'");return{state:t[1],paramExpr:t[3]||null}}function c(e,t,a,n){var c=l[e];c!==r&&c(),c=t.$on(a,n),l[e]=c}function u(){var e={prefixStateName:null,template:"bootstrap3",templateUrl:null,templateLast:"default",templateLastUrl:null,includeAbstract:!1,useRootParams:!1};this.setOptions=function(r){t.extend(e,r)},this.$get=["$state","$stateParams","$rootScope",function(t,u,i){var o=i;c("$Breadcrumb.$viewContentLoaded",i,"$viewContentLoaded",function(e){!e.targetScope.ncyBreadcrumbIgnore&&a(e.targetScope.$id,o.$id)&&(o=e.targetScope)});var s=function(e){var t=e.parent||(/^(.+)\.[^.]+$/.exec(e.name)||[])[1],r="object"==typeof t;return r?t.name:t},l=function(r,a){for(var c,i,s=n(a),l=!1,m=!1,p=0,d=r.length;d>p;p+=1)if(r[p].name===s.state)return;c=t.get(s.state),c.ncyBreadcrumb&&(c.ncyBreadcrumb.force&&(l=!0),c.ncyBreadcrumb.skip&&(m=!0)),c["abstract"]&&!e.includeAbstract&&!l||m||(s.paramExpr&&(i=o.$eval(s.paramExpr)),c.ncyBreadcrumbLink=t.href(s.state,i||u||{}),c.ncyBreadcrumbStateRef=a,r.unshift(c))},m=function(e){var r=n(e),a=t.get(r.state);if(a.ncyBreadcrumb&&a.ncyBreadcrumb.parent){var c="function"==typeof a.ncyBreadcrumb.parent,u=c?a.ncyBreadcrumb.parent(o):a.ncyBreadcrumb.parent;if(u)return u}return s(a)};return{getTemplate:function(t){return e.templateUrl?null:t[e.template]?t[e.template]:e.template},getTemplateUrl:function(){return e.templateUrl},getTemplateLast:function(t){return e.templateLastUrl?null:t[e.templateLast]?t[e.templateLast]:e.templateLast},getTemplateLastUrl:function(){return e.templateLastUrl},getStatesChain:function(r,a){for(var c=[],u=!1,i=t.$current.self.name;i;i=m(i)){if(a&&a.id&&e.useRootParams){var o=n(i),s=t.get(o.state),p=t.get("myReportsNew."+a.id);s.ncyBreadcrumb&&s.ncyBreadcrumb.parent?(s.ncyBreadcrumb.parent==p.ncyBreadcrumb.parent&&(u=!0),u&&l(c,i)):l(c,i)}else l(c,i);if(r&&c.length)return c}return e.prefixStateName&&l(c,e.prefixStateName),c},getLastStep:function(){var e=this.getStatesChain(!0,$routeParams);return e.length?e[0]:r},$getLastViewScope:function(){return o}}}]}function i(e,r,a,n){var u={bootstrap2:'',bootstrap3:'
      1. {{step.ncyBreadcrumbLabel}}{{step.ncyBreadcrumbLabel}}
      '};return{restrict:"AE",replace:!0,scope:{},template:r.getTemplate(u),templateUrl:r.getTemplateUrl(),link:{post:function(u){var i=[],o=function(){d(i),i=[];var a=r.$getLastViewScope();u.steps=r.getStatesChain(!1,n),t.forEach(u.steps,function(t){if(t.ncyBreadcrumb&&t.ncyBreadcrumb.label){var r=e(t.ncyBreadcrumb.label);t.ncyBreadcrumbLabel=r(a),p(i,r,a,t)}else t.ncyBreadcrumbLabel=t.name})};c("BreadcrumbDirective.$viewContentLoaded",a,"$viewContentLoaded",function(e){e.targetScope.ncyBreadcrumbIgnore||o()}),o()}}}}function o(e,t,r,a){var n={"default":"{{ncyBreadcrumbLabel}}"};return{restrict:"A",scope:{},template:t.getTemplateLast(n),templateUrl:t.getTemplateLastUrl(),compile:function(a,n){var u=a.attr(n.$attr.ncyBreadcrumbLast);return u&&a.html(u),{post:function(a){var n=[],u=function(){d(n),n=[];var r=t.$getLastViewScope(),c=t.getLastStep();if(c)if(a.ncyBreadcrumbLink=c.ncyBreadcrumbLink,c.ncyBreadcrumb&&c.ncyBreadcrumb.label){var u=e(c.ncyBreadcrumb.label);a.ncyBreadcrumbLabel=u(r),p(n,u,r,a)}else a.ncyBreadcrumbLabel=c.name};c("BreadcrumbLastDirective.$viewContentLoaded",r,"$viewContentLoaded",function(e){e.targetScope.ncyBreadcrumbIgnore||u()}),u()}}}}}function s(e,r,a,n){return{restrict:"A",scope:{},template:"{{ncyBreadcrumbChain}}",compile:function(u,i){var o=u.attr(i.$attr.ncyBreadcrumbText);o&&u.html(o);var s=u.attr(i.$attr.ncyBreadcrumbTextSeparator)||" / ";return{post:function(u){var i=[],o=function(e,r,a){t.forEach(m(r),function(t){var r=a.$watch(t,function(e,t){e!==t&&l()});e.push(r)})},l=function(){d(i),i=[];var a=r.$getLastViewScope(),c=r.getStatesChain(!1,n),l=[];t.forEach(c,function(t){if(t.ncyBreadcrumb&&t.ncyBreadcrumb.label){var r=e(t.ncyBreadcrumb.label);l.push(r(a)),o(i,r,a)}else l.push(t.name)}),u.ncyBreadcrumbChain=l.join(s)};c("BreadcrumbTextDirective.$viewContentLoaded",a,"$viewContentLoaded",function(e){e.targetScope.ncyBreadcrumbIgnore||l()}),l()}}}}}var l={},m=function(e){if(e.expressions)return e.expressions;var r=[];return t.forEach(e.parts,function(e){t.isFunction(e)&&r.push(e.exp)}),r},p=function(e,r,a,n){t.forEach(m(r),function(t){var c=a.$watch(t,function(){n.ncyBreadcrumbLabel=r(a)});e.push(c)})},d=function(e){t.forEach(e,function(e){e()})};i.$inject=["$interpolate","$breadcrumb","$rootScope","$routeParams"],o.$inject=["$interpolate","$breadcrumb","$rootScope","$routeParams"],s.$inject=["$interpolate","$breadcrumb","$rootScope","$routeParams"],t.module("ncy-angular-breadcrumb",["ui.router.state"]).provider("$breadcrumb",u).directive("ncyBreadcrumb",i).directive("ncyBreadcrumbLast",o).directive("ncyBreadcrumbText",s)}(window,window.angular); \ No newline at end of file +!function(e,t,r){"use strict";function a(e,r){return t.equals(e.length,r.length)?e>r:e.length>r.length}function n(e){var t=e.replace(/\n/g," ").match(/^([^(]+?)\s*(\((.*)\))?$/);if(!t||4!==t.length)throw new Error("Invalid state ref '"+e+"'");return{state:t[1],paramExpr:t[3]||null}}function c(e,t,a,n){var c=l[e];c!==r&&c(),c=t.$on(a,n),l[e]=c}function u(){var e={prefixStateName:null,template:"bootstrap3",templateUrl:null,templateLast:"default",templateLastUrl:null,includeAbstract:!1,useRootParams:!1};this.setOptions=function(r){t.extend(e,r)},this.$get=["$state","$stateParams","$rootScope",function(t,u,i){var o=i;c("$Breadcrumb.$viewContentLoaded",i,"$viewContentLoaded",function(e){!e.targetScope.ncyBreadcrumbIgnore&&a(e.targetScope.$id,o.$id)&&(o=e.targetScope)});var s=function(e){var t=e.parent||(/^(.+)\.[^.]+$/.exec(e.name)||[])[1],r="object"==typeof t;return r?t.name:t},l=function(r,a){for(var c,i,s=n(a),l=!1,m=!1,p=0,d=r.length;d>p;p+=1)if(r[p].name===s.state)return;c=t.get(s.state),c.ncyBreadcrumb&&(c.ncyBreadcrumb.force&&(l=!0),c.ncyBreadcrumb.skip&&(m=!0)),c["abstract"]&&!e.includeAbstract&&!l||m||(s.paramExpr&&(i=o.$eval(s.paramExpr)),c.ncyBreadcrumbLink=t.href(s.state,i||u||{}),c.ncyBreadcrumbStateRef=a,r.unshift(c))},m=function(e){var r=n(e),a=t.get(r.state);if(a.ncyBreadcrumb&&a.ncyBreadcrumb.parent){var c="function"==typeof a.ncyBreadcrumb.parent,u=c?a.ncyBreadcrumb.parent(o):a.ncyBreadcrumb.parent;if(u)return u}return s(a)};return{getTemplate:function(t){return e.templateUrl?null:t[e.template]?t[e.template]:e.template},getTemplateUrl:function(){return e.templateUrl},getTemplateLast:function(t){return e.templateLastUrl?null:t[e.templateLast]?t[e.templateLast]:e.templateLast},getTemplateLastUrl:function(){return e.templateLastUrl},getStatesChain:function(r,a){for(var c=[],u=!1,i=t.$current.self.name;i;i=m(i)){if(a&&a.id&&e.useRootParams){var o=n(i),s=t.get(o.state),p=t.get("myReportsNew."+a.id);s&&s.ncyBreadcrumb&&s.ncyBreadcrumb.parent?(s.ncyBreadcrumb.parent==p.ncyBreadcrumb.parent&&(u=!0),u&&l(c,i)):l(c,i)}else l(c,i);if(r&&c.length)return c}return e.prefixStateName&&l(c,e.prefixStateName),c},getLastStep:function(){var e=this.getStatesChain(!0,$routeParams);return e.length?e[0]:r},$getLastViewScope:function(){return o}}}]}function i(e,r,a,n){var u={bootstrap2:'',bootstrap3:'
      1. {{step.ncyBreadcrumbLabel}}{{step.ncyBreadcrumbLabel}}
      '};return{restrict:"AE",replace:!0,scope:{},template:r.getTemplate(u),templateUrl:r.getTemplateUrl(),link:{post:function(u){var i=[],o=function(){d(i),i=[];var a=r.$getLastViewScope();u.steps=r.getStatesChain(!1,n),t.forEach(u.steps,function(t){if(t.ncyBreadcrumb&&t.ncyBreadcrumb.label){var r=e(t.ncyBreadcrumb.label);t.ncyBreadcrumbLabel=r(a),p(i,r,a,t)}else t.ncyBreadcrumbLabel=t.name})};c("BreadcrumbDirective.$viewContentLoaded",a,"$viewContentLoaded",function(e){e.targetScope.ncyBreadcrumbIgnore||o()}),o()}}}}function o(e,t,r,a){var n={"default":"{{ncyBreadcrumbLabel}}"};return{restrict:"A",scope:{},template:t.getTemplateLast(n),templateUrl:t.getTemplateLastUrl(),compile:function(a,n){var u=a.attr(n.$attr.ncyBreadcrumbLast);return u&&a.html(u),{post:function(a){var n=[],u=function(){d(n),n=[];var r=t.$getLastViewScope(),c=t.getLastStep();if(c)if(a.ncyBreadcrumbLink=c.ncyBreadcrumbLink,c.ncyBreadcrumb&&c.ncyBreadcrumb.label){var u=e(c.ncyBreadcrumb.label);a.ncyBreadcrumbLabel=u(r),p(n,u,r,a)}else a.ncyBreadcrumbLabel=c.name};c("BreadcrumbLastDirective.$viewContentLoaded",r,"$viewContentLoaded",function(e){e.targetScope.ncyBreadcrumbIgnore||u()}),u()}}}}}function s(e,r,a,n){return{restrict:"A",scope:{},template:"{{ncyBreadcrumbChain}}",compile:function(u,i){var o=u.attr(i.$attr.ncyBreadcrumbText);o&&u.html(o);var s=u.attr(i.$attr.ncyBreadcrumbTextSeparator)||" / ";return{post:function(u){var i=[],o=function(e,r,a){t.forEach(m(r),function(t){var r=a.$watch(t,function(e,t){e!==t&&l()});e.push(r)})},l=function(){d(i),i=[];var a=r.$getLastViewScope(),c=r.getStatesChain(!1,n),l=[];t.forEach(c,function(t){if(t.ncyBreadcrumb&&t.ncyBreadcrumb.label){var r=e(t.ncyBreadcrumb.label);l.push(r(a)),o(i,r,a)}else l.push(t.name)}),u.ncyBreadcrumbChain=l.join(s)};c("BreadcrumbTextDirective.$viewContentLoaded",a,"$viewContentLoaded",function(e){e.targetScope.ncyBreadcrumbIgnore||l()}),l()}}}}}var l={},m=function(e){if(e.expressions)return e.expressions;var r=[];return t.forEach(e.parts,function(e){t.isFunction(e)&&r.push(e.exp)}),r},p=function(e,r,a,n){t.forEach(m(r),function(t){var c=a.$watch(t,function(){n.ncyBreadcrumbLabel=r(a)});e.push(c)})},d=function(e){t.forEach(e,function(e){e()})};i.$inject=["$interpolate","$breadcrumb","$rootScope","$routeParams"],o.$inject=["$interpolate","$breadcrumb","$rootScope","$routeParams"],s.$inject=["$interpolate","$breadcrumb","$rootScope","$routeParams"],t.module("ncy-angular-breadcrumb",["ui.router.state"]).provider("$breadcrumb",u).directive("ncyBreadcrumb",i).directive("ncyBreadcrumbLast",o).directive("ncyBreadcrumbText",s)}(window,window.angular); \ No newline at end of file diff --git a/package.json b/package.json index e8540da..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.1", + "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 925beed..c9e94a9 100644 --- a/release/angular-breadcrumb.js +++ b/release/angular-breadcrumb.js @@ -1,4 +1,4 @@ -/*! angular-breadcrumb - v0.5.1 +/*! angular-breadcrumb - v0.5.2 * http://ncuillery.github.io/angular-breadcrumb * Copyright (c) 2016 Nicolas Cuillery; Licensed MIT */ @@ -167,7 +167,7 @@ function $Breadcrumb() { var getCurrentURLState = $state.get('myReportsNew.' + $routeParams.id); - if (conf.ncyBreadcrumb && conf.ncyBreadcrumb.parent) { + if (conf && conf.ncyBreadcrumb && conf.ncyBreadcrumb.parent) { if (conf.ncyBreadcrumb.parent == getCurrentURLState.ncyBreadcrumb.parent) { startInsertingChain = true; diff --git a/release/angular-breadcrumb.min.js b/release/angular-breadcrumb.min.js index 5856fd5..693045b 100644 --- a/release/angular-breadcrumb.min.js +++ b/release/angular-breadcrumb.min.js @@ -1,4 +1,4 @@ -/*! angular-breadcrumb - v0.5.1 +/*! angular-breadcrumb - v0.5.2 * http://ncuillery.github.io/angular-breadcrumb * Copyright (c) 2016 Nicolas Cuillery; Licensed MIT */ -!function(e,t,r){"use strict";function a(e,r){return t.equals(e.length,r.length)?e>r:e.length>r.length}function n(e){var t=e.replace(/\n/g," ").match(/^([^(]+?)\s*(\((.*)\))?$/);if(!t||4!==t.length)throw new Error("Invalid state ref '"+e+"'");return{state:t[1],paramExpr:t[3]||null}}function c(e,t,a,n){var c=l[e];c!==r&&c(),c=t.$on(a,n),l[e]=c}function u(){var e={prefixStateName:null,template:"bootstrap3",templateUrl:null,templateLast:"default",templateLastUrl:null,includeAbstract:!1,useRootParams:!1};this.setOptions=function(r){t.extend(e,r)},this.$get=["$state","$stateParams","$rootScope",function(t,u,i){var o=i;c("$Breadcrumb.$viewContentLoaded",i,"$viewContentLoaded",function(e){!e.targetScope.ncyBreadcrumbIgnore&&a(e.targetScope.$id,o.$id)&&(o=e.targetScope)});var s=function(e){var t=e.parent||(/^(.+)\.[^.]+$/.exec(e.name)||[])[1],r="object"==typeof t;return r?t.name:t},l=function(r,a){for(var c,i,s=n(a),l=!1,m=!1,p=0,d=r.length;d>p;p+=1)if(r[p].name===s.state)return;c=t.get(s.state),c.ncyBreadcrumb&&(c.ncyBreadcrumb.force&&(l=!0),c.ncyBreadcrumb.skip&&(m=!0)),c["abstract"]&&!e.includeAbstract&&!l||m||(s.paramExpr&&(i=o.$eval(s.paramExpr)),c.ncyBreadcrumbLink=t.href(s.state,i||u||{}),c.ncyBreadcrumbStateRef=a,r.unshift(c))},m=function(e){var r=n(e),a=t.get(r.state);if(a.ncyBreadcrumb&&a.ncyBreadcrumb.parent){var c="function"==typeof a.ncyBreadcrumb.parent,u=c?a.ncyBreadcrumb.parent(o):a.ncyBreadcrumb.parent;if(u)return u}return s(a)};return{getTemplate:function(t){return e.templateUrl?null:t[e.template]?t[e.template]:e.template},getTemplateUrl:function(){return e.templateUrl},getTemplateLast:function(t){return e.templateLastUrl?null:t[e.templateLast]?t[e.templateLast]:e.templateLast},getTemplateLastUrl:function(){return e.templateLastUrl},getStatesChain:function(r,a){for(var c=[],u=!1,i=t.$current.self.name;i;i=m(i)){if(a&&a.id&&e.useRootParams){var o=n(i),s=t.get(o.state),p=t.get("myReportsNew."+a.id);s.ncyBreadcrumb&&s.ncyBreadcrumb.parent?(s.ncyBreadcrumb.parent==p.ncyBreadcrumb.parent&&(u=!0),u&&l(c,i)):l(c,i)}else l(c,i);if(r&&c.length)return c}return e.prefixStateName&&l(c,e.prefixStateName),c},getLastStep:function(){var e=this.getStatesChain(!0,$routeParams);return e.length?e[0]:r},$getLastViewScope:function(){return o}}}]}function i(e,r,a,n){var u={bootstrap2:'',bootstrap3:'
      1. {{step.ncyBreadcrumbLabel}}{{step.ncyBreadcrumbLabel}}
      '};return{restrict:"AE",replace:!0,scope:{},template:r.getTemplate(u),templateUrl:r.getTemplateUrl(),link:{post:function(u){var i=[],o=function(){d(i),i=[];var a=r.$getLastViewScope();u.steps=r.getStatesChain(!1,n),t.forEach(u.steps,function(t){if(t.ncyBreadcrumb&&t.ncyBreadcrumb.label){var r=e(t.ncyBreadcrumb.label);t.ncyBreadcrumbLabel=r(a),p(i,r,a,t)}else t.ncyBreadcrumbLabel=t.name})};c("BreadcrumbDirective.$viewContentLoaded",a,"$viewContentLoaded",function(e){e.targetScope.ncyBreadcrumbIgnore||o()}),o()}}}}function o(e,t,r,a){var n={"default":"{{ncyBreadcrumbLabel}}"};return{restrict:"A",scope:{},template:t.getTemplateLast(n),templateUrl:t.getTemplateLastUrl(),compile:function(a,n){var u=a.attr(n.$attr.ncyBreadcrumbLast);return u&&a.html(u),{post:function(a){var n=[],u=function(){d(n),n=[];var r=t.$getLastViewScope(),c=t.getLastStep();if(c)if(a.ncyBreadcrumbLink=c.ncyBreadcrumbLink,c.ncyBreadcrumb&&c.ncyBreadcrumb.label){var u=e(c.ncyBreadcrumb.label);a.ncyBreadcrumbLabel=u(r),p(n,u,r,a)}else a.ncyBreadcrumbLabel=c.name};c("BreadcrumbLastDirective.$viewContentLoaded",r,"$viewContentLoaded",function(e){e.targetScope.ncyBreadcrumbIgnore||u()}),u()}}}}}function s(e,r,a,n){return{restrict:"A",scope:{},template:"{{ncyBreadcrumbChain}}",compile:function(u,i){var o=u.attr(i.$attr.ncyBreadcrumbText);o&&u.html(o);var s=u.attr(i.$attr.ncyBreadcrumbTextSeparator)||" / ";return{post:function(u){var i=[],o=function(e,r,a){t.forEach(m(r),function(t){var r=a.$watch(t,function(e,t){e!==t&&l()});e.push(r)})},l=function(){d(i),i=[];var a=r.$getLastViewScope(),c=r.getStatesChain(!1,n),l=[];t.forEach(c,function(t){if(t.ncyBreadcrumb&&t.ncyBreadcrumb.label){var r=e(t.ncyBreadcrumb.label);l.push(r(a)),o(i,r,a)}else l.push(t.name)}),u.ncyBreadcrumbChain=l.join(s)};c("BreadcrumbTextDirective.$viewContentLoaded",a,"$viewContentLoaded",function(e){e.targetScope.ncyBreadcrumbIgnore||l()}),l()}}}}}var l={},m=function(e){if(e.expressions)return e.expressions;var r=[];return t.forEach(e.parts,function(e){t.isFunction(e)&&r.push(e.exp)}),r},p=function(e,r,a,n){t.forEach(m(r),function(t){var c=a.$watch(t,function(){n.ncyBreadcrumbLabel=r(a)});e.push(c)})},d=function(e){t.forEach(e,function(e){e()})};i.$inject=["$interpolate","$breadcrumb","$rootScope","$routeParams"],o.$inject=["$interpolate","$breadcrumb","$rootScope","$routeParams"],s.$inject=["$interpolate","$breadcrumb","$rootScope","$routeParams"],t.module("ncy-angular-breadcrumb",["ui.router.state"]).provider("$breadcrumb",u).directive("ncyBreadcrumb",i).directive("ncyBreadcrumbLast",o).directive("ncyBreadcrumbText",s)}(window,window.angular); \ No newline at end of file +!function(e,t,r){"use strict";function a(e,r){return t.equals(e.length,r.length)?e>r:e.length>r.length}function n(e){var t=e.replace(/\n/g," ").match(/^([^(]+?)\s*(\((.*)\))?$/);if(!t||4!==t.length)throw new Error("Invalid state ref '"+e+"'");return{state:t[1],paramExpr:t[3]||null}}function c(e,t,a,n){var c=l[e];c!==r&&c(),c=t.$on(a,n),l[e]=c}function u(){var e={prefixStateName:null,template:"bootstrap3",templateUrl:null,templateLast:"default",templateLastUrl:null,includeAbstract:!1,useRootParams:!1};this.setOptions=function(r){t.extend(e,r)},this.$get=["$state","$stateParams","$rootScope",function(t,u,i){var o=i;c("$Breadcrumb.$viewContentLoaded",i,"$viewContentLoaded",function(e){!e.targetScope.ncyBreadcrumbIgnore&&a(e.targetScope.$id,o.$id)&&(o=e.targetScope)});var s=function(e){var t=e.parent||(/^(.+)\.[^.]+$/.exec(e.name)||[])[1],r="object"==typeof t;return r?t.name:t},l=function(r,a){for(var c,i,s=n(a),l=!1,m=!1,p=0,d=r.length;d>p;p+=1)if(r[p].name===s.state)return;c=t.get(s.state),c.ncyBreadcrumb&&(c.ncyBreadcrumb.force&&(l=!0),c.ncyBreadcrumb.skip&&(m=!0)),c["abstract"]&&!e.includeAbstract&&!l||m||(s.paramExpr&&(i=o.$eval(s.paramExpr)),c.ncyBreadcrumbLink=t.href(s.state,i||u||{}),c.ncyBreadcrumbStateRef=a,r.unshift(c))},m=function(e){var r=n(e),a=t.get(r.state);if(a.ncyBreadcrumb&&a.ncyBreadcrumb.parent){var c="function"==typeof a.ncyBreadcrumb.parent,u=c?a.ncyBreadcrumb.parent(o):a.ncyBreadcrumb.parent;if(u)return u}return s(a)};return{getTemplate:function(t){return e.templateUrl?null:t[e.template]?t[e.template]:e.template},getTemplateUrl:function(){return e.templateUrl},getTemplateLast:function(t){return e.templateLastUrl?null:t[e.templateLast]?t[e.templateLast]:e.templateLast},getTemplateLastUrl:function(){return e.templateLastUrl},getStatesChain:function(r,a){for(var c=[],u=!1,i=t.$current.self.name;i;i=m(i)){if(a&&a.id&&e.useRootParams){var o=n(i),s=t.get(o.state),p=t.get("myReportsNew."+a.id);s&&s.ncyBreadcrumb&&s.ncyBreadcrumb.parent?(s.ncyBreadcrumb.parent==p.ncyBreadcrumb.parent&&(u=!0),u&&l(c,i)):l(c,i)}else l(c,i);if(r&&c.length)return c}return e.prefixStateName&&l(c,e.prefixStateName),c},getLastStep:function(){var e=this.getStatesChain(!0,$routeParams);return e.length?e[0]:r},$getLastViewScope:function(){return o}}}]}function i(e,r,a,n){var u={bootstrap2:'',bootstrap3:'
      1. {{step.ncyBreadcrumbLabel}}{{step.ncyBreadcrumbLabel}}
      '};return{restrict:"AE",replace:!0,scope:{},template:r.getTemplate(u),templateUrl:r.getTemplateUrl(),link:{post:function(u){var i=[],o=function(){d(i),i=[];var a=r.$getLastViewScope();u.steps=r.getStatesChain(!1,n),t.forEach(u.steps,function(t){if(t.ncyBreadcrumb&&t.ncyBreadcrumb.label){var r=e(t.ncyBreadcrumb.label);t.ncyBreadcrumbLabel=r(a),p(i,r,a,t)}else t.ncyBreadcrumbLabel=t.name})};c("BreadcrumbDirective.$viewContentLoaded",a,"$viewContentLoaded",function(e){e.targetScope.ncyBreadcrumbIgnore||o()}),o()}}}}function o(e,t,r,a){var n={"default":"{{ncyBreadcrumbLabel}}"};return{restrict:"A",scope:{},template:t.getTemplateLast(n),templateUrl:t.getTemplateLastUrl(),compile:function(a,n){var u=a.attr(n.$attr.ncyBreadcrumbLast);return u&&a.html(u),{post:function(a){var n=[],u=function(){d(n),n=[];var r=t.$getLastViewScope(),c=t.getLastStep();if(c)if(a.ncyBreadcrumbLink=c.ncyBreadcrumbLink,c.ncyBreadcrumb&&c.ncyBreadcrumb.label){var u=e(c.ncyBreadcrumb.label);a.ncyBreadcrumbLabel=u(r),p(n,u,r,a)}else a.ncyBreadcrumbLabel=c.name};c("BreadcrumbLastDirective.$viewContentLoaded",r,"$viewContentLoaded",function(e){e.targetScope.ncyBreadcrumbIgnore||u()}),u()}}}}}function s(e,r,a,n){return{restrict:"A",scope:{},template:"{{ncyBreadcrumbChain}}",compile:function(u,i){var o=u.attr(i.$attr.ncyBreadcrumbText);o&&u.html(o);var s=u.attr(i.$attr.ncyBreadcrumbTextSeparator)||" / ";return{post:function(u){var i=[],o=function(e,r,a){t.forEach(m(r),function(t){var r=a.$watch(t,function(e,t){e!==t&&l()});e.push(r)})},l=function(){d(i),i=[];var a=r.$getLastViewScope(),c=r.getStatesChain(!1,n),l=[];t.forEach(c,function(t){if(t.ncyBreadcrumb&&t.ncyBreadcrumb.label){var r=e(t.ncyBreadcrumb.label);l.push(r(a)),o(i,r,a)}else l.push(t.name)}),u.ncyBreadcrumbChain=l.join(s)};c("BreadcrumbTextDirective.$viewContentLoaded",a,"$viewContentLoaded",function(e){e.targetScope.ncyBreadcrumbIgnore||l()}),l()}}}}}var l={},m=function(e){if(e.expressions)return e.expressions;var r=[];return t.forEach(e.parts,function(e){t.isFunction(e)&&r.push(e.exp)}),r},p=function(e,r,a,n){t.forEach(m(r),function(t){var c=a.$watch(t,function(){n.ncyBreadcrumbLabel=r(a)});e.push(c)})},d=function(e){t.forEach(e,function(e){e()})};i.$inject=["$interpolate","$breadcrumb","$rootScope","$routeParams"],o.$inject=["$interpolate","$breadcrumb","$rootScope","$routeParams"],s.$inject=["$interpolate","$breadcrumb","$rootScope","$routeParams"],t.module("ncy-angular-breadcrumb",["ui.router.state"]).provider("$breadcrumb",u).directive("ncyBreadcrumb",i).directive("ncyBreadcrumbLast",o).directive("ncyBreadcrumbText",s)}(window,window.angular); \ No newline at end of file diff --git a/sample/angular-breadcrumb-0.5.1.zip b/sample/angular-breadcrumb-0.5.1.zip deleted file mode 100644 index 08959316f65b5698d66301aad9033859f527a08e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5597 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 diff --git a/sample/angular-breadcrumb-0.5.2.zip b/sample/angular-breadcrumb-0.5.2.zip new file mode 100644 index 0000000000000000000000000000000000000000..92a3bbd60936111b5b5763c58c2f0ab235021a2d GIT binary patch literal 5933 zcmb7|bxa&kx9tZRym)ahE;G18af(yiWnemZ@#5}Q++A9Vb#RKibZ~bsTBNuYUccPr zj2Ei{mf1-H}F&!D|DjklSX!^kKaOA!95r zZr%Pq`Kw}X4*mUIksp3rF9U(sS0j9NoH5ru?%82Xu~ylpkJx&g2)BZ=nZ0*Z=aQ!8 zFo#;sDAI(HN>cEPa)5;;1-ghg*miW7g=CuXE5ZHH(D&V?tHYG98tvX$VL%n4ZASyb zvYco_N130D#ct`7HmXkflH_S3Ox{VgaI!Jya+;Bgk`&?Mr3GkW`{f0<=}ZacR^Y~; zB2(>ipGs|rM02?Lg zuacPu!bXWy3O4y0r)UW+Hn)AT7$vSy&&#{&-L`Itb!19_+{=o$xJ|8SYwqj>?cpMA+X)Y{aAcH{Yv#GzkeY6>sf!Xf ze42Sj__NdQ!MQd`Gww6-E)XB!fd(~cQLw@z1*V6&kWZDkSyLe=iBx&nxd&NXkncVa z`152Gl(BuVdl*Rm6`&qVR1GNO);Q|th2w(t3-^X+Vsh~3eD`*_O(v0T3KAmxs^ggD zo(X&Zz)k??rQ!G;-4pTaUlu6S`vz4G5Ql2{f!{Mb8WrEz2GIzG$;KY17O{ASDI?PGg z+EN*r-bHKMIx{?_9*(Wp%GY*F zD!Ln7Xga)X|E_X>mcifNUC27!OXw=uVKl^P9lq^$k>$Y3R%c(wYMWoVaLH*(pts8y zOa_@rJH+*+#_H|#3)2ZEAK#!2ywnK1p16tBHgMx7Mt*o_7ni3#F_`%AgIXQuTalOe zh?YCx{kD%<&%kT3sIAb{Te4A#6lg0gLP<*Q?Pw4_tY_=T1`~H6&8L=%9JiE_TIL~R zrOb&Ss$mw{5XZGl#rORp7#*RCJF+b}o1{@$r9e!`)q?#K31d#B zRot5vY^u)8#Jj`^WqRITv!U~XzkM0w9#KjKw{M}aUbzESjQ&+@Spm!6hL=0@0gcs& zn4^9Su2l+>HhmuZ2PTjM$|xdrCd%&JY=RY6ipSN}kE0=>WmI{+X+wXSlfEflZX=3e z5w8{e#g(1ZRK#}geAe9eGVdo=>oBaAkPp3|Y zihUv#5W5?g59!4}Ylllo6J23^Xg{Yq)*~g>2*O_8tFa*53Hr%sUgzDTX86^KIjf24 zO)nu?|G2PwwM?3!OvN7tLS6HK-|rM0gAbbM%V1?E@TkcRDjM+KZ+GzI%mzK@=aydBk^% z`lj@@U-fj=)=3&GhGD51)t6|be62|gErlW^PW18k70!Xv5~8}1b7?A;kYg0ondAaN zdGTYybH#E)Xk(QvzD7nI(e~qWi*}Rx{E5t`N9B}R+-KfHI4@YMu_%wi7W&HSc&a%z ztvvf|N2jjhxkQX4#v6SYQn|E0O4Ql8jLZHH)AwNU37(XZbAw^9R=j)Tz zaf(RTmqHz84qcKn$W=%ZfuSKEF*aqh0oudSpZCp)jc|(VZwX$6AaJFVkwPf3U)af*PemejWeCtsQfEjSm1gOY*g#@*l$l) z_bDOuXt7gA4}7LyxzA`125FQ2w$_~uX6siA)3QjNL{_h5Yt627msriWz1j6~`z~vy z;ECr+V)3ERR=E6(QP*mrv{rW-yhbhQ0i~EbWirA(OJDHcUNuZ532>xGjLNS5h<}x@ z?)Gzb`0)%BGgFUxo>|ZF`o3ocTh(){hUB4w`ddTHN(I7G%gJlXZ>b2#LZ-RYiszO2 zBd5T7QL493-X!!DZj##Jtl=-?KVA>pI6oErFXlNOHL<=|PIQv99$2SUc?iz!=mjh@ zXin{CbrTCk+vLYy7}r||h1Gem$9U3=3H@6n-iKWm-zyS?IYJ9VJ{;AH5~5%YNw+v;4N}y1xYUGCym~{ne>-;*a&W|- zNuSmQx@0Nxx%EwmQ&i9CghVcKR@)gLN11&rZWpC1S%9j_V3^%+6>f8Tp$N|i9v^s&zN_=f zpAxXH?h9V78R)tPbnQ~2&4^Q-YepGQ`1-Dr&f-d(F&eI+`X!(-I!f*;kiKdMFTDuFup3U8uj9WQ5w%vrJe-AC~!K>H6imPXuCi zmByfb{BpAMmB+0Uv?H|V5qX3K%;xoH)owDdW#M>P$f_G7X3LbRImikjm}{yz!XQX7 zS3`NEqR#n}(%gXSRRn3D03Nk0iGs(-EW3qnyv40*KU1UJ(`X_L?)I{*Ad^qh5*6RI z-Odu<7Kitn{?N05MX1Lkt(q1shYCP+3L~jS6dFH7H5WG$aY9z!gB(~_%3MZzbs#95 zK4aSSb1lVwo&9z?c8U5_=C=?thig^nIX8I7V7O;aF3Z@Q%z#;7_&<5GHb#e4!6yP1>JmL0|ire$eHF>pO{p#D5)fnd2TN4XhY9cLulxkk48RKjX* z`87l5W{m|p-Yv_1bgjQ%S@xq{2FjTD{A=)>XJ^Ko_U{$xVf*^T%H2=j{hfJn@MtXR zb)D75zjgW$#UfmDm{MRJNm}!)`_h?A*cpSqa{LIAKicMb9?RiOPsM~?Fq^9P0d4RY zt$0Ml8$PLcxhMB-L!8f_ac!^VHQ&_<3Dx`#K*&k7ev}-v-C$usxRG*zBMNa|-QY(EAw3{wsa696i ztZ)vpPk26p{yoJXl*vezhHbn*MKny8#huP^vhuLR$%c#p_L^3~jDo+#hqe`KG}@MJ zz#6SJ`BBZRB3eDmHjai~PwYSNH5!P=`~odqi#8rOHWe}2C@LUJz49Feu`5xv>H7Prti zPPA1dR*dts$BF!DJLLQ+O!eK>25Qz_IBCpnU<`j-S(N##@Uw=5g0-?jeA#tmkhN#R zCUe^c!FyPoPcF(E{Wb)>mW$38_yj z#hcH`3?zl%p+A^fda?+wv+SJ;ua=Q_h^!#Ku+TLGdUgkT@YOI+ePpY`&U5-m`{6;e z1335m`AGipv-GvVu>@U(ev)gN0u+Y^1I{m}VF$2fX|8Vo!tnfve8Aow-?q{2=FKwwa zsUrv-b@&&q(lXc#eN*`=yPC7Y&k$yL+_jPD)7-GOS@Wp{+|*AW*_Q>&C%5w!ytE1U z$jc5sWh}8}7&{$rJEsBl(e`F+1i0-vHiC+O@oL~q@G{f(`PMY=fp#GxX11j5Bm*V8 zx5g*;m^Wr-W`75KCy0{X|LUmm=wBDhhnv*SK0dB!tS?=xeEdL}!jc`k3Jb<%l%y-k z{MxV^t>E(JiZx1_HA|59)_piYh+kV0n=gIi*pcoS-LJ0(I*Vg2)CaA^xao;RXO~bj zU^Psd3cE+F_<7UP;cYo9demM2Tdp}+pnpK<$GNP)P z3AG(n6Z?W;zGv~NG7kri&r*E(z0&0$@~tV)fTFPd17NRqa-dN+!`0uppDGIsMNfCH^-}h3nc69 z@@t^%`YJ}Ux#;-t!Sp$@{>93Ux<&W{tRfZ zUnZm;t3i%BLf3rJ@YMpMK&zTf!eb5tiRV@2jp(Fu>ATJO5!$5Jyw2MDx2h?xv&FiK z3IocCm-R7^-ZB>h3@eqH=P44eUJ{~mt*%O;>aU|r>i6fJDbF*nXUbd)Y_=IH`puyd5gNQ-HgziB@El}Wxsyib(m(RU>7+gh zVO22R@Dw)sTA$D$IId=8Sx^MXC@7@jk3fqv*vPWUIkrh)XMV0)v@Frge70kB;3O+0 z7RuvWf!|ZVOjKrqE)wLOIQalw9-+rMJ;t*V8PXc{&@{dKhSMHDMa@7PwJ}|**eVN~ zG|K3Rvy!#^dU*cMyhv&Jg7MGGgJ@#LN&!@yiv(jMjkty>z?V@$&tWp`RUa-|;O&0MGm40hd$@G=hHdhTYJPyeSZstTc3Z9RlpU|S^6c#ppn3MVm{x1G|`YlMo4z@L^6nx53fIKHFk1D2CaxMAD?e_J$I z3~u-VQQfz~2`&WYG$M1BH;vkJ3_m=;D%Cj>34v$6Jr zpZ$Xa%tsuH_F=61IlY4;qP)hu33n-Fe|NI!j-cBEOUnjJ+6Gym6%U6}<1H-%jK4@m zgTWIx;ZwD|qeh`sT~-k3_852sDKnlIY?5@k2Gu)D1Velc^qtW)QL!)4Vy4r#c!)z= zdmJlb&yMs$hWvBwnOK$)E{cB37dPEDfVi3MJ9ja39+X>FfEBI~9pyY$Tnb+bR-7#B zvi4sds$T`jiaVP&?82U2I;KTWqKSDSvq{K7?s3KI@sm2N+uE!Ts6v`lu>-w2=LBO+ zCqLwAvpRHb=(qGD+RGxd`S00jtaS-J#hdC~ey11!l_qcmMu`xq`oB z&(t8N;3$ovsrE8{o92Lx9~c7TYpdhqy$4S@=&j&=vlEHEEi{Q`XZ9e&8UoN6-cAzc~AUqWxdqLQ@5Z T_8$%8f7Sl48~<}D0KoqO`P)G4 literal 0 HcmV?d00001 From cbaac5252bed1f0dd678804e8d5bc548b84ee7e4 Mon Sep 17 00:00:00 2001 From: Muhammed Baderdien Date: Thu, 20 Jul 2017 13:59:10 +0200 Subject: [PATCH 4/6] Bug on this change below --- CHANGELOG.md | 7 +++++++ bower.json | 2 +- dist/angular-breadcrumb.js | 17 +++++++++++------ dist/angular-breadcrumb.min.js | 2 +- package.json | 2 +- release/angular-breadcrumb.js | 17 +++++++++++------ release/angular-breadcrumb.min.js | 2 +- sample/angular-breadcrumb-0.5.2.zip | Bin 5933 -> 0 bytes sample/angular-breadcrumb-0.5.3.zip | Bin 0 -> 5945 bytes 9 files changed, 33 insertions(+), 16 deletions(-) delete mode 100644 sample/angular-breadcrumb-0.5.2.zip create mode 100644 sample/angular-breadcrumb-0.5.3.zip diff --git a/CHANGELOG.md b/CHANGELOG.md index 435945c..c1ccb30 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ + +## 0.5.3 (2017-07-20) + +#### Bug Fixes +* Ensuring that nesting only starts from current navigated to id closes [#159] - Bug on this change below + + ## 0.5.2 (2017-07-20) diff --git a/bower.json b/bower.json index 4496805..eb991c9 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.2", + "version": "0.5.3", "main": "release/angular-breadcrumb.js", "ignore": [ "sample", diff --git a/dist/angular-breadcrumb.js b/dist/angular-breadcrumb.js index c9e94a9..4283642 100644 --- a/dist/angular-breadcrumb.js +++ b/dist/angular-breadcrumb.js @@ -1,4 +1,4 @@ -/*! angular-breadcrumb - v0.5.2 +/*! angular-breadcrumb - v0.5.3 * http://ncuillery.github.io/angular-breadcrumb * Copyright (c) 2016 Nicolas Cuillery; Licensed MIT */ @@ -167,13 +167,18 @@ function $Breadcrumb() { var getCurrentURLState = $state.get('myReportsNew.' + $routeParams.id); - if (conf && conf.ncyBreadcrumb && conf.ncyBreadcrumb.parent) { + if (conf) { + if (conf.ncyBreadcrumb && conf.ncyBreadcrumb.parent) { - if (conf.ncyBreadcrumb.parent == getCurrentURLState.ncyBreadcrumb.parent) { - startInsertingChain = true; - } + if (conf.ncyBreadcrumb.parent == getCurrentURLState.ncyBreadcrumb.parent) { + startInsertingChain = true; + } - if (startInsertingChain) { + if (startInsertingChain) { + $$addStateInChain(chain, stateRef); + } + } + else { $$addStateInChain(chain, stateRef); } } diff --git a/dist/angular-breadcrumb.min.js b/dist/angular-breadcrumb.min.js index 693045b..1f30256 100644 --- a/dist/angular-breadcrumb.min.js +++ b/dist/angular-breadcrumb.min.js @@ -1,4 +1,4 @@ -/*! angular-breadcrumb - v0.5.2 +/*! angular-breadcrumb - v0.5.3 * http://ncuillery.github.io/angular-breadcrumb * Copyright (c) 2016 Nicolas Cuillery; Licensed MIT */ !function(e,t,r){"use strict";function a(e,r){return t.equals(e.length,r.length)?e>r:e.length>r.length}function n(e){var t=e.replace(/\n/g," ").match(/^([^(]+?)\s*(\((.*)\))?$/);if(!t||4!==t.length)throw new Error("Invalid state ref '"+e+"'");return{state:t[1],paramExpr:t[3]||null}}function c(e,t,a,n){var c=l[e];c!==r&&c(),c=t.$on(a,n),l[e]=c}function u(){var e={prefixStateName:null,template:"bootstrap3",templateUrl:null,templateLast:"default",templateLastUrl:null,includeAbstract:!1,useRootParams:!1};this.setOptions=function(r){t.extend(e,r)},this.$get=["$state","$stateParams","$rootScope",function(t,u,i){var o=i;c("$Breadcrumb.$viewContentLoaded",i,"$viewContentLoaded",function(e){!e.targetScope.ncyBreadcrumbIgnore&&a(e.targetScope.$id,o.$id)&&(o=e.targetScope)});var s=function(e){var t=e.parent||(/^(.+)\.[^.]+$/.exec(e.name)||[])[1],r="object"==typeof t;return r?t.name:t},l=function(r,a){for(var c,i,s=n(a),l=!1,m=!1,p=0,d=r.length;d>p;p+=1)if(r[p].name===s.state)return;c=t.get(s.state),c.ncyBreadcrumb&&(c.ncyBreadcrumb.force&&(l=!0),c.ncyBreadcrumb.skip&&(m=!0)),c["abstract"]&&!e.includeAbstract&&!l||m||(s.paramExpr&&(i=o.$eval(s.paramExpr)),c.ncyBreadcrumbLink=t.href(s.state,i||u||{}),c.ncyBreadcrumbStateRef=a,r.unshift(c))},m=function(e){var r=n(e),a=t.get(r.state);if(a.ncyBreadcrumb&&a.ncyBreadcrumb.parent){var c="function"==typeof a.ncyBreadcrumb.parent,u=c?a.ncyBreadcrumb.parent(o):a.ncyBreadcrumb.parent;if(u)return u}return s(a)};return{getTemplate:function(t){return e.templateUrl?null:t[e.template]?t[e.template]:e.template},getTemplateUrl:function(){return e.templateUrl},getTemplateLast:function(t){return e.templateLastUrl?null:t[e.templateLast]?t[e.templateLast]:e.templateLast},getTemplateLastUrl:function(){return e.templateLastUrl},getStatesChain:function(r,a){for(var c=[],u=!1,i=t.$current.self.name;i;i=m(i)){if(a&&a.id&&e.useRootParams){var o=n(i),s=t.get(o.state),p=t.get("myReportsNew."+a.id);s&&s.ncyBreadcrumb&&s.ncyBreadcrumb.parent?(s.ncyBreadcrumb.parent==p.ncyBreadcrumb.parent&&(u=!0),u&&l(c,i)):l(c,i)}else l(c,i);if(r&&c.length)return c}return e.prefixStateName&&l(c,e.prefixStateName),c},getLastStep:function(){var e=this.getStatesChain(!0,$routeParams);return e.length?e[0]:r},$getLastViewScope:function(){return o}}}]}function i(e,r,a,n){var u={bootstrap2:'',bootstrap3:'
      1. {{step.ncyBreadcrumbLabel}}{{step.ncyBreadcrumbLabel}}
      '};return{restrict:"AE",replace:!0,scope:{},template:r.getTemplate(u),templateUrl:r.getTemplateUrl(),link:{post:function(u){var i=[],o=function(){d(i),i=[];var a=r.$getLastViewScope();u.steps=r.getStatesChain(!1,n),t.forEach(u.steps,function(t){if(t.ncyBreadcrumb&&t.ncyBreadcrumb.label){var r=e(t.ncyBreadcrumb.label);t.ncyBreadcrumbLabel=r(a),p(i,r,a,t)}else t.ncyBreadcrumbLabel=t.name})};c("BreadcrumbDirective.$viewContentLoaded",a,"$viewContentLoaded",function(e){e.targetScope.ncyBreadcrumbIgnore||o()}),o()}}}}function o(e,t,r,a){var n={"default":"{{ncyBreadcrumbLabel}}"};return{restrict:"A",scope:{},template:t.getTemplateLast(n),templateUrl:t.getTemplateLastUrl(),compile:function(a,n){var u=a.attr(n.$attr.ncyBreadcrumbLast);return u&&a.html(u),{post:function(a){var n=[],u=function(){d(n),n=[];var r=t.$getLastViewScope(),c=t.getLastStep();if(c)if(a.ncyBreadcrumbLink=c.ncyBreadcrumbLink,c.ncyBreadcrumb&&c.ncyBreadcrumb.label){var u=e(c.ncyBreadcrumb.label);a.ncyBreadcrumbLabel=u(r),p(n,u,r,a)}else a.ncyBreadcrumbLabel=c.name};c("BreadcrumbLastDirective.$viewContentLoaded",r,"$viewContentLoaded",function(e){e.targetScope.ncyBreadcrumbIgnore||u()}),u()}}}}}function s(e,r,a,n){return{restrict:"A",scope:{},template:"{{ncyBreadcrumbChain}}",compile:function(u,i){var o=u.attr(i.$attr.ncyBreadcrumbText);o&&u.html(o);var s=u.attr(i.$attr.ncyBreadcrumbTextSeparator)||" / ";return{post:function(u){var i=[],o=function(e,r,a){t.forEach(m(r),function(t){var r=a.$watch(t,function(e,t){e!==t&&l()});e.push(r)})},l=function(){d(i),i=[];var a=r.$getLastViewScope(),c=r.getStatesChain(!1,n),l=[];t.forEach(c,function(t){if(t.ncyBreadcrumb&&t.ncyBreadcrumb.label){var r=e(t.ncyBreadcrumb.label);l.push(r(a)),o(i,r,a)}else l.push(t.name)}),u.ncyBreadcrumbChain=l.join(s)};c("BreadcrumbTextDirective.$viewContentLoaded",a,"$viewContentLoaded",function(e){e.targetScope.ncyBreadcrumbIgnore||l()}),l()}}}}}var l={},m=function(e){if(e.expressions)return e.expressions;var r=[];return t.forEach(e.parts,function(e){t.isFunction(e)&&r.push(e.exp)}),r},p=function(e,r,a,n){t.forEach(m(r),function(t){var c=a.$watch(t,function(){n.ncyBreadcrumbLabel=r(a)});e.push(c)})},d=function(e){t.forEach(e,function(e){e()})};i.$inject=["$interpolate","$breadcrumb","$rootScope","$routeParams"],o.$inject=["$interpolate","$breadcrumb","$rootScope","$routeParams"],s.$inject=["$interpolate","$breadcrumb","$rootScope","$routeParams"],t.module("ncy-angular-breadcrumb",["ui.router.state"]).provider("$breadcrumb",u).directive("ncyBreadcrumb",i).directive("ncyBreadcrumbLast",o).directive("ncyBreadcrumbText",s)}(window,window.angular); \ No newline at end of file diff --git a/package.json b/package.json index 44eb988..329cf26 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.2", + "version": "0.5.3", "homepage": "http://ncuillery.github.io/angular-breadcrumb", "author": { "name": "Nicolas Cuillery", diff --git a/release/angular-breadcrumb.js b/release/angular-breadcrumb.js index c9e94a9..4283642 100644 --- a/release/angular-breadcrumb.js +++ b/release/angular-breadcrumb.js @@ -1,4 +1,4 @@ -/*! angular-breadcrumb - v0.5.2 +/*! angular-breadcrumb - v0.5.3 * http://ncuillery.github.io/angular-breadcrumb * Copyright (c) 2016 Nicolas Cuillery; Licensed MIT */ @@ -167,13 +167,18 @@ function $Breadcrumb() { var getCurrentURLState = $state.get('myReportsNew.' + $routeParams.id); - if (conf && conf.ncyBreadcrumb && conf.ncyBreadcrumb.parent) { + if (conf) { + if (conf.ncyBreadcrumb && conf.ncyBreadcrumb.parent) { - if (conf.ncyBreadcrumb.parent == getCurrentURLState.ncyBreadcrumb.parent) { - startInsertingChain = true; - } + if (conf.ncyBreadcrumb.parent == getCurrentURLState.ncyBreadcrumb.parent) { + startInsertingChain = true; + } - if (startInsertingChain) { + if (startInsertingChain) { + $$addStateInChain(chain, stateRef); + } + } + else { $$addStateInChain(chain, stateRef); } } diff --git a/release/angular-breadcrumb.min.js b/release/angular-breadcrumb.min.js index 693045b..1f30256 100644 --- a/release/angular-breadcrumb.min.js +++ b/release/angular-breadcrumb.min.js @@ -1,4 +1,4 @@ -/*! angular-breadcrumb - v0.5.2 +/*! angular-breadcrumb - v0.5.3 * http://ncuillery.github.io/angular-breadcrumb * Copyright (c) 2016 Nicolas Cuillery; Licensed MIT */ !function(e,t,r){"use strict";function a(e,r){return t.equals(e.length,r.length)?e>r:e.length>r.length}function n(e){var t=e.replace(/\n/g," ").match(/^([^(]+?)\s*(\((.*)\))?$/);if(!t||4!==t.length)throw new Error("Invalid state ref '"+e+"'");return{state:t[1],paramExpr:t[3]||null}}function c(e,t,a,n){var c=l[e];c!==r&&c(),c=t.$on(a,n),l[e]=c}function u(){var e={prefixStateName:null,template:"bootstrap3",templateUrl:null,templateLast:"default",templateLastUrl:null,includeAbstract:!1,useRootParams:!1};this.setOptions=function(r){t.extend(e,r)},this.$get=["$state","$stateParams","$rootScope",function(t,u,i){var o=i;c("$Breadcrumb.$viewContentLoaded",i,"$viewContentLoaded",function(e){!e.targetScope.ncyBreadcrumbIgnore&&a(e.targetScope.$id,o.$id)&&(o=e.targetScope)});var s=function(e){var t=e.parent||(/^(.+)\.[^.]+$/.exec(e.name)||[])[1],r="object"==typeof t;return r?t.name:t},l=function(r,a){for(var c,i,s=n(a),l=!1,m=!1,p=0,d=r.length;d>p;p+=1)if(r[p].name===s.state)return;c=t.get(s.state),c.ncyBreadcrumb&&(c.ncyBreadcrumb.force&&(l=!0),c.ncyBreadcrumb.skip&&(m=!0)),c["abstract"]&&!e.includeAbstract&&!l||m||(s.paramExpr&&(i=o.$eval(s.paramExpr)),c.ncyBreadcrumbLink=t.href(s.state,i||u||{}),c.ncyBreadcrumbStateRef=a,r.unshift(c))},m=function(e){var r=n(e),a=t.get(r.state);if(a.ncyBreadcrumb&&a.ncyBreadcrumb.parent){var c="function"==typeof a.ncyBreadcrumb.parent,u=c?a.ncyBreadcrumb.parent(o):a.ncyBreadcrumb.parent;if(u)return u}return s(a)};return{getTemplate:function(t){return e.templateUrl?null:t[e.template]?t[e.template]:e.template},getTemplateUrl:function(){return e.templateUrl},getTemplateLast:function(t){return e.templateLastUrl?null:t[e.templateLast]?t[e.templateLast]:e.templateLast},getTemplateLastUrl:function(){return e.templateLastUrl},getStatesChain:function(r,a){for(var c=[],u=!1,i=t.$current.self.name;i;i=m(i)){if(a&&a.id&&e.useRootParams){var o=n(i),s=t.get(o.state),p=t.get("myReportsNew."+a.id);s&&s.ncyBreadcrumb&&s.ncyBreadcrumb.parent?(s.ncyBreadcrumb.parent==p.ncyBreadcrumb.parent&&(u=!0),u&&l(c,i)):l(c,i)}else l(c,i);if(r&&c.length)return c}return e.prefixStateName&&l(c,e.prefixStateName),c},getLastStep:function(){var e=this.getStatesChain(!0,$routeParams);return e.length?e[0]:r},$getLastViewScope:function(){return o}}}]}function i(e,r,a,n){var u={bootstrap2:'',bootstrap3:'
      1. {{step.ncyBreadcrumbLabel}}{{step.ncyBreadcrumbLabel}}
      '};return{restrict:"AE",replace:!0,scope:{},template:r.getTemplate(u),templateUrl:r.getTemplateUrl(),link:{post:function(u){var i=[],o=function(){d(i),i=[];var a=r.$getLastViewScope();u.steps=r.getStatesChain(!1,n),t.forEach(u.steps,function(t){if(t.ncyBreadcrumb&&t.ncyBreadcrumb.label){var r=e(t.ncyBreadcrumb.label);t.ncyBreadcrumbLabel=r(a),p(i,r,a,t)}else t.ncyBreadcrumbLabel=t.name})};c("BreadcrumbDirective.$viewContentLoaded",a,"$viewContentLoaded",function(e){e.targetScope.ncyBreadcrumbIgnore||o()}),o()}}}}function o(e,t,r,a){var n={"default":"{{ncyBreadcrumbLabel}}"};return{restrict:"A",scope:{},template:t.getTemplateLast(n),templateUrl:t.getTemplateLastUrl(),compile:function(a,n){var u=a.attr(n.$attr.ncyBreadcrumbLast);return u&&a.html(u),{post:function(a){var n=[],u=function(){d(n),n=[];var r=t.$getLastViewScope(),c=t.getLastStep();if(c)if(a.ncyBreadcrumbLink=c.ncyBreadcrumbLink,c.ncyBreadcrumb&&c.ncyBreadcrumb.label){var u=e(c.ncyBreadcrumb.label);a.ncyBreadcrumbLabel=u(r),p(n,u,r,a)}else a.ncyBreadcrumbLabel=c.name};c("BreadcrumbLastDirective.$viewContentLoaded",r,"$viewContentLoaded",function(e){e.targetScope.ncyBreadcrumbIgnore||u()}),u()}}}}}function s(e,r,a,n){return{restrict:"A",scope:{},template:"{{ncyBreadcrumbChain}}",compile:function(u,i){var o=u.attr(i.$attr.ncyBreadcrumbText);o&&u.html(o);var s=u.attr(i.$attr.ncyBreadcrumbTextSeparator)||" / ";return{post:function(u){var i=[],o=function(e,r,a){t.forEach(m(r),function(t){var r=a.$watch(t,function(e,t){e!==t&&l()});e.push(r)})},l=function(){d(i),i=[];var a=r.$getLastViewScope(),c=r.getStatesChain(!1,n),l=[];t.forEach(c,function(t){if(t.ncyBreadcrumb&&t.ncyBreadcrumb.label){var r=e(t.ncyBreadcrumb.label);l.push(r(a)),o(i,r,a)}else l.push(t.name)}),u.ncyBreadcrumbChain=l.join(s)};c("BreadcrumbTextDirective.$viewContentLoaded",a,"$viewContentLoaded",function(e){e.targetScope.ncyBreadcrumbIgnore||l()}),l()}}}}}var l={},m=function(e){if(e.expressions)return e.expressions;var r=[];return t.forEach(e.parts,function(e){t.isFunction(e)&&r.push(e.exp)}),r},p=function(e,r,a,n){t.forEach(m(r),function(t){var c=a.$watch(t,function(){n.ncyBreadcrumbLabel=r(a)});e.push(c)})},d=function(e){t.forEach(e,function(e){e()})};i.$inject=["$interpolate","$breadcrumb","$rootScope","$routeParams"],o.$inject=["$interpolate","$breadcrumb","$rootScope","$routeParams"],s.$inject=["$interpolate","$breadcrumb","$rootScope","$routeParams"],t.module("ncy-angular-breadcrumb",["ui.router.state"]).provider("$breadcrumb",u).directive("ncyBreadcrumb",i).directive("ncyBreadcrumbLast",o).directive("ncyBreadcrumbText",s)}(window,window.angular); \ No newline at end of file diff --git a/sample/angular-breadcrumb-0.5.2.zip b/sample/angular-breadcrumb-0.5.2.zip deleted file mode 100644 index 92a3bbd60936111b5b5763c58c2f0ab235021a2d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5933 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 T_8$%8f7Sl48~<}D0KoqO`P)G4 diff --git a/sample/angular-breadcrumb-0.5.3.zip b/sample/angular-breadcrumb-0.5.3.zip new file mode 100644 index 0000000000000000000000000000000000000000..f3933ba652b747eb0d3226051286e97c575f0e88 GIT binary patch literal 5945 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 c|4-Qel`Yhj(a`_HK>jz)|F+e?lmY Date: Thu, 20 Jul 2017 14:07:14 +0200 Subject: [PATCH 5/6] Conflicting Release Tag --- CHANGELOG.md | 4 ++-- bower.json | 2 +- dist/angular-breadcrumb.js | 2 +- dist/angular-breadcrumb.min.js | 2 +- package.json | 2 +- release/angular-breadcrumb.js | 2 +- release/angular-breadcrumb.min.js | 2 +- sample/angular-breadcrumb-0.5.3.zip | Bin 5945 -> 0 bytes sample/angular-breadcrumb-0.5.4.zip | Bin 0 -> 5944 bytes 9 files changed, 8 insertions(+), 8 deletions(-) delete mode 100644 sample/angular-breadcrumb-0.5.3.zip create mode 100644 sample/angular-breadcrumb-0.5.4.zip diff --git a/CHANGELOG.md b/CHANGELOG.md index c1ccb30..2c0ba7e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,5 @@ - -## 0.5.3 (2017-07-20) + +## 0.5.4 (2017-07-20) #### Bug Fixes * Ensuring that nesting only starts from current navigated to id closes [#159] - Bug on this change below diff --git a/bower.json b/bower.json index eb991c9..82635f2 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.3", + "version": "0.5.4", "main": "release/angular-breadcrumb.js", "ignore": [ "sample", diff --git a/dist/angular-breadcrumb.js b/dist/angular-breadcrumb.js index 4283642..33101d1 100644 --- a/dist/angular-breadcrumb.js +++ b/dist/angular-breadcrumb.js @@ -1,4 +1,4 @@ -/*! angular-breadcrumb - v0.5.3 +/*! angular-breadcrumb - v0.5.4 * http://ncuillery.github.io/angular-breadcrumb * Copyright (c) 2016 Nicolas Cuillery; Licensed MIT */ diff --git a/dist/angular-breadcrumb.min.js b/dist/angular-breadcrumb.min.js index 1f30256..ef75c9f 100644 --- a/dist/angular-breadcrumb.min.js +++ b/dist/angular-breadcrumb.min.js @@ -1,4 +1,4 @@ -/*! angular-breadcrumb - v0.5.3 +/*! angular-breadcrumb - v0.5.4 * http://ncuillery.github.io/angular-breadcrumb * Copyright (c) 2016 Nicolas Cuillery; Licensed MIT */ !function(e,t,r){"use strict";function a(e,r){return t.equals(e.length,r.length)?e>r:e.length>r.length}function n(e){var t=e.replace(/\n/g," ").match(/^([^(]+?)\s*(\((.*)\))?$/);if(!t||4!==t.length)throw new Error("Invalid state ref '"+e+"'");return{state:t[1],paramExpr:t[3]||null}}function c(e,t,a,n){var c=l[e];c!==r&&c(),c=t.$on(a,n),l[e]=c}function u(){var e={prefixStateName:null,template:"bootstrap3",templateUrl:null,templateLast:"default",templateLastUrl:null,includeAbstract:!1,useRootParams:!1};this.setOptions=function(r){t.extend(e,r)},this.$get=["$state","$stateParams","$rootScope",function(t,u,i){var o=i;c("$Breadcrumb.$viewContentLoaded",i,"$viewContentLoaded",function(e){!e.targetScope.ncyBreadcrumbIgnore&&a(e.targetScope.$id,o.$id)&&(o=e.targetScope)});var s=function(e){var t=e.parent||(/^(.+)\.[^.]+$/.exec(e.name)||[])[1],r="object"==typeof t;return r?t.name:t},l=function(r,a){for(var c,i,s=n(a),l=!1,m=!1,p=0,d=r.length;d>p;p+=1)if(r[p].name===s.state)return;c=t.get(s.state),c.ncyBreadcrumb&&(c.ncyBreadcrumb.force&&(l=!0),c.ncyBreadcrumb.skip&&(m=!0)),c["abstract"]&&!e.includeAbstract&&!l||m||(s.paramExpr&&(i=o.$eval(s.paramExpr)),c.ncyBreadcrumbLink=t.href(s.state,i||u||{}),c.ncyBreadcrumbStateRef=a,r.unshift(c))},m=function(e){var r=n(e),a=t.get(r.state);if(a.ncyBreadcrumb&&a.ncyBreadcrumb.parent){var c="function"==typeof a.ncyBreadcrumb.parent,u=c?a.ncyBreadcrumb.parent(o):a.ncyBreadcrumb.parent;if(u)return u}return s(a)};return{getTemplate:function(t){return e.templateUrl?null:t[e.template]?t[e.template]:e.template},getTemplateUrl:function(){return e.templateUrl},getTemplateLast:function(t){return e.templateLastUrl?null:t[e.templateLast]?t[e.templateLast]:e.templateLast},getTemplateLastUrl:function(){return e.templateLastUrl},getStatesChain:function(r,a){for(var c=[],u=!1,i=t.$current.self.name;i;i=m(i)){if(a&&a.id&&e.useRootParams){var o=n(i),s=t.get(o.state),p=t.get("myReportsNew."+a.id);s&&s.ncyBreadcrumb&&s.ncyBreadcrumb.parent?(s.ncyBreadcrumb.parent==p.ncyBreadcrumb.parent&&(u=!0),u&&l(c,i)):l(c,i)}else l(c,i);if(r&&c.length)return c}return e.prefixStateName&&l(c,e.prefixStateName),c},getLastStep:function(){var e=this.getStatesChain(!0,$routeParams);return e.length?e[0]:r},$getLastViewScope:function(){return o}}}]}function i(e,r,a,n){var u={bootstrap2:'

      ',bootstrap3:'
      1. {{step.ncyBreadcrumbLabel}}{{step.ncyBreadcrumbLabel}}
      '};return{restrict:"AE",replace:!0,scope:{},template:r.getTemplate(u),templateUrl:r.getTemplateUrl(),link:{post:function(u){var i=[],o=function(){d(i),i=[];var a=r.$getLastViewScope();u.steps=r.getStatesChain(!1,n),t.forEach(u.steps,function(t){if(t.ncyBreadcrumb&&t.ncyBreadcrumb.label){var r=e(t.ncyBreadcrumb.label);t.ncyBreadcrumbLabel=r(a),p(i,r,a,t)}else t.ncyBreadcrumbLabel=t.name})};c("BreadcrumbDirective.$viewContentLoaded",a,"$viewContentLoaded",function(e){e.targetScope.ncyBreadcrumbIgnore||o()}),o()}}}}function o(e,t,r,a){var n={"default":"{{ncyBreadcrumbLabel}}"};return{restrict:"A",scope:{},template:t.getTemplateLast(n),templateUrl:t.getTemplateLastUrl(),compile:function(a,n){var u=a.attr(n.$attr.ncyBreadcrumbLast);return u&&a.html(u),{post:function(a){var n=[],u=function(){d(n),n=[];var r=t.$getLastViewScope(),c=t.getLastStep();if(c)if(a.ncyBreadcrumbLink=c.ncyBreadcrumbLink,c.ncyBreadcrumb&&c.ncyBreadcrumb.label){var u=e(c.ncyBreadcrumb.label);a.ncyBreadcrumbLabel=u(r),p(n,u,r,a)}else a.ncyBreadcrumbLabel=c.name};c("BreadcrumbLastDirective.$viewContentLoaded",r,"$viewContentLoaded",function(e){e.targetScope.ncyBreadcrumbIgnore||u()}),u()}}}}}function s(e,r,a,n){return{restrict:"A",scope:{},template:"{{ncyBreadcrumbChain}}",compile:function(u,i){var o=u.attr(i.$attr.ncyBreadcrumbText);o&&u.html(o);var s=u.attr(i.$attr.ncyBreadcrumbTextSeparator)||" / ";return{post:function(u){var i=[],o=function(e,r,a){t.forEach(m(r),function(t){var r=a.$watch(t,function(e,t){e!==t&&l()});e.push(r)})},l=function(){d(i),i=[];var a=r.$getLastViewScope(),c=r.getStatesChain(!1,n),l=[];t.forEach(c,function(t){if(t.ncyBreadcrumb&&t.ncyBreadcrumb.label){var r=e(t.ncyBreadcrumb.label);l.push(r(a)),o(i,r,a)}else l.push(t.name)}),u.ncyBreadcrumbChain=l.join(s)};c("BreadcrumbTextDirective.$viewContentLoaded",a,"$viewContentLoaded",function(e){e.targetScope.ncyBreadcrumbIgnore||l()}),l()}}}}}var l={},m=function(e){if(e.expressions)return e.expressions;var r=[];return t.forEach(e.parts,function(e){t.isFunction(e)&&r.push(e.exp)}),r},p=function(e,r,a,n){t.forEach(m(r),function(t){var c=a.$watch(t,function(){n.ncyBreadcrumbLabel=r(a)});e.push(c)})},d=function(e){t.forEach(e,function(e){e()})};i.$inject=["$interpolate","$breadcrumb","$rootScope","$routeParams"],o.$inject=["$interpolate","$breadcrumb","$rootScope","$routeParams"],s.$inject=["$interpolate","$breadcrumb","$rootScope","$routeParams"],t.module("ncy-angular-breadcrumb",["ui.router.state"]).provider("$breadcrumb",u).directive("ncyBreadcrumb",i).directive("ncyBreadcrumbLast",o).directive("ncyBreadcrumbText",s)}(window,window.angular); \ No newline at end of file diff --git a/package.json b/package.json index 329cf26..2ae5c8f 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.3", + "version": "0.5.4", "homepage": "http://ncuillery.github.io/angular-breadcrumb", "author": { "name": "Nicolas Cuillery", diff --git a/release/angular-breadcrumb.js b/release/angular-breadcrumb.js index 4283642..33101d1 100644 --- a/release/angular-breadcrumb.js +++ b/release/angular-breadcrumb.js @@ -1,4 +1,4 @@ -/*! angular-breadcrumb - v0.5.3 +/*! angular-breadcrumb - v0.5.4 * http://ncuillery.github.io/angular-breadcrumb * Copyright (c) 2016 Nicolas Cuillery; Licensed MIT */ diff --git a/release/angular-breadcrumb.min.js b/release/angular-breadcrumb.min.js index 1f30256..ef75c9f 100644 --- a/release/angular-breadcrumb.min.js +++ b/release/angular-breadcrumb.min.js @@ -1,4 +1,4 @@ -/*! angular-breadcrumb - v0.5.3 +/*! angular-breadcrumb - v0.5.4 * http://ncuillery.github.io/angular-breadcrumb * Copyright (c) 2016 Nicolas Cuillery; Licensed MIT */ !function(e,t,r){"use strict";function a(e,r){return t.equals(e.length,r.length)?e>r:e.length>r.length}function n(e){var t=e.replace(/\n/g," ").match(/^([^(]+?)\s*(\((.*)\))?$/);if(!t||4!==t.length)throw new Error("Invalid state ref '"+e+"'");return{state:t[1],paramExpr:t[3]||null}}function c(e,t,a,n){var c=l[e];c!==r&&c(),c=t.$on(a,n),l[e]=c}function u(){var e={prefixStateName:null,template:"bootstrap3",templateUrl:null,templateLast:"default",templateLastUrl:null,includeAbstract:!1,useRootParams:!1};this.setOptions=function(r){t.extend(e,r)},this.$get=["$state","$stateParams","$rootScope",function(t,u,i){var o=i;c("$Breadcrumb.$viewContentLoaded",i,"$viewContentLoaded",function(e){!e.targetScope.ncyBreadcrumbIgnore&&a(e.targetScope.$id,o.$id)&&(o=e.targetScope)});var s=function(e){var t=e.parent||(/^(.+)\.[^.]+$/.exec(e.name)||[])[1],r="object"==typeof t;return r?t.name:t},l=function(r,a){for(var c,i,s=n(a),l=!1,m=!1,p=0,d=r.length;d>p;p+=1)if(r[p].name===s.state)return;c=t.get(s.state),c.ncyBreadcrumb&&(c.ncyBreadcrumb.force&&(l=!0),c.ncyBreadcrumb.skip&&(m=!0)),c["abstract"]&&!e.includeAbstract&&!l||m||(s.paramExpr&&(i=o.$eval(s.paramExpr)),c.ncyBreadcrumbLink=t.href(s.state,i||u||{}),c.ncyBreadcrumbStateRef=a,r.unshift(c))},m=function(e){var r=n(e),a=t.get(r.state);if(a.ncyBreadcrumb&&a.ncyBreadcrumb.parent){var c="function"==typeof a.ncyBreadcrumb.parent,u=c?a.ncyBreadcrumb.parent(o):a.ncyBreadcrumb.parent;if(u)return u}return s(a)};return{getTemplate:function(t){return e.templateUrl?null:t[e.template]?t[e.template]:e.template},getTemplateUrl:function(){return e.templateUrl},getTemplateLast:function(t){return e.templateLastUrl?null:t[e.templateLast]?t[e.templateLast]:e.templateLast},getTemplateLastUrl:function(){return e.templateLastUrl},getStatesChain:function(r,a){for(var c=[],u=!1,i=t.$current.self.name;i;i=m(i)){if(a&&a.id&&e.useRootParams){var o=n(i),s=t.get(o.state),p=t.get("myReportsNew."+a.id);s&&s.ncyBreadcrumb&&s.ncyBreadcrumb.parent?(s.ncyBreadcrumb.parent==p.ncyBreadcrumb.parent&&(u=!0),u&&l(c,i)):l(c,i)}else l(c,i);if(r&&c.length)return c}return e.prefixStateName&&l(c,e.prefixStateName),c},getLastStep:function(){var e=this.getStatesChain(!0,$routeParams);return e.length?e[0]:r},$getLastViewScope:function(){return o}}}]}function i(e,r,a,n){var u={bootstrap2:'',bootstrap3:'
      1. {{step.ncyBreadcrumbLabel}}{{step.ncyBreadcrumbLabel}}
      '};return{restrict:"AE",replace:!0,scope:{},template:r.getTemplate(u),templateUrl:r.getTemplateUrl(),link:{post:function(u){var i=[],o=function(){d(i),i=[];var a=r.$getLastViewScope();u.steps=r.getStatesChain(!1,n),t.forEach(u.steps,function(t){if(t.ncyBreadcrumb&&t.ncyBreadcrumb.label){var r=e(t.ncyBreadcrumb.label);t.ncyBreadcrumbLabel=r(a),p(i,r,a,t)}else t.ncyBreadcrumbLabel=t.name})};c("BreadcrumbDirective.$viewContentLoaded",a,"$viewContentLoaded",function(e){e.targetScope.ncyBreadcrumbIgnore||o()}),o()}}}}function o(e,t,r,a){var n={"default":"{{ncyBreadcrumbLabel}}"};return{restrict:"A",scope:{},template:t.getTemplateLast(n),templateUrl:t.getTemplateLastUrl(),compile:function(a,n){var u=a.attr(n.$attr.ncyBreadcrumbLast);return u&&a.html(u),{post:function(a){var n=[],u=function(){d(n),n=[];var r=t.$getLastViewScope(),c=t.getLastStep();if(c)if(a.ncyBreadcrumbLink=c.ncyBreadcrumbLink,c.ncyBreadcrumb&&c.ncyBreadcrumb.label){var u=e(c.ncyBreadcrumb.label);a.ncyBreadcrumbLabel=u(r),p(n,u,r,a)}else a.ncyBreadcrumbLabel=c.name};c("BreadcrumbLastDirective.$viewContentLoaded",r,"$viewContentLoaded",function(e){e.targetScope.ncyBreadcrumbIgnore||u()}),u()}}}}}function s(e,r,a,n){return{restrict:"A",scope:{},template:"{{ncyBreadcrumbChain}}",compile:function(u,i){var o=u.attr(i.$attr.ncyBreadcrumbText);o&&u.html(o);var s=u.attr(i.$attr.ncyBreadcrumbTextSeparator)||" / ";return{post:function(u){var i=[],o=function(e,r,a){t.forEach(m(r),function(t){var r=a.$watch(t,function(e,t){e!==t&&l()});e.push(r)})},l=function(){d(i),i=[];var a=r.$getLastViewScope(),c=r.getStatesChain(!1,n),l=[];t.forEach(c,function(t){if(t.ncyBreadcrumb&&t.ncyBreadcrumb.label){var r=e(t.ncyBreadcrumb.label);l.push(r(a)),o(i,r,a)}else l.push(t.name)}),u.ncyBreadcrumbChain=l.join(s)};c("BreadcrumbTextDirective.$viewContentLoaded",a,"$viewContentLoaded",function(e){e.targetScope.ncyBreadcrumbIgnore||l()}),l()}}}}}var l={},m=function(e){if(e.expressions)return e.expressions;var r=[];return t.forEach(e.parts,function(e){t.isFunction(e)&&r.push(e.exp)}),r},p=function(e,r,a,n){t.forEach(m(r),function(t){var c=a.$watch(t,function(){n.ncyBreadcrumbLabel=r(a)});e.push(c)})},d=function(e){t.forEach(e,function(e){e()})};i.$inject=["$interpolate","$breadcrumb","$rootScope","$routeParams"],o.$inject=["$interpolate","$breadcrumb","$rootScope","$routeParams"],s.$inject=["$interpolate","$breadcrumb","$rootScope","$routeParams"],t.module("ncy-angular-breadcrumb",["ui.router.state"]).provider("$breadcrumb",u).directive("ncyBreadcrumb",i).directive("ncyBreadcrumbLast",o).directive("ncyBreadcrumbText",s)}(window,window.angular); \ No newline at end of file diff --git a/sample/angular-breadcrumb-0.5.3.zip b/sample/angular-breadcrumb-0.5.3.zip deleted file mode 100644 index f3933ba652b747eb0d3226051286e97c575f0e88..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5945 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 literal 0 HcmV?d00001 From 3f4232dd71792862c7ff35baab3772554ff55f0f Mon Sep 17 00:00:00 2001 From: Muhammed Baderdien Date: Thu, 20 Jul 2017 15:50:01 +0200 Subject: [PATCH 6/6] Opening Breadcrumb from another page --- CHANGELOG.md | 4 ++-- bower.json | 2 +- dist/angular-breadcrumb.js | 4 ++-- dist/angular-breadcrumb.min.js | 4 ++-- package.json | 2 +- release/angular-breadcrumb.js | 4 ++-- release/angular-breadcrumb.min.js | 4 ++-- sample/angular-breadcrumb-0.5.4.zip | Bin 5944 -> 0 bytes sample/angular-breadcrumb-0.5.5.zip | Bin 0 -> 5961 bytes 9 files changed, 12 insertions(+), 12 deletions(-) delete mode 100644 sample/angular-breadcrumb-0.5.4.zip create mode 100644 sample/angular-breadcrumb-0.5.5.zip diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c0ba7e..0fc45e5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,5 @@ - -## 0.5.4 (2017-07-20) + +## 0.5.5 (2017-07-20) #### Bug Fixes * Ensuring that nesting only starts from current navigated to id closes [#159] - Bug on this change below diff --git a/bower.json b/bower.json index 82635f2..b1dbf88 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.4", + "version": "0.5.5", "main": "release/angular-breadcrumb.js", "ignore": [ "sample", diff --git a/dist/angular-breadcrumb.js b/dist/angular-breadcrumb.js index 33101d1..184a3e7 100644 --- a/dist/angular-breadcrumb.js +++ b/dist/angular-breadcrumb.js @@ -1,4 +1,4 @@ -/*! angular-breadcrumb - v0.5.4 +/*! angular-breadcrumb - v0.5.5 * http://ncuillery.github.io/angular-breadcrumb * Copyright (c) 2016 Nicolas Cuillery; Licensed MIT */ @@ -158,7 +158,7 @@ function $Breadcrumb() { // From current state to the root for (var stateRef = $state.$current.self.name; stateRef; stateRef = $$breadcrumbParentState(stateRef)) { - if ($routeParams && $routeParams.id && $$options.useRootParams ) { + if ($routeParams && $routeParams.id && $$options.useRootParams && !$routeParams.external) { //Ensuring that nesting only starts from current navigated to id diff --git a/dist/angular-breadcrumb.min.js b/dist/angular-breadcrumb.min.js index ef75c9f..9a59e29 100644 --- a/dist/angular-breadcrumb.min.js +++ b/dist/angular-breadcrumb.min.js @@ -1,4 +1,4 @@ -/*! angular-breadcrumb - v0.5.4 +/*! angular-breadcrumb - v0.5.5 * http://ncuillery.github.io/angular-breadcrumb * Copyright (c) 2016 Nicolas Cuillery; Licensed MIT */ -!function(e,t,r){"use strict";function a(e,r){return t.equals(e.length,r.length)?e>r:e.length>r.length}function n(e){var t=e.replace(/\n/g," ").match(/^([^(]+?)\s*(\((.*)\))?$/);if(!t||4!==t.length)throw new Error("Invalid state ref '"+e+"'");return{state:t[1],paramExpr:t[3]||null}}function c(e,t,a,n){var c=l[e];c!==r&&c(),c=t.$on(a,n),l[e]=c}function u(){var e={prefixStateName:null,template:"bootstrap3",templateUrl:null,templateLast:"default",templateLastUrl:null,includeAbstract:!1,useRootParams:!1};this.setOptions=function(r){t.extend(e,r)},this.$get=["$state","$stateParams","$rootScope",function(t,u,i){var o=i;c("$Breadcrumb.$viewContentLoaded",i,"$viewContentLoaded",function(e){!e.targetScope.ncyBreadcrumbIgnore&&a(e.targetScope.$id,o.$id)&&(o=e.targetScope)});var s=function(e){var t=e.parent||(/^(.+)\.[^.]+$/.exec(e.name)||[])[1],r="object"==typeof t;return r?t.name:t},l=function(r,a){for(var c,i,s=n(a),l=!1,m=!1,p=0,d=r.length;d>p;p+=1)if(r[p].name===s.state)return;c=t.get(s.state),c.ncyBreadcrumb&&(c.ncyBreadcrumb.force&&(l=!0),c.ncyBreadcrumb.skip&&(m=!0)),c["abstract"]&&!e.includeAbstract&&!l||m||(s.paramExpr&&(i=o.$eval(s.paramExpr)),c.ncyBreadcrumbLink=t.href(s.state,i||u||{}),c.ncyBreadcrumbStateRef=a,r.unshift(c))},m=function(e){var r=n(e),a=t.get(r.state);if(a.ncyBreadcrumb&&a.ncyBreadcrumb.parent){var c="function"==typeof a.ncyBreadcrumb.parent,u=c?a.ncyBreadcrumb.parent(o):a.ncyBreadcrumb.parent;if(u)return u}return s(a)};return{getTemplate:function(t){return e.templateUrl?null:t[e.template]?t[e.template]:e.template},getTemplateUrl:function(){return e.templateUrl},getTemplateLast:function(t){return e.templateLastUrl?null:t[e.templateLast]?t[e.templateLast]:e.templateLast},getTemplateLastUrl:function(){return e.templateLastUrl},getStatesChain:function(r,a){for(var c=[],u=!1,i=t.$current.self.name;i;i=m(i)){if(a&&a.id&&e.useRootParams){var o=n(i),s=t.get(o.state),p=t.get("myReportsNew."+a.id);s&&s.ncyBreadcrumb&&s.ncyBreadcrumb.parent?(s.ncyBreadcrumb.parent==p.ncyBreadcrumb.parent&&(u=!0),u&&l(c,i)):l(c,i)}else l(c,i);if(r&&c.length)return c}return e.prefixStateName&&l(c,e.prefixStateName),c},getLastStep:function(){var e=this.getStatesChain(!0,$routeParams);return e.length?e[0]:r},$getLastViewScope:function(){return o}}}]}function i(e,r,a,n){var u={bootstrap2:'

      ',bootstrap3:'
      1. {{step.ncyBreadcrumbLabel}}{{step.ncyBreadcrumbLabel}}
      '};return{restrict:"AE",replace:!0,scope:{},template:r.getTemplate(u),templateUrl:r.getTemplateUrl(),link:{post:function(u){var i=[],o=function(){d(i),i=[];var a=r.$getLastViewScope();u.steps=r.getStatesChain(!1,n),t.forEach(u.steps,function(t){if(t.ncyBreadcrumb&&t.ncyBreadcrumb.label){var r=e(t.ncyBreadcrumb.label);t.ncyBreadcrumbLabel=r(a),p(i,r,a,t)}else t.ncyBreadcrumbLabel=t.name})};c("BreadcrumbDirective.$viewContentLoaded",a,"$viewContentLoaded",function(e){e.targetScope.ncyBreadcrumbIgnore||o()}),o()}}}}function o(e,t,r,a){var n={"default":"{{ncyBreadcrumbLabel}}"};return{restrict:"A",scope:{},template:t.getTemplateLast(n),templateUrl:t.getTemplateLastUrl(),compile:function(a,n){var u=a.attr(n.$attr.ncyBreadcrumbLast);return u&&a.html(u),{post:function(a){var n=[],u=function(){d(n),n=[];var r=t.$getLastViewScope(),c=t.getLastStep();if(c)if(a.ncyBreadcrumbLink=c.ncyBreadcrumbLink,c.ncyBreadcrumb&&c.ncyBreadcrumb.label){var u=e(c.ncyBreadcrumb.label);a.ncyBreadcrumbLabel=u(r),p(n,u,r,a)}else a.ncyBreadcrumbLabel=c.name};c("BreadcrumbLastDirective.$viewContentLoaded",r,"$viewContentLoaded",function(e){e.targetScope.ncyBreadcrumbIgnore||u()}),u()}}}}}function s(e,r,a,n){return{restrict:"A",scope:{},template:"{{ncyBreadcrumbChain}}",compile:function(u,i){var o=u.attr(i.$attr.ncyBreadcrumbText);o&&u.html(o);var s=u.attr(i.$attr.ncyBreadcrumbTextSeparator)||" / ";return{post:function(u){var i=[],o=function(e,r,a){t.forEach(m(r),function(t){var r=a.$watch(t,function(e,t){e!==t&&l()});e.push(r)})},l=function(){d(i),i=[];var a=r.$getLastViewScope(),c=r.getStatesChain(!1,n),l=[];t.forEach(c,function(t){if(t.ncyBreadcrumb&&t.ncyBreadcrumb.label){var r=e(t.ncyBreadcrumb.label);l.push(r(a)),o(i,r,a)}else l.push(t.name)}),u.ncyBreadcrumbChain=l.join(s)};c("BreadcrumbTextDirective.$viewContentLoaded",a,"$viewContentLoaded",function(e){e.targetScope.ncyBreadcrumbIgnore||l()}),l()}}}}}var l={},m=function(e){if(e.expressions)return e.expressions;var r=[];return t.forEach(e.parts,function(e){t.isFunction(e)&&r.push(e.exp)}),r},p=function(e,r,a,n){t.forEach(m(r),function(t){var c=a.$watch(t,function(){n.ncyBreadcrumbLabel=r(a)});e.push(c)})},d=function(e){t.forEach(e,function(e){e()})};i.$inject=["$interpolate","$breadcrumb","$rootScope","$routeParams"],o.$inject=["$interpolate","$breadcrumb","$rootScope","$routeParams"],s.$inject=["$interpolate","$breadcrumb","$rootScope","$routeParams"],t.module("ncy-angular-breadcrumb",["ui.router.state"]).provider("$breadcrumb",u).directive("ncyBreadcrumb",i).directive("ncyBreadcrumbLast",o).directive("ncyBreadcrumbText",s)}(window,window.angular); \ No newline at end of file +!function(e,t,r){"use strict";function a(e,r){return t.equals(e.length,r.length)?e>r:e.length>r.length}function n(e){var t=e.replace(/\n/g," ").match(/^([^(]+?)\s*(\((.*)\))?$/);if(!t||4!==t.length)throw new Error("Invalid state ref '"+e+"'");return{state:t[1],paramExpr:t[3]||null}}function c(e,t,a,n){var c=l[e];c!==r&&c(),c=t.$on(a,n),l[e]=c}function u(){var e={prefixStateName:null,template:"bootstrap3",templateUrl:null,templateLast:"default",templateLastUrl:null,includeAbstract:!1,useRootParams:!1};this.setOptions=function(r){t.extend(e,r)},this.$get=["$state","$stateParams","$rootScope",function(t,u,i){var o=i;c("$Breadcrumb.$viewContentLoaded",i,"$viewContentLoaded",function(e){!e.targetScope.ncyBreadcrumbIgnore&&a(e.targetScope.$id,o.$id)&&(o=e.targetScope)});var s=function(e){var t=e.parent||(/^(.+)\.[^.]+$/.exec(e.name)||[])[1],r="object"==typeof t;return r?t.name:t},l=function(r,a){for(var c,i,s=n(a),l=!1,m=!1,p=0,d=r.length;d>p;p+=1)if(r[p].name===s.state)return;c=t.get(s.state),c.ncyBreadcrumb&&(c.ncyBreadcrumb.force&&(l=!0),c.ncyBreadcrumb.skip&&(m=!0)),c["abstract"]&&!e.includeAbstract&&!l||m||(s.paramExpr&&(i=o.$eval(s.paramExpr)),c.ncyBreadcrumbLink=t.href(s.state,i||u||{}),c.ncyBreadcrumbStateRef=a,r.unshift(c))},m=function(e){var r=n(e),a=t.get(r.state);if(a.ncyBreadcrumb&&a.ncyBreadcrumb.parent){var c="function"==typeof a.ncyBreadcrumb.parent,u=c?a.ncyBreadcrumb.parent(o):a.ncyBreadcrumb.parent;if(u)return u}return s(a)};return{getTemplate:function(t){return e.templateUrl?null:t[e.template]?t[e.template]:e.template},getTemplateUrl:function(){return e.templateUrl},getTemplateLast:function(t){return e.templateLastUrl?null:t[e.templateLast]?t[e.templateLast]:e.templateLast},getTemplateLastUrl:function(){return e.templateLastUrl},getStatesChain:function(r,a){for(var c=[],u=!1,i=t.$current.self.name;i;i=m(i)){if(a&&a.id&&e.useRootParams&&!a.external){var o=n(i),s=t.get(o.state),p=t.get("myReportsNew."+a.id);s&&s.ncyBreadcrumb&&s.ncyBreadcrumb.parent?(s.ncyBreadcrumb.parent==p.ncyBreadcrumb.parent&&(u=!0),u&&l(c,i)):l(c,i)}else l(c,i);if(r&&c.length)return c}return e.prefixStateName&&l(c,e.prefixStateName),c},getLastStep:function(){var e=this.getStatesChain(!0,$routeParams);return e.length?e[0]:r},$getLastViewScope:function(){return o}}}]}function i(e,r,a,n){var u={bootstrap2:'',bootstrap3:'
      1. {{step.ncyBreadcrumbLabel}}{{step.ncyBreadcrumbLabel}}
      '};return{restrict:"AE",replace:!0,scope:{},template:r.getTemplate(u),templateUrl:r.getTemplateUrl(),link:{post:function(u){var i=[],o=function(){d(i),i=[];var a=r.$getLastViewScope();u.steps=r.getStatesChain(!1,n),t.forEach(u.steps,function(t){if(t.ncyBreadcrumb&&t.ncyBreadcrumb.label){var r=e(t.ncyBreadcrumb.label);t.ncyBreadcrumbLabel=r(a),p(i,r,a,t)}else t.ncyBreadcrumbLabel=t.name})};c("BreadcrumbDirective.$viewContentLoaded",a,"$viewContentLoaded",function(e){e.targetScope.ncyBreadcrumbIgnore||o()}),o()}}}}function o(e,t,r,a){var n={"default":"{{ncyBreadcrumbLabel}}"};return{restrict:"A",scope:{},template:t.getTemplateLast(n),templateUrl:t.getTemplateLastUrl(),compile:function(a,n){var u=a.attr(n.$attr.ncyBreadcrumbLast);return u&&a.html(u),{post:function(a){var n=[],u=function(){d(n),n=[];var r=t.$getLastViewScope(),c=t.getLastStep();if(c)if(a.ncyBreadcrumbLink=c.ncyBreadcrumbLink,c.ncyBreadcrumb&&c.ncyBreadcrumb.label){var u=e(c.ncyBreadcrumb.label);a.ncyBreadcrumbLabel=u(r),p(n,u,r,a)}else a.ncyBreadcrumbLabel=c.name};c("BreadcrumbLastDirective.$viewContentLoaded",r,"$viewContentLoaded",function(e){e.targetScope.ncyBreadcrumbIgnore||u()}),u()}}}}}function s(e,r,a,n){return{restrict:"A",scope:{},template:"{{ncyBreadcrumbChain}}",compile:function(u,i){var o=u.attr(i.$attr.ncyBreadcrumbText);o&&u.html(o);var s=u.attr(i.$attr.ncyBreadcrumbTextSeparator)||" / ";return{post:function(u){var i=[],o=function(e,r,a){t.forEach(m(r),function(t){var r=a.$watch(t,function(e,t){e!==t&&l()});e.push(r)})},l=function(){d(i),i=[];var a=r.$getLastViewScope(),c=r.getStatesChain(!1,n),l=[];t.forEach(c,function(t){if(t.ncyBreadcrumb&&t.ncyBreadcrumb.label){var r=e(t.ncyBreadcrumb.label);l.push(r(a)),o(i,r,a)}else l.push(t.name)}),u.ncyBreadcrumbChain=l.join(s)};c("BreadcrumbTextDirective.$viewContentLoaded",a,"$viewContentLoaded",function(e){e.targetScope.ncyBreadcrumbIgnore||l()}),l()}}}}}var l={},m=function(e){if(e.expressions)return e.expressions;var r=[];return t.forEach(e.parts,function(e){t.isFunction(e)&&r.push(e.exp)}),r},p=function(e,r,a,n){t.forEach(m(r),function(t){var c=a.$watch(t,function(){n.ncyBreadcrumbLabel=r(a)});e.push(c)})},d=function(e){t.forEach(e,function(e){e()})};i.$inject=["$interpolate","$breadcrumb","$rootScope","$routeParams"],o.$inject=["$interpolate","$breadcrumb","$rootScope","$routeParams"],s.$inject=["$interpolate","$breadcrumb","$rootScope","$routeParams"],t.module("ncy-angular-breadcrumb",["ui.router.state"]).provider("$breadcrumb",u).directive("ncyBreadcrumb",i).directive("ncyBreadcrumbLast",o).directive("ncyBreadcrumbText",s)}(window,window.angular); \ No newline at end of file diff --git a/package.json b/package.json index 2ae5c8f..ce96fe5 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.4", + "version": "0.5.5", "homepage": "http://ncuillery.github.io/angular-breadcrumb", "author": { "name": "Nicolas Cuillery", diff --git a/release/angular-breadcrumb.js b/release/angular-breadcrumb.js index 33101d1..184a3e7 100644 --- a/release/angular-breadcrumb.js +++ b/release/angular-breadcrumb.js @@ -1,4 +1,4 @@ -/*! angular-breadcrumb - v0.5.4 +/*! angular-breadcrumb - v0.5.5 * http://ncuillery.github.io/angular-breadcrumb * Copyright (c) 2016 Nicolas Cuillery; Licensed MIT */ @@ -158,7 +158,7 @@ function $Breadcrumb() { // From current state to the root for (var stateRef = $state.$current.self.name; stateRef; stateRef = $$breadcrumbParentState(stateRef)) { - if ($routeParams && $routeParams.id && $$options.useRootParams ) { + if ($routeParams && $routeParams.id && $$options.useRootParams && !$routeParams.external) { //Ensuring that nesting only starts from current navigated to id diff --git a/release/angular-breadcrumb.min.js b/release/angular-breadcrumb.min.js index ef75c9f..9a59e29 100644 --- a/release/angular-breadcrumb.min.js +++ b/release/angular-breadcrumb.min.js @@ -1,4 +1,4 @@ -/*! angular-breadcrumb - v0.5.4 +/*! angular-breadcrumb - v0.5.5 * http://ncuillery.github.io/angular-breadcrumb * Copyright (c) 2016 Nicolas Cuillery; Licensed MIT */ -!function(e,t,r){"use strict";function a(e,r){return t.equals(e.length,r.length)?e>r:e.length>r.length}function n(e){var t=e.replace(/\n/g," ").match(/^([^(]+?)\s*(\((.*)\))?$/);if(!t||4!==t.length)throw new Error("Invalid state ref '"+e+"'");return{state:t[1],paramExpr:t[3]||null}}function c(e,t,a,n){var c=l[e];c!==r&&c(),c=t.$on(a,n),l[e]=c}function u(){var e={prefixStateName:null,template:"bootstrap3",templateUrl:null,templateLast:"default",templateLastUrl:null,includeAbstract:!1,useRootParams:!1};this.setOptions=function(r){t.extend(e,r)},this.$get=["$state","$stateParams","$rootScope",function(t,u,i){var o=i;c("$Breadcrumb.$viewContentLoaded",i,"$viewContentLoaded",function(e){!e.targetScope.ncyBreadcrumbIgnore&&a(e.targetScope.$id,o.$id)&&(o=e.targetScope)});var s=function(e){var t=e.parent||(/^(.+)\.[^.]+$/.exec(e.name)||[])[1],r="object"==typeof t;return r?t.name:t},l=function(r,a){for(var c,i,s=n(a),l=!1,m=!1,p=0,d=r.length;d>p;p+=1)if(r[p].name===s.state)return;c=t.get(s.state),c.ncyBreadcrumb&&(c.ncyBreadcrumb.force&&(l=!0),c.ncyBreadcrumb.skip&&(m=!0)),c["abstract"]&&!e.includeAbstract&&!l||m||(s.paramExpr&&(i=o.$eval(s.paramExpr)),c.ncyBreadcrumbLink=t.href(s.state,i||u||{}),c.ncyBreadcrumbStateRef=a,r.unshift(c))},m=function(e){var r=n(e),a=t.get(r.state);if(a.ncyBreadcrumb&&a.ncyBreadcrumb.parent){var c="function"==typeof a.ncyBreadcrumb.parent,u=c?a.ncyBreadcrumb.parent(o):a.ncyBreadcrumb.parent;if(u)return u}return s(a)};return{getTemplate:function(t){return e.templateUrl?null:t[e.template]?t[e.template]:e.template},getTemplateUrl:function(){return e.templateUrl},getTemplateLast:function(t){return e.templateLastUrl?null:t[e.templateLast]?t[e.templateLast]:e.templateLast},getTemplateLastUrl:function(){return e.templateLastUrl},getStatesChain:function(r,a){for(var c=[],u=!1,i=t.$current.self.name;i;i=m(i)){if(a&&a.id&&e.useRootParams){var o=n(i),s=t.get(o.state),p=t.get("myReportsNew."+a.id);s&&s.ncyBreadcrumb&&s.ncyBreadcrumb.parent?(s.ncyBreadcrumb.parent==p.ncyBreadcrumb.parent&&(u=!0),u&&l(c,i)):l(c,i)}else l(c,i);if(r&&c.length)return c}return e.prefixStateName&&l(c,e.prefixStateName),c},getLastStep:function(){var e=this.getStatesChain(!0,$routeParams);return e.length?e[0]:r},$getLastViewScope:function(){return o}}}]}function i(e,r,a,n){var u={bootstrap2:'',bootstrap3:'
      1. {{step.ncyBreadcrumbLabel}}{{step.ncyBreadcrumbLabel}}
      '};return{restrict:"AE",replace:!0,scope:{},template:r.getTemplate(u),templateUrl:r.getTemplateUrl(),link:{post:function(u){var i=[],o=function(){d(i),i=[];var a=r.$getLastViewScope();u.steps=r.getStatesChain(!1,n),t.forEach(u.steps,function(t){if(t.ncyBreadcrumb&&t.ncyBreadcrumb.label){var r=e(t.ncyBreadcrumb.label);t.ncyBreadcrumbLabel=r(a),p(i,r,a,t)}else t.ncyBreadcrumbLabel=t.name})};c("BreadcrumbDirective.$viewContentLoaded",a,"$viewContentLoaded",function(e){e.targetScope.ncyBreadcrumbIgnore||o()}),o()}}}}function o(e,t,r,a){var n={"default":"{{ncyBreadcrumbLabel}}"};return{restrict:"A",scope:{},template:t.getTemplateLast(n),templateUrl:t.getTemplateLastUrl(),compile:function(a,n){var u=a.attr(n.$attr.ncyBreadcrumbLast);return u&&a.html(u),{post:function(a){var n=[],u=function(){d(n),n=[];var r=t.$getLastViewScope(),c=t.getLastStep();if(c)if(a.ncyBreadcrumbLink=c.ncyBreadcrumbLink,c.ncyBreadcrumb&&c.ncyBreadcrumb.label){var u=e(c.ncyBreadcrumb.label);a.ncyBreadcrumbLabel=u(r),p(n,u,r,a)}else a.ncyBreadcrumbLabel=c.name};c("BreadcrumbLastDirective.$viewContentLoaded",r,"$viewContentLoaded",function(e){e.targetScope.ncyBreadcrumbIgnore||u()}),u()}}}}}function s(e,r,a,n){return{restrict:"A",scope:{},template:"{{ncyBreadcrumbChain}}",compile:function(u,i){var o=u.attr(i.$attr.ncyBreadcrumbText);o&&u.html(o);var s=u.attr(i.$attr.ncyBreadcrumbTextSeparator)||" / ";return{post:function(u){var i=[],o=function(e,r,a){t.forEach(m(r),function(t){var r=a.$watch(t,function(e,t){e!==t&&l()});e.push(r)})},l=function(){d(i),i=[];var a=r.$getLastViewScope(),c=r.getStatesChain(!1,n),l=[];t.forEach(c,function(t){if(t.ncyBreadcrumb&&t.ncyBreadcrumb.label){var r=e(t.ncyBreadcrumb.label);l.push(r(a)),o(i,r,a)}else l.push(t.name)}),u.ncyBreadcrumbChain=l.join(s)};c("BreadcrumbTextDirective.$viewContentLoaded",a,"$viewContentLoaded",function(e){e.targetScope.ncyBreadcrumbIgnore||l()}),l()}}}}}var l={},m=function(e){if(e.expressions)return e.expressions;var r=[];return t.forEach(e.parts,function(e){t.isFunction(e)&&r.push(e.exp)}),r},p=function(e,r,a,n){t.forEach(m(r),function(t){var c=a.$watch(t,function(){n.ncyBreadcrumbLabel=r(a)});e.push(c)})},d=function(e){t.forEach(e,function(e){e()})};i.$inject=["$interpolate","$breadcrumb","$rootScope","$routeParams"],o.$inject=["$interpolate","$breadcrumb","$rootScope","$routeParams"],s.$inject=["$interpolate","$breadcrumb","$rootScope","$routeParams"],t.module("ncy-angular-breadcrumb",["ui.router.state"]).provider("$breadcrumb",u).directive("ncyBreadcrumb",i).directive("ncyBreadcrumbLast",o).directive("ncyBreadcrumbText",s)}(window,window.angular); \ No newline at end of file +!function(e,t,r){"use strict";function a(e,r){return t.equals(e.length,r.length)?e>r:e.length>r.length}function n(e){var t=e.replace(/\n/g," ").match(/^([^(]+?)\s*(\((.*)\))?$/);if(!t||4!==t.length)throw new Error("Invalid state ref '"+e+"'");return{state:t[1],paramExpr:t[3]||null}}function c(e,t,a,n){var c=l[e];c!==r&&c(),c=t.$on(a,n),l[e]=c}function u(){var e={prefixStateName:null,template:"bootstrap3",templateUrl:null,templateLast:"default",templateLastUrl:null,includeAbstract:!1,useRootParams:!1};this.setOptions=function(r){t.extend(e,r)},this.$get=["$state","$stateParams","$rootScope",function(t,u,i){var o=i;c("$Breadcrumb.$viewContentLoaded",i,"$viewContentLoaded",function(e){!e.targetScope.ncyBreadcrumbIgnore&&a(e.targetScope.$id,o.$id)&&(o=e.targetScope)});var s=function(e){var t=e.parent||(/^(.+)\.[^.]+$/.exec(e.name)||[])[1],r="object"==typeof t;return r?t.name:t},l=function(r,a){for(var c,i,s=n(a),l=!1,m=!1,p=0,d=r.length;d>p;p+=1)if(r[p].name===s.state)return;c=t.get(s.state),c.ncyBreadcrumb&&(c.ncyBreadcrumb.force&&(l=!0),c.ncyBreadcrumb.skip&&(m=!0)),c["abstract"]&&!e.includeAbstract&&!l||m||(s.paramExpr&&(i=o.$eval(s.paramExpr)),c.ncyBreadcrumbLink=t.href(s.state,i||u||{}),c.ncyBreadcrumbStateRef=a,r.unshift(c))},m=function(e){var r=n(e),a=t.get(r.state);if(a.ncyBreadcrumb&&a.ncyBreadcrumb.parent){var c="function"==typeof a.ncyBreadcrumb.parent,u=c?a.ncyBreadcrumb.parent(o):a.ncyBreadcrumb.parent;if(u)return u}return s(a)};return{getTemplate:function(t){return e.templateUrl?null:t[e.template]?t[e.template]:e.template},getTemplateUrl:function(){return e.templateUrl},getTemplateLast:function(t){return e.templateLastUrl?null:t[e.templateLast]?t[e.templateLast]:e.templateLast},getTemplateLastUrl:function(){return e.templateLastUrl},getStatesChain:function(r,a){for(var c=[],u=!1,i=t.$current.self.name;i;i=m(i)){if(a&&a.id&&e.useRootParams&&!a.external){var o=n(i),s=t.get(o.state),p=t.get("myReportsNew."+a.id);s&&s.ncyBreadcrumb&&s.ncyBreadcrumb.parent?(s.ncyBreadcrumb.parent==p.ncyBreadcrumb.parent&&(u=!0),u&&l(c,i)):l(c,i)}else l(c,i);if(r&&c.length)return c}return e.prefixStateName&&l(c,e.prefixStateName),c},getLastStep:function(){var e=this.getStatesChain(!0,$routeParams);return e.length?e[0]:r},$getLastViewScope:function(){return o}}}]}function i(e,r,a,n){var u={bootstrap2:'',bootstrap3:'
      1. {{step.ncyBreadcrumbLabel}}{{step.ncyBreadcrumbLabel}}
      '};return{restrict:"AE",replace:!0,scope:{},template:r.getTemplate(u),templateUrl:r.getTemplateUrl(),link:{post:function(u){var i=[],o=function(){d(i),i=[];var a=r.$getLastViewScope();u.steps=r.getStatesChain(!1,n),t.forEach(u.steps,function(t){if(t.ncyBreadcrumb&&t.ncyBreadcrumb.label){var r=e(t.ncyBreadcrumb.label);t.ncyBreadcrumbLabel=r(a),p(i,r,a,t)}else t.ncyBreadcrumbLabel=t.name})};c("BreadcrumbDirective.$viewContentLoaded",a,"$viewContentLoaded",function(e){e.targetScope.ncyBreadcrumbIgnore||o()}),o()}}}}function o(e,t,r,a){var n={"default":"{{ncyBreadcrumbLabel}}"};return{restrict:"A",scope:{},template:t.getTemplateLast(n),templateUrl:t.getTemplateLastUrl(),compile:function(a,n){var u=a.attr(n.$attr.ncyBreadcrumbLast);return u&&a.html(u),{post:function(a){var n=[],u=function(){d(n),n=[];var r=t.$getLastViewScope(),c=t.getLastStep();if(c)if(a.ncyBreadcrumbLink=c.ncyBreadcrumbLink,c.ncyBreadcrumb&&c.ncyBreadcrumb.label){var u=e(c.ncyBreadcrumb.label);a.ncyBreadcrumbLabel=u(r),p(n,u,r,a)}else a.ncyBreadcrumbLabel=c.name};c("BreadcrumbLastDirective.$viewContentLoaded",r,"$viewContentLoaded",function(e){e.targetScope.ncyBreadcrumbIgnore||u()}),u()}}}}}function s(e,r,a,n){return{restrict:"A",scope:{},template:"{{ncyBreadcrumbChain}}",compile:function(u,i){var o=u.attr(i.$attr.ncyBreadcrumbText);o&&u.html(o);var s=u.attr(i.$attr.ncyBreadcrumbTextSeparator)||" / ";return{post:function(u){var i=[],o=function(e,r,a){t.forEach(m(r),function(t){var r=a.$watch(t,function(e,t){e!==t&&l()});e.push(r)})},l=function(){d(i),i=[];var a=r.$getLastViewScope(),c=r.getStatesChain(!1,n),l=[];t.forEach(c,function(t){if(t.ncyBreadcrumb&&t.ncyBreadcrumb.label){var r=e(t.ncyBreadcrumb.label);l.push(r(a)),o(i,r,a)}else l.push(t.name)}),u.ncyBreadcrumbChain=l.join(s)};c("BreadcrumbTextDirective.$viewContentLoaded",a,"$viewContentLoaded",function(e){e.targetScope.ncyBreadcrumbIgnore||l()}),l()}}}}}var l={},m=function(e){if(e.expressions)return e.expressions;var r=[];return t.forEach(e.parts,function(e){t.isFunction(e)&&r.push(e.exp)}),r},p=function(e,r,a,n){t.forEach(m(r),function(t){var c=a.$watch(t,function(){n.ncyBreadcrumbLabel=r(a)});e.push(c)})},d=function(e){t.forEach(e,function(e){e()})};i.$inject=["$interpolate","$breadcrumb","$rootScope","$routeParams"],o.$inject=["$interpolate","$breadcrumb","$rootScope","$routeParams"],s.$inject=["$interpolate","$breadcrumb","$rootScope","$routeParams"],t.module("ncy-angular-breadcrumb",["ui.router.state"]).provider("$breadcrumb",u).directive("ncyBreadcrumb",i).directive("ncyBreadcrumbLast",o).directive("ncyBreadcrumbText",s)}(window,window.angular); \ No newline at end of file diff --git a/sample/angular-breadcrumb-0.5.4.zip b/sample/angular-breadcrumb-0.5.4.zip deleted file mode 100644 index 7e2d7bdfa0b924bfbb4f9d78468dc3f83cbcc930..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5944 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 diff --git a/sample/angular-breadcrumb-0.5.5.zip b/sample/angular-breadcrumb-0.5.5.zip new file mode 100644 index 0000000000000000000000000000000000000000..df524a15ba24eec6ea2d8c90a58c954aae96d2a3 GIT binary patch literal 5961 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