@angular-wave/angular.ts 0.4.2 → 0.4.4

package/src/directive/include/include.spec.js

@@ -41,7 +41,6 @@ describe("ngInclude", () => {
       );
       const injector = angular.bootstrap(element);
       $rootScope = injector.get("$rootScope");
-      $rootScope.$digest();
       setTimeout(() => {
         expect(element.text()).toEqual("hello");
         dealoc($rootScope);
@@ -57,7 +56,6 @@ describe("ngInclude", () => {
       $rootScope.fooUrl = $sce.trustAsResourceUrl(
         "http://localhost:4000/mock/hello",
       );
-      $rootScope.$digest();
       await wait(100);
       expect(element.text()).toEqual("Hello");
       dealoc($rootScope);
@@ -73,7 +71,6 @@ describe("ngInclude", () => {
       $templateCache.set("myUrl", [200, "{{name}}", {}]);
       $rootScope.name = "misko";
       $rootScope.url = "myUrl";
-      $rootScope.$digest();
       expect(body.text()).toEqual("misko");
       body.empty();
       dealoc($rootScope);
@@ -85,8 +82,6 @@ describe("ngInclude", () => {
       $rootScope = injector.get("$rootScope");
       $rootScope.expr = "Alibaba";
       $rootScope.url = "/mock/interpolation";
-      $rootScope.$digest();
-
       setTimeout(() => {
         expect(element.text()).toEqual("Alibaba");
         done();
@@ -98,9 +93,7 @@ describe("ngInclude", () => {
       const injector = angular.bootstrap(element, ["myModule"]);
       $rootScope = injector.get("$rootScope");
       $rootScope.url = "http://example.com/myUrl";
-      expect(() => {
-        $rootScope.$digest();
-      }).toThrowError(/insecurl/);
+      expect(() => {}).toThrowError(/insecurl/);
     });
 
     it("should NOT use mistyped expressions ", () => {
@@ -110,9 +103,7 @@ describe("ngInclude", () => {
       $rootScope.name = "chirayu";
       let $sce = injector.get("$sce");
       $rootScope.url = $sce.trustAsUrl("http://example.com/myUrl");
-      expect(() => {
-        $rootScope.$digest();
-      }).toThrowError(/insecurl/);
+      expect(() => {}).toThrowError(/insecurl/);
     });
 
     it("should remove previously included text if a falsy value is bound to src", (done) => {
@@ -121,11 +112,9 @@ describe("ngInclude", () => {
       $rootScope = injector.get("$rootScope");
       $rootScope.expr = "igor";
       $rootScope.url = "/mock/interpolation";
-      $rootScope.$digest();
       setTimeout(() => {
         expect(element.text()).toEqual("igor");
         $rootScope.url = undefined;
-        $rootScope.$digest();
       }, 100);
       setTimeout(() => {
         expect(element.text()).toEqual("");
@@ -148,8 +137,6 @@ describe("ngInclude", () => {
       const injector = angular.bootstrap(element, ["myModule"]);
       $rootScope = injector.get("$rootScope");
       $rootScope.url = "/mock/interpolation";
-      $rootScope.$digest();
-
       setTimeout(() => {
         expect(called).toBe(true);
         done();
@@ -171,8 +158,6 @@ describe("ngInclude", () => {
       const injector = angular.bootstrap(element, ["myModule"]);
       $rootScope = injector.get("$rootScope");
       $rootScope.url = "/mock/interpolation";
-      $rootScope.$digest();
-
       setTimeout(() => {
         expect(called).toBe(true);
         done();
@@ -195,8 +180,6 @@ describe("ngInclude", () => {
 
       const injector = angular.bootstrap(element, ["myModule"]);
       $rootScope = injector.get("$rootScope");
-      $rootScope.$digest();
-
       setTimeout(() => {
         expect(contentLoadedSpy).not.toHaveBeenCalled();
         expect(contentErrorSpy).toHaveBeenCalled();
@@ -212,12 +195,8 @@ describe("ngInclude", () => {
       );
       const injector = angular.bootstrap(element, ["myModule"]);
       $rootScope = injector.get("$rootScope");
-      $rootScope.$digest();
-
       expect($rootScope.loaded).not.toBeDefined();
       $rootScope.url = "/mock/hello";
-      $rootScope.$digest();
-
       setTimeout(() => {
         expect(element.text()).toEqual("Hello");
         expect($rootScope.loaded).toBe(true);
@@ -231,18 +210,14 @@ describe("ngInclude", () => {
       element = JQLite('<div><ng-include src="url"></ng-include></div>');
       const injector = angular.bootstrap(element, ["myModule"]);
       $rootScope = injector.get("$rootScope");
-      $rootScope.$digest();
       expect($rootScope.$$childHead).toBeFalsy();
 
       $rootScope.url = "/mock/hello";
-      $rootScope.$digest();
-
       setTimeout(() => {
         expect($rootScope.$$childHead.$parent).toBe($rootScope);
         expect(element.text()).toBe("Hello");
 
         $rootScope.url = "/mock/401";
-        $rootScope.$digest();
       }, 100);
 
       setTimeout(() => {
@@ -250,14 +225,12 @@ describe("ngInclude", () => {
         expect(element.text()).toBe("");
 
         $rootScope.url = "/mock/hello";
-        $rootScope.$digest();
       }, 200);
 
       setTimeout(() => {
         expect($rootScope.$$childHead.$parent).toBe($rootScope);
 
         $rootScope.url = null;
-        $rootScope.$digest();
       }, 300);
 
       setTimeout(() => {
@@ -272,16 +245,13 @@ describe("ngInclude", () => {
       const injector = angular.bootstrap(element, ["myModule"]);
       $rootScope = injector.get("$rootScope");
       $rootScope.url = "/mock/hello";
-      $rootScope.$digest();
       await wait(100);
 
       expect(element.text()).toEqual("Hello");
       $rootScope.url = null;
-      $rootScope.$digest();
       await wait(100);
       expect(element.text()).toEqual("");
       $rootScope.url = "/mock/hello";
-      $rootScope.$digest();
       // No request being made
       expect(element.text()).toEqual("Hello");
     });
@@ -292,7 +262,6 @@ describe("ngInclude", () => {
       const injector = angular.bootstrap(element, ["myModule"]);
       $rootScope = injector.get("$rootScope");
       $rootScope.url = "/mock/401";
-      $rootScope.$digest();
       expect(element.text()).toBe("");
     });
 
@@ -310,7 +279,6 @@ describe("ngInclude", () => {
         called++;
       });
 
-      $rootScope.$digest();
       setTimeout(() => {
         expect(element.text()).toBe("Hello");
         done();
@@ -325,10 +293,8 @@ describe("ngInclude", () => {
       const injector = angular.bootstrap(element, ["myModule"]);
       $rootScope = injector.get("$rootScope");
       $rootScope.templateUrl = "/mock/hello";
-      $rootScope.$digest();
       $rootScope.expr = "test";
       $rootScope.templateUrl = "/mock/interpolation";
-      $rootScope.$digest();
       expect(element.text()).toBe("");
 
       setTimeout(() => {
@@ -346,21 +312,15 @@ describe("ngInclude", () => {
       $rootScope = injector.get("$rootScope");
       $rootScope.hrefUrl = "fooUrl1";
       $rootScope.includeUrl = "/mock/hello";
-      $rootScope.$digest();
-
       await wait(100);
       expect(element.text()).toBe("Hello");
       expect(element.find("span").attr("foo")).toBe("#/fooUrl1");
 
       $rootScope.hrefUrl = "fooUrl2";
-      $rootScope.$digest();
-
       expect(element.text()).toBe("Hello");
       expect(element.find("span").attr("foo")).toBe("#/fooUrl2");
 
       $rootScope.includeUrl = "/mock/hello2";
-      $rootScope.$digest();
-
       await wait(100);
       expect(element.text()).toBe("Hello2");
       expect(element.find("span").attr("foo")).toBe("#/fooUrl2");
@@ -378,7 +338,6 @@ describe("ngInclude", () => {
       element = JQLite("<svg><test></test></svg>");
       const injector = angular.bootstrap(element, ["myModule"]);
       $rootScope = injector.get("$rootScope");
-      $rootScope.$digest();
       await wait(100);
       const child = element.find("rect");
       expect(child.length).toBe(2);
@@ -397,7 +356,6 @@ describe("ngInclude", () => {
       element = JQLite("<svg><test></test></svg>");
       const injector = angular.bootstrap(element, ["myModule"]);
       $rootScope = injector.get("$rootScope");
-      $rootScope.$digest();
       await wait(200);
       expect(element.find("a").length).toBe(0);
     });
@@ -410,10 +368,7 @@ describe("ngInclude", () => {
       const injector = angular.bootstrap(element, ["myModule"]);
       $rootScope = injector.get("$rootScope");
       $rootScope.show = true;
-      $rootScope.$digest();
       $rootScope.show = false;
-      $rootScope.$digest();
-
       setTimeout(() => {
         expect(element.text()).toBe("");
         done();
@@ -428,8 +383,6 @@ describe("ngInclude", () => {
       const spy = spyOn($rootScope, "$digest").and.callThrough();
 
       $rootScope.url = "/mock/hello";
-      $rootScope.$digest();
-
       setTimeout(() => {
         expect(element.text()).toEqual("Hello");
         $rootScope.$apply('url = "/mock/hello2"');
@@ -491,8 +444,6 @@ describe("ngInclude", () => {
           $rootScope.value = true;
         });
 
-        $rootScope.$digest();
-
         setTimeout(() => {
           expect(autoScrollSpy).toHaveBeenCalled();
           done();
@@ -514,8 +465,6 @@ describe("ngInclude", () => {
         $rootScope.$apply(() => {
           $rootScope.tpl = "/mock/hello";
         });
-        $rootScope.$digest();
-
         setTimeout(() => {
           expect(autoScrollSpy).not.toHaveBeenCalled();
           done();
@@ -568,7 +517,7 @@ describe("ngInclude", () => {
       //     expect($animate.queue.shift().event).toBe("enter");
 
       //     $animate.flush();
-      //     $rootScope.$digest();
+      //     ;
 
       //     expect(autoScrollSpy).toHaveBeenCalled();
       //   },
@@ -714,7 +663,7 @@ describe("ngInclude", () => {
     //     element = $compile(
     //       html("<div><div " + 'ng-include="tpl">' + "</div></div>"),
     //     )($rootScope);
-    //     $rootScope.$digest();
+    //     ;
 
     //     const animation = $animate.queue.pop();
     //     expect(animation.event).toBe("enter");
@@ -728,14 +677,14 @@ describe("ngInclude", () => {
     //     element = $compile(
     //       html("<div><div " + 'ng-include="tpl">' + "</div></div>"),
     //     )($rootScope);
-    //     $rootScope.$digest();
+    //     ;
 
     //     let animation = $animate.queue.shift();
     //     expect(animation.event).toBe("enter");
     //     expect(animation.element.text()).toBe("data");
 
     //     $rootScope.tpl = "";
-    //     $rootScope.$digest();
+    //     ;
 
     //     animation = $animate.queue.shift();
     //     expect(animation.event).toBe("leave");
@@ -750,13 +699,13 @@ describe("ngInclude", () => {
     //     element = $compile(
     //       html("<div><div " + 'ng-include="tpl">' + "</div></div>"),
     //     )($rootScope);
-    //     $rootScope.$digest();
+    //     ;
 
     //     const item1 = $animate.queue.shift().element;
     //     expect(item1.text()).toBe("one");
 
     //     $rootScope.tpl = "two";
-    //     $rootScope.$digest();
+    //     ;
 
     //     const itemA = $animate.queue.shift().element;
     //     const itemB = $animate.queue.shift().element;

package/src/directive/init/init.js

@@ -6,8 +6,12 @@ export function ngInitDirective() {
     priority: 450,
     compile() {
       return {
-        pre(scope, _element, attrs) {
-          scope.$eval(attrs.ngInit);
+        pre(scope, element, attrs) {
+          if (element.controller()) {
+            element.controller().$eval(attrs.ngInit);
+          } else {
+            scope.$eval(attrs.ngInit);
+          }
         },
       };
     },

package/src/directive/init/init.spec.js

@@ -39,7 +39,6 @@ describe("ngInit", () => {
     });
     injector = angular.bootstrap(element, ["myModule"]);
     $rootScope = injector.get("$rootScope");
-    $rootScope.$digest();
     expect($rootScope.template).toEqual("template2.tpl");
     setTimeout(() => {
       expect(element.find("span").text()).toEqual("2");
@@ -59,7 +58,6 @@ describe("ngInit", () => {
         '<div><div ng-controller="TestCtrl" ' +
           'ng-init="test=123"></div></div>',
       )($rootScope);
-      $rootScope.$digest();
       expect($rootScope.test).toBeUndefined();
       expect($rootScope.$$childHead.test).toEqual(123);
     });

package/src/directive/input/input.js

@@ -8,7 +8,6 @@ import {
   isNumber,
   isNumberNaN,
   isDate,
-  forEach,
   convertTimezoneToLocal,
   addDateMinutes,
   timezoneToOffset,
@@ -286,7 +285,7 @@ export function createDateParser(regexp, mapping) {
           map = { yyyy: 1970, MM: 1, dd: 1, HH: 0, mm: 0, ss: 0, sss: 0 };
         }
 
-        forEach(parts, (part, index) => {
+        Object.entries(parts).forEach(([index, part]) => {
           if (index < mapping.length) {
             map[mapping[index]] = +part;
           }