@angular-wave/angular.ts 0.4.2 → 0.4.4

package/src/directive/show-hide/show-hide.spec.js

@@ -24,10 +24,8 @@ describe("ngShow / ngHide", () => {
     it("should show and hide an element", () => {
       element = JQLite('<div ng-show="exp"></div>');
       element = $compile(element)($scope);
-      $scope.$digest();
       expect(element[0].classList.contains("ng-hide")).toBeTrue();
       $scope.exp = true;
-      $scope.$digest();
       expect(element[0].classList.contains("ng-hide")).toBeFalse();
     });
 
@@ -36,7 +34,6 @@ describe("ngShow / ngHide", () => {
       element = JQLite('<div ng-show="exp"></div>');
       element = $compile(element)($scope);
       $scope.exp = function () {};
-      $scope.$digest();
       expect(element[0].classList.contains("ng-hide")).toBeFalse();
     });
 
@@ -45,7 +42,6 @@ describe("ngShow / ngHide", () => {
       element = $compile(element)($scope);
       expect(element[0].classList.contains("ng-hide")).toBeTrue();
       $scope.exp = true;
-      $scope.$digest();
       expect(element[0].classList.contains("ng-hide")).toBeFalse();
     });
 
@@ -53,7 +49,6 @@ describe("ngShow / ngHide", () => {
       ["false", "undefined", "null", "NaN", "''", "0"].forEach((x) => {
         element = JQLite(`<div ng-show="${x}"></div>`);
         element = $compile(element)($scope);
-        $scope.$digest();
         expect(element[0].classList.contains("ng-hide")).toBeTrue();
       });
     });
@@ -62,7 +57,6 @@ describe("ngShow / ngHide", () => {
       ["'f'", "'0'", "'false'", "'no'", "'n'", "'[]'"].forEach((x) => {
         element = JQLite(`<div ng-show="${x}"></div>`);
         element = $compile(element)($scope);
-        $scope.$digest();
         expect(element[0].classList.contains("ng-hide")).toBeFalse();
       });
     });
@@ -71,7 +65,6 @@ describe("ngShow / ngHide", () => {
       ["[]", "{}"].forEach((x) => {
         element = JQLite(`<div ng-show="${x}"></div>`);
         element = $compile(element)($scope);
-        $scope.$digest();
         expect(element[0].classList.contains("ng-hide")).toBeFalse();
       });
     });
@@ -83,7 +76,6 @@ describe("ngShow / ngHide", () => {
       element = $compile(element)($scope);
       expect(element[0].classList.contains("ng-hide")).toBeFalse();
       $scope.exp = true;
-      $scope.$digest();
       expect(element[0].classList.contains("ng-hide")).toBeTrue();
     });
 
@@ -91,7 +83,6 @@ describe("ngShow / ngHide", () => {
       ["false", "undefined", "null", "NaN", "''", "0"].forEach((x) => {
         element = JQLite(`<div ng-hide="${x}"></div>`);
         element = $compile(element)($scope);
-        $scope.$digest();
         expect(element[0].classList.contains("ng-hide")).toBeFalse();
       });
     });
@@ -100,7 +91,6 @@ describe("ngShow / ngHide", () => {
       ["'f'", "'0'", "'false'", "'no'", "'n'", "'[]'"].forEach((x) => {
         element = JQLite(`<div ng-hide="${x}"></div>`);
         element = $compile(element)($scope);
-        $scope.$digest();
         expect(element[0].classList.contains("ng-hide")).toBeTrue();
       });
     });
@@ -109,7 +99,6 @@ describe("ngShow / ngHide", () => {
       ["[]", "{}"].forEach((x) => {
         element = JQLite(`<div ng-hide="${x}"></div>`);
         element = $compile(element)($scope);
-        $scope.$digest();
         expect(element[0].classList.contains("ng-hide")).toBeTrue();
       });
     });
@@ -160,7 +149,7 @@ describe("ngShow / ngHide", () => {
 //       const $scope = $rootScope.$new();
 //       $scope.on = true;
 //       element = $compile(html('<div ng-show="on">data</div>'))($scope);
-//       $scope.$digest();
+//       ;
 
 //       item = $animate.queue.shift();
 //       expect(item.event).toBe("removeClass");
@@ -168,7 +157,7 @@ describe("ngShow / ngHide", () => {
 //       expect(item.element).toBeShown();
 
 //       $scope.on = false;
-//       $scope.$digest();
+//       ;
 
 //       item = $animate.queue.shift();
 //       expect(item.event).toBe("addClass");
@@ -187,14 +176,14 @@ describe("ngShow / ngHide", () => {
 //       element = $compile(
 //         html('<div class="show-hide" ng-show="on">data</div>'),
 //       )($scope);
-//       $scope.$digest();
+//       ;
 
 //       item = $animate.queue.shift();
 //       expect(item.event).toEqual("addClass");
 //       expect(item.options.tempClasses).toEqual("ng-hide-animate");
 
 //       $scope.on = true;
-//       $scope.$digest();
+//       ;
 //       item = $animate.queue.shift();
 //       expect(item.event).toEqual("removeClass");
 //       expect(item.options.tempClasses).toEqual("ng-hide-animate");
@@ -211,7 +200,7 @@ describe("ngShow / ngHide", () => {
 //       const $scope = $rootScope.$new();
 //       $scope.off = true;
 //       element = $compile(html('<div ng-hide="off">datum</div>'))($scope);
-//       $scope.$digest();
+//       ;
 
 //       item = $animate.queue.shift();
 //       expect(item.event).toBe("addClass");
@@ -219,7 +208,7 @@ describe("ngShow / ngHide", () => {
 //       expect(item.element).toBeHidden();
 
 //       $scope.off = false;
-//       $scope.$digest();
+//       ;
 
 //       item = $animate.queue.shift();
 //       expect(item.event).toBe("removeClass");
@@ -238,14 +227,14 @@ describe("ngShow / ngHide", () => {
 //       element = $compile(
 //         html('<div class="show-hide" ng-hide="on">data</div>'),
 //       )($scope);
-//       $scope.$digest();
+//       ;
 
 //       item = $animate.queue.shift();
 //       expect(item.event).toEqual("removeClass");
 //       expect(item.options.tempClasses).toEqual("ng-hide-animate");
 
 //       $scope.on = true;
-//       $scope.$digest();
+//       ;
 //       item = $animate.queue.shift();
 //       expect(item.event).toEqual("addClass");
 //       expect(item.options.tempClasses).toEqual("ng-hide-animate");

package/src/directive/style/style.spec.js

@@ -24,37 +24,31 @@ describe("ng-style", () => {
 
   it("should set", () => {
     element = $compile("<div ng-style=\"{height: '40px'}\"></div>")($scope);
-    $scope.$digest();
     expect(element[0].style.height).toEqual("40px");
   });
 
   it("should silently ignore undefined style", () => {
     element = $compile('<div ng-style="myStyle"></div>')($scope);
-    $scope.$digest();
     expect(element[0].classList.contains("ng-exception")).toBeFalsy();
   });
 
   it("should not deep watch objects", () => {
     element = $compile('<div ng-style="{height: heightObj}"></div>')($scope);
-    $scope.$digest();
     expect(parseInt(element[0].style.height + 0, 10)).toEqual(0); // height could be '' or '0px'
     $scope.heightObj = {
       toString() {
         return "40px";
       },
     };
-    $scope.$digest();
     expect(element[0].style.height).toBe("40px");
 
     element[0].style.height = "10px";
     $scope.heightObj.otherProp = 123;
-    $scope.$digest();
     expect(element[0].style.height).toBe("10px");
   });
 
   it("should support binding for object literals", () => {
     element = $compile('<div ng-style="{height: heightStr}"></div>')($scope);
-    $scope.$digest();
     expect(parseInt(element[0].style.height + 0, 10)).toEqual(0); // height could be '' or '0px'
     $scope.$apply('heightStr = "40px"');
     expect(element[0].style.height).toBe("40px");
@@ -65,7 +59,6 @@ describe("ng-style", () => {
 
   it("should support lazy one-time binding for object literals", () => {
     element = $compile('<div ng-style="::{height: heightStr}"></div>')($scope);
-    $scope.$digest();
     expect(parseInt(element[0].style.height + 0, 10)).toEqual(0); // height could be '' or '0px'
     $scope.$apply('heightStr = "40px"');
     expect(element[0].style.height).toBe("40px");

package/src/directive/switch/switch.js

@@ -1,4 +1,3 @@
-import { forEach } from "../../shared/utils";
 import { getBlockNodes } from "../../shared/jqlite/jqlite";
 
 export const ngSwitchDirective = [
@@ -53,7 +52,7 @@ export const ngSwitchDirective = [
             ngSwitchController.cases[`!${value}`] ||
             ngSwitchController.cases["?"])
         ) {
-          forEach(selectedTranscludes, (selectedTransclude) => {
+          Object.values(selectedTranscludes).forEach((selectedTransclude) => {
             selectedTransclude.transclude((caseElement, selectedScope) => {
               selectedScopes.push(selectedScope);
               const anchor = selectedTransclude.element;

package/src/directive/switch/switch.spec.js

@@ -570,9 +570,9 @@ describe("ngSwitch", () => {
 //         ),
 //       )($scope);
 
-//       $rootScope.$digest(); // re-enable the animations;
+//       ; // re-enable the animations;
 //       $scope.val = "one";
-//       $scope.$digest();
+//       ;
 
 //       item = $animate.queue.shift();
 //       expect(item.event).toBe("enter");
@@ -596,16 +596,16 @@ describe("ngSwitch", () => {
 //         ),
 //       )($scope);
 
-//       $rootScope.$digest(); // re-enable the animations;
+//       ; // re-enable the animations;
 //       $scope.val = "two";
-//       $scope.$digest();
+//       ;
 
 //       item = $animate.queue.shift();
 //       expect(item.event).toBe("enter");
 //       expect(item.element.text()).toBe("two");
 
 //       $scope.val = "three";
-//       $scope.$digest();
+//       ;
 
 //       item = $animate.queue.shift();
 //       expect(item.event).toBe("leave");

package/src/directive/validators/validators.spec.js

@@ -640,7 +640,6 @@ describe("validators", () => {
       inputElm = $compile(
         '<input type="text" ng-model="notDefined" required />',
       )($rootScope);
-      $rootScope.$digest();
       expect(inputElm[0].classList.contains("ng-invalid")).toBeTrue();
     });
 

package/src/loader.js

@@ -152,7 +152,6 @@ export class Angular {
         });
         // ng-route deps
         services.$injector = $injector;
-        services.$q = $injector.get("$q");
         // https://github.com/angular-ui/ui-router/issues/3678
         if (!Object.prototype.hasOwnProperty.call($injector, "strictDi")) {
           try {

package/src/public.js

@@ -1,93 +1,88 @@
-import { CompileProvider } from "./core/compile/compile";
+import { CompileProvider } from "./core/compile/compile.js";
 import {
   inputDirective,
   ngValueDirective,
   hiddenInputBrowserCacheDirective,
-} from "./directive/input/input";
-import { formDirective, ngFormDirective } from "./directive/form/form";
-import { scriptDirective } from "./directive/script/script";
-import { selectDirective, optionDirective } from "./directive/select/select";
+} from "./directive/input/input.js";
+import { formDirective, ngFormDirective } from "./directive/form/form.js";
+import { scriptDirective } from "./directive/script/script.js";
+import { selectDirective, optionDirective } from "./directive/select/select.js";
 import {
   ngBindDirective,
   ngBindHtmlDirective,
   ngBindTemplateDirective,
-} from "./directive/bind/bind";
+} from "./directive/bind/bind.js";
 import {
   ngClassDirective,
   ngClassEvenDirective,
   ngClassOddDirective,
-} from "./directive/class/class";
-import { ngCloakDirective } from "./directive/cloak/cloak";
-import { ngControllerDirective } from "./directive/controller/controller";
+} from "./directive/class/class.js";
+import { ngCloakDirective } from "./directive/cloak/cloak.js";
+import { ngControllerDirective } from "./directive/controller/controller.js";
 import {
   ngHideDirective,
   ngShowDirective,
-} from "./directive/show-hide/show-hide";
-import { ngIfDirective } from "./directive/if/if";
+} from "./directive/show-hide/show-hide.js";
+import { ngIfDirective } from "./directive/if/if.js";
 import {
   ngIncludeDirective,
   ngIncludeFillContentDirective,
-} from "./directive/include/include";
-import { ngInitDirective } from "./directive/init/init";
-import { ngNonBindableDirective } from "./directive/non-bindable/non-bindable";
-import { ngRefDirective } from "./directive/ref/ref";
-import { ngRepeatDirective } from "./directive/repeat/repeat";
-import { ngStyleDirective } from "./directive/style/style";
+} from "./directive/include/include.js";
+import { ngInitDirective } from "./directive/init/init.js";
+import { ngNonBindableDirective } from "./directive/non-bindable/non-bindable.js";
+import { ngRefDirective } from "./directive/ref/ref.js";
+import { ngRepeatDirective } from "./directive/repeat/repeat.js";
+import { ngStyleDirective } from "./directive/style/style.js";
 import {
   ngSwitchDirective,
   ngSwitchWhenDirective,
   ngSwitchDefaultDirective,
-} from "./directive/switch/switch";
-import { ngOptionsDirective } from "./directive/options/options";
-import { ngTranscludeDirective } from "./directive/transclude/transclude";
-import { ngModelDirective } from "./directive/model/model";
-import { ngListDirective } from "./directive/list/list";
-import { ngChangeDirective } from "./directive/change/change";
+} from "./directive/switch/switch.js";
+import { ngOptionsDirective } from "./directive/options/options.js";
+import { ngTranscludeDirective } from "./directive/transclude/transclude.js";
+import { ngModelDirective } from "./directive/model/model.js";
+import { ngChangeDirective } from "./directive/change/change.js";
 import {
   maxlengthDirective,
   minlengthDirective,
   patternDirective,
   requiredDirective,
-} from "./directive/validators/validators";
-import { ngModelOptionsDirective } from "./directive/model-options/model-options";
-import { ngAttributeAliasDirectives } from "./directive/attrs/attrs";
-import { ngEventDirectives } from "./directive/events/events";
-import { AnchorScrollProvider } from "./services/anchor-scroll";
-import { AnimateProvider } from "./animations/animate";
-import { BrowserProvider } from "./services/browser";
+} from "./directive/validators/validators.js";
+import { ngModelOptionsDirective } from "./directive/model-options/model-options.js";
+import { ngAttributeAliasDirectives } from "./directive/attrs/attrs.js";
+import { ngEventDirectives } from "./directive/events/events.js";
+import { AnchorScrollProvider } from "./services/anchor-scroll.js";
+import { AnimateProvider } from "./animations/animate.js";
+import { BrowserProvider } from "./services/browser.js";
 import {
   AnimateAsyncRunFactoryProvider,
   AnimateRunnerFactoryProvider,
-} from "./animations/animate-runner";
-import { TemplateCacheProvider } from "./core/cache/cache-factory";
-import { ControllerProvider } from "./core/controller/controller";
-import { ExceptionHandlerProvider } from "./core/exception-handler";
-import { FilterProvider } from "./core/filter/filter";
-import { IntervalProvider } from "./core/interval/interval";
-import { InterpolateProvider } from "./core/interpolate/interpolate";
-import { $IntervalFactoryProvider } from "./core/interval/interval-factory";
+} from "./animations/animate-runner.js";
+import { TemplateCacheProvider } from "./core/cache/cache-factory.js";
+import { ControllerProvider } from "./core/controller/controller.js";
+import { ExceptionHandlerProvider } from "./core/exception-handler.js";
+import { FilterProvider } from "./core/filter/filter.js";
+import { InterpolateProvider } from "./core/interpolate/interpolate.js";
 import {
   HttpProvider,
   HttpParamSerializerProvider,
-} from "./services/http/http";
-import { HttpBackendProvider } from "./services/http-backend/http-backend";
-import { LocationProvider } from "./core/location/location";
-import { LogProvider } from "./services/log";
+} from "./services/http/http.js";
+import { HttpBackendProvider } from "./services/http-backend/http-backend.js";
+import { LocationProvider } from "./core/location/location.js";
+import { LogProvider } from "./services/log.js";
 import { ParseProvider } from "./core/parse/parse.js";
-import { RootScopeProvider } from "./core/scope/scope";
-import { $QProvider } from "./core/q/q";
-import { SceProvider, SceDelegateProvider } from "./core/sce/sce";
-import { TaskTrackerFactoryProvider } from "./core/task-tracker-factory";
-import { TemplateRequestProvider } from "./services/template-request";
-import { TimeoutProvider } from "./core/timeout/timeout";
-import { SanitizeUriProvider } from "./core/sanitize/sanitize-uri";
+import { RootModelProvider } from "./core/model/model.js";
+import { SceProvider, SceDelegateProvider } from "./core/sce/sce.js";
+import { TaskTrackerFactoryProvider } from "./core/task-tracker-factory.js";
+import { TemplateRequestProvider } from "./services/template-request.js";
+import { SanitizeUriProvider } from "./core/sanitize/sanitize-uri.js";
 import {
   ngMessageDefaultDirective,
   ngMessageDirective,
   ngMessageExpDirective,
   ngMessagesDirective,
   ngMessagesIncludeDirective,
-} from "./directive/messages/messages";
+} from "./directive/messages/messages.js";
 import {
   AriaProvider,
   ngCheckedAriaDirective,
@@ -101,34 +96,38 @@ import {
   ngRequiredAriaDirective,
   ngShowAriaDirective,
   ngValueAriaDirective,
-} from "./directive/aria/aria";
-import { AnimateCssProvider } from "./animations/animate-css";
-import { AnimateQueueProvider } from "./animations/animate-queue";
-import { AnimateJsProvider } from "./animations/animate-js";
-import { AnimationProvider } from "./animations/animation";
-import { RafSchedulerProvider } from "./animations/raf-scheduler";
-import { AnimateCacheProvider } from "./animations/animate-cache";
-import { AnimateCssDriverProvider } from "./animations/animate-css-driver";
-import { AnimateJsDriverProvider } from "./animations/animate-js-driver";
-import { ngAnimateSwapDirective } from "./animations/animate-swap";
-import { $$AnimateChildrenDirective } from "./animations/animate-children-directive";
-import { UrlConfigProvider } from "./router/url/url-config";
-import { UIRouterGlobals } from "./router/globals";
-import { ViewService } from "./router/view/view";
-import { TransitionProvider } from "./router/transition/transition-service";
-import { StateProvider } from "./router/state/state-service";
-import { ViewScrollProvider } from "./router/view-scroll";
-import { TemplateFactoryProvider } from "./router/template-factory";
-import { UrlService } from "./router/url/url-service";
-import { StateRegistryProvider } from "./router/state/state-registry";
-import { trace } from "./router/common/trace";
+} from "./directive/aria/aria.js";
+import { AnimateCssProvider } from "./animations/animate-css.js";
+import { AnimateQueueProvider } from "./animations/animate-queue.js";
+import { AnimateJsProvider } from "./animations/animate-js.js";
+import { AnimationProvider } from "./animations/animation.js";
+import { RafSchedulerProvider } from "./animations/raf-scheduler.js";
+import { AnimateCacheProvider } from "./animations/animate-cache.js";
+import { AnimateCssDriverProvider } from "./animations/animate-css-driver.js";
+import { AnimateJsDriverProvider } from "./animations/animate-js-driver.js";
+import { ngAnimateSwapDirective } from "./animations/animate-swap.js";
+import { $$AnimateChildrenDirective } from "./animations/animate-children-directive.js";
+import { UrlConfigProvider } from "./router/url/url-config.js";
+import { UIRouterGlobals } from "./router/globals.js";
+import { ViewService } from "./router/view/view.js";
+import { TransitionProvider } from "./router/transition/transition-service.js";
+import { StateProvider } from "./router/state/state-service.js";
+import { ViewScrollProvider } from "./router/view-scroll.js";
+import { TemplateFactoryProvider } from "./router/template-factory.js";
+import { UrlService } from "./router/url/url-service.js";
+import { StateRegistryProvider } from "./router/state/state-registry.js";
+import { trace } from "./router/common/trace.js";
 import {
   $StateRefActiveDirective,
   $StateRefDirective,
   $StateRefDynamicDirective,
-} from "./router/directives/state-directives";
-import { $ViewDirectiveFill, ngView } from "./router/directives/view-directive";
-import { ngObserveDirective } from "./directive/observe/observe";
+} from "./router/directives/state-directives.js";
+import {
+  $ViewDirectiveFill,
+  ngView,
+} from "./router/directives/view-directive.js";
+import { ngObserveDirective } from "./directive/observe/observe.js";
+import { ngChannelDirective } from "./directive/channel/channel.js";
 
 /**
  * @type {string} `version` from `package.json`, injected by Rollup plugin
@@ -192,7 +191,6 @@ export function publishExternalAPI(angular) {
               ngOptions: ngOptionsDirective,
               ngTransclude: ngTranscludeDirective,
               ngModel: ngModelDirective,
-              ngList: ngListDirective,
               ngChange: ngChangeDirective,
               pattern: patternDirective,
               ngPattern: patternDirective,
@@ -225,6 +223,7 @@ export function publishExternalAPI(angular) {
               ngSrefActiveEq: $StateRefActiveDirective,
               ngState: $StateRefDynamicDirective,
               ngView: ngView,
+              ngChannel: ngChannelDirective,
             })
             .directive({
               ngView: $ViewDirectiveFill,
@@ -249,8 +248,6 @@ export function publishExternalAPI(angular) {
             $exceptionHandler: ExceptionHandlerProvider,
             $filter: FilterProvider,
             $interpolate: InterpolateProvider,
-            $interval: IntervalProvider,
-            $$intervalFactory: $IntervalFactoryProvider,
             $http: HttpProvider,
             $httpParamSerializer: HttpParamSerializerProvider,
             $httpBackend: HttpBackendProvider,
@@ -258,15 +255,13 @@ export function publishExternalAPI(angular) {
             $log: LogProvider,
             $parse: ParseProvider,
             $$rAFScheduler: RafSchedulerProvider,
-            $rootScope: RootScopeProvider,
+            $rootScope: RootModelProvider,
             $routerGlobals: UIRouterGlobals,
-            $q: $QProvider,
             $sce: SceProvider,
             $sceDelegate: SceDelegateProvider,
             $$taskTrackerFactory: TaskTrackerFactoryProvider,
             $templateCache: TemplateCacheProvider,
             $templateRequest: TemplateRequestProvider,
-            $timeout: TimeoutProvider,
             $urlConfig: UrlConfigProvider,
             $view: ViewService,
             $transitions: TransitionProvider,

package/src/router/common/coreservices.js

@@ -1,6 +1,4 @@
 export const services = {
-  /** @type {import("../../core/q/q").QService} */
-  $q: undefined,
   /** @type {import("../../core/di/internal-injector").InjectorService} */
   $injector: undefined,
 };

package/src/router/directives/state-directives.js

@@ -1,4 +1,4 @@
-import { forEach, tail, unnestR, uniqR, removeFrom } from "../../shared/common";
+import { tail, unnestR, uniqR, removeFrom } from "../../shared/common";
 import { isString, isObject } from "../../shared/utils";
 
 import { parse } from "../../shared/hof";
@@ -43,7 +43,7 @@ function getTypeInfo(el) {
   };
 }
 /** @ignore */
-function clickHook(el, $state, $timeout, type, getDef) {
+function clickHook(el, $state, type, getDef) {
   return function (e) {
     const button = e.which || e.button,
       target = getDef();
@@ -57,7 +57,7 @@ function clickHook(el, $state, $timeout, type, getDef) {
       el.attr("target");
     if (!res) {
       // HACK: This is to allow ng-clicks to be processed before the transition is initiated:
-      const transition = $timeout(function () {
+      const transition = setTimeout(function () {
         if (!el.attr("disabled")) {
           $state.go(target.ngState, target.ngStateParams, target.ngStateOpts);
         }
@@ -66,7 +66,7 @@ function clickHook(el, $state, $timeout, type, getDef) {
       // if the state has no URL, ignore one preventDefault from the <a> directive.
       let ignorePreventDefaultCount = type.isAnchor && !target.href ? 1 : 0;
       e.preventDefault = function () {
-        if (ignorePreventDefaultCount-- <= 0) $timeout.cancel(transition);
+        if (ignorePreventDefaultCount-- <= 0) clearTimeout(transition);
       };
     } else {
       // ignored
@@ -106,15 +106,9 @@ function bindEvents(element, scope, hookFn, ngStateOpts) {
 
 // // TODO: SEPARATE THESE OUT
 
-$StateRefDirective.$inject = [
-  "$state",
-  "$timeout",
-  "$stateRegistry",
-  "$transitions",
-];
+$StateRefDirective.$inject = ["$state", "$stateRegistry", "$transitions"];
 export function $StateRefDirective(
   $stateService,
-  $timeout,
   $stateRegistry,
   $transitions,
 ) {
@@ -155,7 +149,7 @@ export function $StateRefDirective(
       scope.$on("$destroy", $stateRegistry.onStatesChanged(update));
       scope.$on("$destroy", $transitions.onSuccess({}, update));
       if (!type.clickable) return;
-      const hookFn = clickHook(element, $state, $timeout, type, getDef);
+      const hookFn = clickHook(element, $state, type, getDef);
       bindEvents(element, scope, hookFn, rawDef.ngStateOpts);
     },
   };
@@ -163,13 +157,11 @@ export function $StateRefDirective(
 
 $StateRefDynamicDirective.$inject = [
   "$state",
-  "$timeout",
   "$stateRegistry",
   "$transitions",
 ];
 export function $StateRefDynamicDirective(
   $state,
-  $timeout,
   $stateRegistry,
   $transitions,
 ) {
@@ -213,7 +205,7 @@ export function $StateRefDynamicDirective(
       scope.$on("$destroy", $stateRegistry.onStatesChanged(update));
       scope.$on("$destroy", $transitions.onSuccess({}, update));
       if (!type.clickable) return;
-      hookFn = clickHook(element, $state, $timeout, type, getDef);
+      hookFn = clickHook(element, $state, type, getDef);
       bindEvents(element, scope, hookFn, rawDef.ngStateOpts);
     },
   };
@@ -303,22 +295,24 @@ export function $StateRefActiveDirective(
       function setStatesFromDefinitionObject(statesDefinition) {
         if (isObject(statesDefinition)) {
           states = [];
-          forEach(statesDefinition, function (stateOrName, activeClass) {
-            // Helper function to abstract adding state.
-            const addStateForClass = function (stateOrName, activeClass) {
-              const ref = parseStateRef(stateOrName);
-              addState(ref.state, $scope.$eval(ref.paramExpr), activeClass);
-            };
-            if (isString(stateOrName)) {
-              // If state is string, just add it.
-              addStateForClass(stateOrName, activeClass);
-            } else if (Array.isArray(stateOrName)) {
-              // If state is an array, iterate over it and add each array item individually.
-              forEach(stateOrName, function (stateOrName) {
+          Object.entries(statesDefinition).forEach(
+            ([activeClass, stateOrName]) => {
+              // Helper function to abstract adding state.
+              const addStateForClass = function (stateOrName, activeClass) {
+                const ref = parseStateRef(stateOrName);
+                addState(ref.state, $scope.$eval(ref.paramExpr), activeClass);
+              };
+              if (isString(stateOrName)) {
+                // If state is string, just add it.
                 addStateForClass(stateOrName, activeClass);
-              });
-            }
-          });
+              } else if (Array.isArray(stateOrName)) {
+                // If state is an array, iterate over it and add each array item individually.
+                stateOrName.forEach((stateOrName) => {
+                  addStateForClass(stateOrName, activeClass);
+                });
+              }
+            },
+          );
         }
       }
       function addState(stateName, stateParams, activeClass) {