@@ -884,6 +884,16 @@ if (typeof(PhpDebugBar) == 'undefined') {
884884 }
885885 } ) ;
886886
887+ this . bindAttr ( 'link' , function ( link ) {
888+ if ( link ) {
889+ this . $el . on ( 'click' , ( ) => {
890+ this . get ( 'debugbar' ) . showTab ( link ) ;
891+ } ) . css ( 'cursor' , 'pointer' )
892+ } else {
893+ this . $el . off ( 'click' , false ) . css ( 'cursor' , '' )
894+ }
895+ } ) ;
896+
887897 this . bindAttr ( [ 'title' , 'data' ] , $ ( '<span />' ) . addClass ( csscls ( 'text' ) ) . appendTo ( this . $el ) ) ;
888898
889899 this . $tooltip = $ ( '<span />' ) . addClass ( csscls ( 'tooltip disabled' ) ) . appendTo ( this . $el ) ;
@@ -1450,6 +1460,8 @@ if (typeof(PhpDebugBar) == 'undefined') {
14501460 throw new Error ( name + ' already exists' ) ;
14511461 }
14521462
1463+ indicator . set ( 'debugbar' , this ) ;
1464+
14531465 if ( position == 'left' ) {
14541466 indicator . $el . insertBefore ( this . $headerLeft . children ( ) . first ( ) ) ;
14551467 } else {
@@ -2573,13 +2585,15 @@ if (typeof(PhpDebugBar) == 'undefined') {
25732585
25742586 for ( var i = 0 ; i < data . measures . length ; i ++ ) {
25752587 var measure = data . measures [ i ] ;
2588+ var group = measure . group || measure . label ;
25762589
2577- if ( ! aggregate [ measure . label ] )
2578- aggregate [ measure . label ] = { count : 0 , duration : 0 , memory : 0 } ;
2590+ if ( ! aggregate [ group ] ) {
2591+ aggregate [ group ] = { count : 0 , duration : 0 , memory : 0 } ;
2592+ }
25792593
2580- aggregate [ measure . label ] [ 'count' ] += 1 ;
2581- aggregate [ measure . label ] [ 'duration' ] += measure . duration ;
2582- aggregate [ measure . label ] [ 'memory' ] += ( measure . memory || 0 ) ;
2594+ aggregate [ group ] [ 'count' ] += 1 ;
2595+ aggregate [ group ] [ 'duration' ] += measure . duration ;
2596+ aggregate [ group ] [ 'memory' ] += ( measure . memory || 0 ) ;
25832597
25842598 var m = $ ( '<div />' ) . addClass ( csscls ( 'measure' ) ) ,
25852599 li = $ ( '<li />' ) ,
@@ -2591,7 +2605,7 @@ if (typeof(PhpDebugBar) == 'undefined') {
25912605 width : width + "%"
25922606 } ) ) ;
25932607 m . append ( $ ( '<span />' ) . addClass ( csscls ( 'label' ) )
2594- . text ( measure . label + " (" + measure . duration_str + ( measure . memory ? '/' + measure . memory_str : '' ) + ")" ) ) ;
2608+ . text ( measure . label + ( measure . duration ? " (" + measure . duration_str + ( measure . memory ? '/' + measure . memory_str : '' ) + ")" : "" ) ) ) ;
25952609
25962610 if ( measure . collector ) {
25972611 $ ( '<span />' ) . addClass ( csscls ( 'collector' ) ) . text ( measure . collector ) . appendTo ( m ) ;
0 commit comments