@@ -22,7 +22,8 @@ export interface ng1_directive {} // tslint:disable-line:class-name
2222
2323/** @hidden */
2424function parseStateRef ( ref : string ) {
25- let paramsOnly = ref . match ( / ^ \s * ( { [ ^ } ] * } ) \s * $ / ) , parsed ;
25+ let parsed ;
26+ const paramsOnly = ref . match ( / ^ \s * ( { [ ^ } ] * } ) \s * $ / ) ;
2627 if ( paramsOnly ) ref = '(' + paramsOnly [ 1 ] + ')' ;
2728
2829 parsed = ref . replace ( / \n / g, " " ) . match ( / ^ \s * ( [ ^ ( ] * ?) \s * ( \( ( .* ) \) ) ? \s * $ / ) ;
@@ -32,16 +33,16 @@ function parseStateRef(ref: string) {
3233
3334/** @hidden */
3435function stateContext ( el : IAugmentedJQuery ) {
35- let $uiView : UIViewData = ( el . parent ( ) as IAugmentedJQuery ) . inheritedData ( '$uiView' ) ;
36- let path : PathNode [ ] = parse ( '$cfg.path' ) ( $uiView ) ;
36+ const $uiView : UIViewData = ( el . parent ( ) as IAugmentedJQuery ) . inheritedData ( '$uiView' ) ;
37+ const path : PathNode [ ] = parse ( '$cfg.path' ) ( $uiView ) ;
3738 return path ? tail ( path ) . state . name : undefined ;
3839}
3940
4041/** @hidden */
4142function processedDef ( $state : StateService , $element : IAugmentedJQuery , def : Def ) : Def {
42- let uiState = def . uiState || $state . current . name ;
43- let uiStateOpts = extend ( defaultOpts ( $element , $state ) , def . uiStateOpts || { } ) ;
44- let href = $state . href ( uiState , def . uiStateParams , uiStateOpts ) ;
43+ const uiState = def . uiState || $state . current . name ;
44+ const uiStateOpts = extend ( defaultOpts ( $element , $state ) , def . uiStateOpts || { } ) ;
45+ const href = $state . href ( uiState , def . uiStateParams , uiStateOpts ) ;
4546 return { uiState, uiStateParams : def . uiStateParams , uiStateOpts, href } ;
4647}
4748
@@ -55,8 +56,8 @@ interface TypeInfo {
5556/** @hidden */
5657function getTypeInfo ( el : IAugmentedJQuery ) : TypeInfo {
5758 // SVGAElement does not use the href attribute, but rather the 'xlinkHref' attribute.
58- let isSvg = Object . prototype . toString . call ( el . prop ( 'href' ) ) === '[object SVGAnimatedString]' ;
59- let isForm = el [ 0 ] . nodeName === "FORM" ;
59+ const isSvg = Object . prototype . toString . call ( el . prop ( 'href' ) ) === '[object SVGAnimatedString]' ;
60+ const isForm = el [ 0 ] . nodeName === "FORM" ;
6061
6162 return {
6263 attr : isForm ? "action" : ( isSvg ? 'xlink:href' : 'href' ) ,
@@ -68,11 +69,11 @@ function getTypeInfo(el: IAugmentedJQuery): TypeInfo {
6869/** @hidden */
6970function clickHook ( el : IAugmentedJQuery , $state : StateService , $timeout : ITimeoutService , type : TypeInfo , getDef : ( ) => Def ) {
7071 return function ( e : JQueryMouseEventObject ) {
71- let button = e . which || e . button , target = getDef ( ) ;
72+ const button = e . which || e . button , target = getDef ( ) ;
7273
7374 if ( ! ( button > 1 || e . ctrlKey || e . metaKey || e . shiftKey || el . attr ( 'target' ) ) ) {
7475 // HACK: This is to allow ng-clicks to be processed before the transition is initiated:
75- let transition = $timeout ( function ( ) {
76+ const transition = $timeout ( function ( ) {
7677 $state . go ( target . uiState , target . uiStateParams , target . uiStateOpts ) ;
7778 } ) ;
7879 e . preventDefault ( ) ;
@@ -108,14 +109,14 @@ function bindEvents(element: IAugmentedJQuery, scope: IScope, hookFn: (e: JQuery
108109 events = [ 'click' ] ;
109110 }
110111
111- let on = element . on ? 'on' : 'bind' ;
112- for ( let event of events ) {
112+ const on = element . on ? 'on' : 'bind' ;
113+ for ( const event of events ) {
113114 element [ on ] ( event , hookFn ) ;
114115 }
115116
116117 scope . $on ( '$destroy' , function ( ) {
117- let off = element . off ? 'off' : 'unbind' ;
118- for ( let event of events ) {
118+ const off = element . off ? 'off' : 'unbind' ;
119+ for ( const event of events ) {
119120 element [ off ] ( event , hookFn ) ;
120121 }
121122 } ) ;
@@ -257,26 +258,26 @@ function bindEvents(element: IAugmentedJQuery, scope: IScope, hookFn: (e: JQuery
257258let uiSrefDirective : ng1_directive ;
258259uiSrefDirective = [ '$uiRouter' , '$timeout' ,
259260 function $StateRefDirective ( $uiRouter : UIRouter , $timeout : ITimeoutService ) {
260- let $state = $uiRouter . stateService ;
261+ const $state = $uiRouter . stateService ;
261262
262263 return {
263264 restrict : 'A' ,
264265 require : [ '?^uiSrefActive' , '?^uiSrefActiveEq' ] ,
265266 link : function ( scope : IScope , element : IAugmentedJQuery , attrs : any , uiSrefActive : any ) {
266- let type = getTypeInfo ( element ) ;
267- let active = uiSrefActive [ 1 ] || uiSrefActive [ 0 ] ;
267+ const type = getTypeInfo ( element ) ;
268+ const active = uiSrefActive [ 1 ] || uiSrefActive [ 0 ] ;
268269 let unlinkInfoFn : Function = null ;
269270 let hookFn ;
270271
271- let rawDef = { } as Def ;
272- let getDef = ( ) => processedDef ( $state , element , rawDef ) ;
272+ const rawDef = { } as Def ;
273+ const getDef = ( ) => processedDef ( $state , element , rawDef ) ;
273274
274- let ref = parseStateRef ( attrs . uiSref ) ;
275+ const ref = parseStateRef ( attrs . uiSref ) ;
275276 rawDef . uiState = ref . state ;
276277 rawDef . uiStateOpts = attrs . uiSrefOpts ? scope . $eval ( attrs . uiSrefOpts ) : { } ;
277278
278279 function update ( ) {
279- let def = getDef ( ) ;
280+ const def = getDef ( ) ;
280281 if ( unlinkInfoFn ) unlinkInfoFn ( ) ;
281282 if ( active ) unlinkInfoFn = active . $$addStateInfo ( def . uiState , def . uiStateParams ) ;
282283 if ( def . href != null ) attrs . $set ( type . attr , def . href ) ;
@@ -389,25 +390,25 @@ uiSrefDirective = ['$uiRouter', '$timeout',
389390let uiStateDirective : ng1_directive ;
390391uiStateDirective = [ '$uiRouter' , '$timeout' ,
391392 function $StateRefDynamicDirective ( $uiRouter : UIRouter , $timeout : ITimeoutService ) {
392- let $state = $uiRouter . stateService ;
393+ const $state = $uiRouter . stateService ;
393394
394395 return {
395396 restrict : 'A' ,
396397 require : [ '?^uiSrefActive' , '?^uiSrefActiveEq' ] ,
397398 link : function ( scope : IScope , element : IAugmentedJQuery , attrs : any , uiSrefActive : any ) {
398- let type = getTypeInfo ( element ) ;
399- let active = uiSrefActive [ 1 ] || uiSrefActive [ 0 ] ;
399+ const type = getTypeInfo ( element ) ;
400+ const active = uiSrefActive [ 1 ] || uiSrefActive [ 0 ] ;
400401 let unlinkInfoFn : Function = null ;
401402 let hookFn ;
402403
403- let rawDef = { } as Def ;
404- let getDef = ( ) => processedDef ( $state , element , rawDef ) ;
404+ const rawDef = { } as Def ;
405+ const getDef = ( ) => processedDef ( $state , element , rawDef ) ;
405406
406- let inputAttrs = [ 'uiState' , 'uiStateParams' , 'uiStateOpts' ] ;
407- let watchDeregFns = inputAttrs . reduce ( ( acc , attr ) => ( acc [ attr ] = noop , acc ) , { } ) ;
407+ const inputAttrs = [ 'uiState' , 'uiStateParams' , 'uiStateOpts' ] ;
408+ const watchDeregFns = inputAttrs . reduce ( ( acc , attr ) => ( acc [ attr ] = noop , acc ) , { } ) ;
408409
409410 function update ( ) {
410- let def = getDef ( ) ;
411+ const def = getDef ( ) ;
411412 if ( unlinkInfoFn ) unlinkInfoFn ( ) ;
412413 if ( active ) unlinkInfoFn = active . $$addStateInfo ( def . uiState , def . uiStateParams ) ;
413414 if ( def . href != null ) attrs . $set ( type . attr , def . href ) ;
@@ -526,9 +527,9 @@ uiSrefActiveDirective = ['$state', '$stateParams', '$interpolate', '$uiRouter',
526527 restrict : "A" ,
527528 controller : [ '$scope' , '$element' , '$attrs' ,
528529 function ( $scope : IScope , $element : IAugmentedJQuery , $attrs : any ) {
529- let states : StateData [ ] = [ ] ,
530- activeEqClass : string ,
531- uiSrefActive : any ;
530+ const states : StateData [ ] = [ ] ;
531+ let activeEqClass : string ;
532+ let uiSrefActive : any ;
532533
533534 // There probably isn't much point in $observing this
534535 // uiSrefActive and uiSrefActiveEq share the same directive object with some
@@ -545,7 +546,7 @@ uiSrefActiveDirective = ['$state', '$stateParams', '$interpolate', '$uiRouter',
545546 if ( isObject ( uiSrefActive ) ) {
546547 forEach ( uiSrefActive , function ( stateOrName : StateOrName , activeClass : string ) {
547548 if ( isString ( stateOrName ) ) {
548- let ref = parseStateRef ( stateOrName ) ;
549+ const ref = parseStateRef ( stateOrName ) ;
549550 addState ( ref . state , $scope . $eval ( ref . paramExpr ) , activeClass ) ;
550551 }
551552 } ) ;
@@ -558,7 +559,7 @@ uiSrefActiveDirective = ['$state', '$stateParams', '$interpolate', '$uiRouter',
558559 if ( isObject ( uiSrefActive ) && states . length > 0 ) {
559560 return ;
560561 }
561- let deregister = addState ( newState , newParams , uiSrefActive ) ;
562+ const deregister = addState ( newState , newParams , uiSrefActive ) ;
562563 update ( ) ;
563564 return deregister ;
564565 } ;
@@ -574,9 +575,9 @@ uiSrefActiveDirective = ['$state', '$stateParams', '$interpolate', '$uiRouter',
574575 }
575576
576577 function addState ( stateName : string , stateParams : Obj , activeClass : string ) {
577- let state = $state . get ( stateName , stateContext ( $element ) ) ;
578+ const state = $state . get ( stateName , stateContext ( $element ) ) ;
578579
579- let stateInfo = {
580+ const stateInfo = {
580581 state : state || { name : stateName } ,
581582 params : stateParams ,
582583 activeClass : activeClass
@@ -596,13 +597,13 @@ uiSrefActiveDirective = ['$state', '$stateParams', '$interpolate', '$uiRouter',
596597 const getClasses = ( stateList : StateData [ ] ) =>
597598 stateList . map ( x => x . activeClass ) . map ( splitClasses ) . reduce ( unnestR , [ ] ) ;
598599
599- let allClasses = getClasses ( states ) . concat ( splitClasses ( activeEqClass ) ) . reduce ( uniqR , [ ] ) ;
600- let fuzzyClasses = getClasses ( states . filter ( x => $state . includes ( x . state . name , x . params ) ) ) ;
601- let exactlyMatchesAny = ! ! states . filter ( x => $state . is ( x . state . name , x . params ) ) . length ;
602- let exactClasses = exactlyMatchesAny ? splitClasses ( activeEqClass ) : [ ] ;
600+ const allClasses = getClasses ( states ) . concat ( splitClasses ( activeEqClass ) ) . reduce ( uniqR , [ ] ) ;
601+ const fuzzyClasses = getClasses ( states . filter ( x => $state . includes ( x . state . name , x . params ) ) ) ;
602+ const exactlyMatchesAny = ! ! states . filter ( x => $state . is ( x . state . name , x . params ) ) . length ;
603+ const exactClasses = exactlyMatchesAny ? splitClasses ( activeEqClass ) : [ ] ;
603604
604- let addClasses = fuzzyClasses . concat ( exactClasses ) . reduce ( uniqR , [ ] ) ;
605- let removeClasses = allClasses . filter ( cls => ! inArray ( addClasses , cls ) ) ;
605+ const addClasses = fuzzyClasses . concat ( exactClasses ) . reduce ( uniqR , [ ] ) ;
606+ const removeClasses = allClasses . filter ( cls => ! inArray ( addClasses , cls ) ) ;
606607
607608 $scope . $evalAsync ( ( ) => {
608609 addClasses . forEach ( className => $element . addClass ( className ) ) ;
0 commit comments