@angular-wave/angular.ts 0.4.2 → 0.4.4

package/src/directive/script/script.spec.js

@@ -43,8 +43,6 @@ describe("scriptDirective", () => {
       '<script type="text/javascript">some {{binding}}</script>' +
       '<script type="text/ng-template" id="/some">other {{binding}}</script>';
     $compile(doc)($rootScope);
-    $rootScope.$digest();
-
     const scripts = doc.find("script");
     expect(scripts.eq(0)[0].text).toBe("some {{binding}}");
     expect(scripts.eq(1)[0].text).toBe("other {{binding}}");

package/src/directive/select/select.js

@@ -226,7 +226,7 @@ function SelectController($element, $scope) {
   function scheduleRender() {
     if (renderScheduled) return;
     renderScheduled = true;
-    $scope.$$postDigest(() => {
+    $scope.$postUpdate(() => {
       renderScheduled = false;
       self.ngModelCtrl.$render();
     });
@@ -238,7 +238,7 @@ function SelectController($element, $scope) {
 
     updateScheduled = true;
 
-    $scope.$$postDigest(() => {
+    $scope.$postUpdate(() => {
       if ($scope.$$destroyed) return;
 
       updateScheduled = false;
@@ -349,7 +349,7 @@ function SelectController($element, $scope) {
         currentValue === removeValue
       ) {
         // When multiple (selected) options are destroyed at the same time, we don't want
-        // to run a model update for each of them. Instead, run a single update in the $$postDigest
+        // to run a model update for each of them. Instead, run a single update in the $postUpdate
         scheduleViewValueUpdate(true);
       }
     });

package/src/directive/select/select.spec.js

@@ -1,7 +1,6 @@
 import { Angular } from "../../loader";
-import { createInjector } from "../../core/di/injector";
 import { dealoc, JQLite } from "../../shared/jqlite/jqlite";
-import { forEach, hashKey, equals, isNumberNaN } from "../../shared/utils";
+import { hashKey, equals, isNumberNaN } from "../../shared/utils";
 import { browserTrigger } from "../../shared/test-utils";
 
 describe("select", () => {
@@ -20,7 +19,6 @@ describe("select", () => {
     element = formElement.find("select");
     $compile(formElement)(scope);
     ngModelCtrl = element.controller("ngModel");
-    scope.$digest();
   }
 
   function setSelectValue(selectElement, optionIndex) {
@@ -118,8 +116,9 @@ describe("select", () => {
             const actualValues = {};
             let optionGroup;
             let optionValue;
-
-            forEach(actual.find("option"), (option) => {
+            let options = actual.find("option");
+            for (let i = 0; i < options.length; i++) {
+              let option = options[i];
               optionGroup = option.parentNode.label || "";
               actualValues[optionGroup] = actualValues[optionGroup] || [];
               // IE9 doesn't populate the label property from the text property like other browsers
@@ -127,7 +126,7 @@ describe("select", () => {
               actualValues[optionGroup].push(
                 option.selected ? [optionValue] : optionValue,
               );
-            });
+            }
 
             const message = function () {
               return `Expected ${toJson(actualValues)} to equal ${toJson(expected)}.`;
@@ -350,7 +349,6 @@ describe("select", () => {
       expect(scope.form.nameA.$name).toBe("nameA");
       const oldModel = scope.form.nameA;
       scope.nameID = "B";
-      scope.$digest();
       expect(scope.form.nameA).toBeUndefined();
       expect(scope.form.nameB).toBe(oldModel);
       expect(scope.form.nameB.$name).toBe("nameB");
@@ -398,7 +396,6 @@ describe("select", () => {
       $compile(select)(scope);
       expect(selectCtrl.writeValue).not.toHaveBeenCalled();
 
-      scope.$digest();
       expect(selectCtrl.writeValue).toHaveBeenCalled();
       dealoc(select);
     });
@@ -412,16 +409,12 @@ describe("select", () => {
           "</select>",
       );
 
-      scope.$digest();
-
       let options = element.find("option");
       expect(options[0].selected).toBeTrue();
       expect(options[1].selected).toBeFalse();
       expect(options[2].selected).toBeFalse();
 
       scope.selected = "a";
-      scope.$digest();
-
       options = element.find("option");
       expect(options.length).toBe(3);
       expect(options[0].selected).toBeFalse();
@@ -429,8 +422,6 @@ describe("select", () => {
       expect(options[2].selected).toBeFalse();
 
       scope.selected = "b";
-      scope.$digest();
-
       options = element.find("option");
       expect(options[0].selected).toBeFalse();
       expect(options[1].selected).toBeFalse();
@@ -438,15 +429,12 @@ describe("select", () => {
 
       // This will select the empty option
       scope.selected = null;
-      scope.$digest();
-
       expect(options[0].selected).toBeTrue();
       expect(options[1].selected).toBeFalse();
       expect(options[2].selected).toBeFalse();
 
       // This will add and select the unknown option
       scope.selected = "unmatched value";
-      scope.$digest();
       options = element.find("option");
 
       expect(options[0].selected).toBeTrue();
@@ -456,7 +444,6 @@ describe("select", () => {
 
       // Back to matched value
       scope.selected = "b";
-      scope.$digest();
       options = element.find("option");
 
       expect(options[0].selected).toBeFalse();
@@ -481,20 +468,15 @@ describe("select", () => {
           { val: "x", display: "robot x" },
           { val: "y", display: "robot y" },
         ];
-        scope.$digest();
-
         expect(element[0].value).toBe("");
 
         scope.robot = "x";
-        scope.$digest();
         expect(element[0].value).toBe("x");
         scope.dynamicOptions.shift();
 
-        scope.$digest();
         expect(element[0].value).toBe("x");
 
         scope.robot = undefined;
-        scope.$digest();
         expect(element[0].value).toBe(unknownValue(undefined));
       });
 
@@ -509,11 +491,9 @@ describe("select", () => {
             '<option ng-repeat="opt in dynamicOptions" value="{{opt.val}}">{{opt.display}}</option>' +
             "</select>",
         );
-        scope.$digest();
         expect(element[0].value).toBe(unknownValue("x"));
 
         scope.robot = undefined;
-        scope.$digest();
         expect(element.find("option").eq(0)[0].selected).toBe(true);
         expect(element.find("option").eq(0).text()).toBe("--static-select--");
 
@@ -522,11 +502,9 @@ describe("select", () => {
           { val: "x", display: "robot x" },
           { val: "y", display: "robot y" },
         ];
-        scope.$digest();
         expect(element[0].value).toBe("");
 
         scope.dynamicOptions = [];
-        scope.$digest();
         expect(element[0].value).toBe("");
       });
 
@@ -583,8 +561,6 @@ describe("select", () => {
         expect(element[0].value).toBe(unknownValue("other"));
 
         scope.robot = undefined;
-        scope.$digest();
-
         expect(element[0].value).toBe("");
       });
 
@@ -671,8 +647,6 @@ describe("select", () => {
             "</select>",
         );
 
-        scope.$digest();
-
         let options = element.find("option");
         expect(options.length).toBe(3);
         expect(options[0].selected).toBeTrue();
@@ -680,8 +654,6 @@ describe("select", () => {
         expect(options[2].selected).toBeFalse();
 
         scope.selected = "a";
-        scope.$digest();
-
         options = element.find("option");
         expect(options.length).toBe(3);
         expect(options[0].selected).toBeFalse();
@@ -689,8 +661,6 @@ describe("select", () => {
         expect(options[2].selected).toBeFalse();
 
         scope.selected = "no match";
-        scope.$digest();
-
         options = element.find("option");
         expect(options[0].selected).toBeTrue();
         expect(options[1].selected).toBeFalse();
@@ -930,7 +900,6 @@ describe("select", () => {
       ];
       scope.empty = true;
 
-      scope.$digest();
       expect(element[0].value).toBe("");
       expect(selectCtrl.$hasEmptyOption()).toBe(true);
       expect(selectCtrl.$isEmptyOptionSelected()).toBe(true);
@@ -1435,14 +1404,12 @@ describe("select", () => {
           "</select>",
       );
 
-      scope.$digest();
       expect(scope.selected).toBeUndefined();
 
       setSelectValue(element, 0);
       expect(scope.selected).toBe("option1");
 
       scope.selected = "option2";
-      scope.$digest();
       expect(element.find("option").eq(1)[0].selected).toBe(true);
       expect(element.find("option").eq(1).text()).toBe("Option 2");
     });
@@ -1461,15 +1428,12 @@ describe("select", () => {
       const selectCtrl = element.controller("select");
       spyOn(selectCtrl, "removeOption").and.callThrough();
 
-      scope.$digest();
       expect(scope.selected).toBeUndefined();
       expect(selectCtrl.removeOption).not.toHaveBeenCalled();
 
       // Change value of option2
       scope.option2 = "option2Changed";
       scope.selected = "option2Changed";
-      scope.$digest();
-
       expect(selectCtrl.removeOption).toHaveBeenCalledWith("");
       expect(element.find("option").eq(1)[0].selected).toBe(true);
       expect(element.find("option").eq(1).text()).toBe("Option 2");
@@ -1486,14 +1450,12 @@ describe("select", () => {
           "</select>",
       );
 
-      scope.$digest();
       expect(scope.selected).toBeUndefined();
 
       setSelectValue(element, 0);
       expect(scope.selected).toBe("Option 1");
 
       scope.selected = "Option 2";
-      scope.$digest();
       expect(element.find("option").eq(1)[0].selected).toBe(true);
       expect(element.find("option").eq(1).text()).toBe("Option 2");
     });
@@ -1512,15 +1474,12 @@ describe("select", () => {
       const selectCtrl = element.controller("select");
       spyOn(selectCtrl, "removeOption").and.callThrough();
 
-      scope.$digest();
       expect(scope.selected).toBeUndefined();
       expect(selectCtrl.removeOption).not.toHaveBeenCalled();
 
       // Change value of option2
       scope.option2 = "Option 2 Changed";
       scope.selected = "Option 2 Changed";
-      scope.$digest();
-
       expect(selectCtrl.removeOption).toHaveBeenCalledWith("");
       expect(element.find("option").eq(1)[0].selected).toBe(true);
       expect(element.find("option").eq(1).text()).toBe("Option 2 Changed");
@@ -1535,7 +1494,6 @@ describe("select", () => {
       )($rootScope);
 
       $rootScope.foo = "success";
-      $rootScope.$digest();
       expect(element.find("span").text()).toBe("success");
       dealoc(element);
     });
@@ -1574,18 +1532,13 @@ describe("select", () => {
               "</select>",
           );
 
-          scope.$digest();
           expect(element.find("option").eq(0).val()).toBe("? string:NOMATCH ?");
 
           scope.selected = prop;
-          scope.$digest();
-
           expect(element.find("option").eq(0).val()).toBe(hashKey(prop));
 
           // Reset
           scope.selected = false;
-          scope.$digest();
-
           expect(element.find("option").eq(0).val()).toBe("? boolean:false ?");
 
           setSelectValue(element, 0);
@@ -1622,19 +1575,14 @@ describe("select", () => {
           const selectController = element.controller("select");
           spyOn(selectController, "removeOption").and.callThrough();
 
-          scope.$digest();
           expect(selectController.removeOption).not.toHaveBeenCalled();
           expect(element.find("option").eq(0).val()).toBe("? string:NOMATCH ?");
 
           scope.selected = prop;
-          scope.$digest();
-
           expect(element.find("option").eq(0).val()).toBe(hashKey(prop));
           expect(element[0].selectedIndex).toBe(0);
 
           scope.option = "UPDATEDVALUE";
-          scope.$digest();
-
           expect(selectController.removeOption.calls.count()).toBe(1);
 
           // Updating the option value currently does not update the select model
@@ -1657,8 +1605,6 @@ describe("select", () => {
           );
 
           scope.selected = "UPDATEDVALUE";
-          scope.$digest();
-
           expect(element[0].selectedIndex).toBe(0);
           expect(element.find("option").eq(0).val()).toBe(
             "string:UPDATEDVALUE",
@@ -1681,8 +1627,6 @@ describe("select", () => {
         });
 
         scope.option = "init";
-        scope.$digest();
-
         expect(log[0]).toBe("init");
         expect(element.find("option").eq(1).val()).toBe("string:init");
 
@@ -1752,8 +1696,6 @@ describe("select", () => {
               "</select>",
           );
 
-          scope.$digest();
-
           expect(
             Object.values(element[0].childNodes)
               .map((x) => x.value)
@@ -1770,8 +1712,6 @@ describe("select", () => {
           );
 
           scope.selected = ["string", 1];
-          scope.$digest();
-
           expect(element.find("option").eq(0)[0].selected).toBe(true);
           expect(element.find("option").eq(2)[0].selected).toBe(true);
 
@@ -1781,12 +1721,11 @@ describe("select", () => {
           // reset
           scope.selected = [];
           scope.$digest();
+          let elems = element.find("option");
 
-          forEach(element.find("option"), (option) => {
-            // browserTrigger can't produce click + ctrl, so set selection manually
-            JQLite(option)[0].selected = true;
-          });
-
+          for (var i = 0; i < elems.length; i++) {
+            JQLite(elems[i])[0].selected = true;
+          }
           browserTrigger(element, "change");
 
           const arrayVal = ["a"];
@@ -1842,8 +1781,6 @@ describe("select", () => {
           expect(scope.obj.value).toBe(prop === "ngValue" ? A : "A");
 
           scope.options.shift();
-          scope.$digest();
-
           optionElements = element.find("option");
           expect(optionElements.length).toEqual(3);
           expect(scope.obj.value).toBe(null);
@@ -1886,8 +1823,6 @@ describe("select", () => {
           expect(scope.obj.value).toBe("A");
 
           A.name = "X";
-          scope.$digest();
-
           optionElements = element.find("option");
           expect(optionElements.length).toEqual(4);
           expect(scope.obj.value).toBe(null);
@@ -1930,8 +1865,6 @@ describe("select", () => {
           expect(scope.obj.value).toBe("A");
 
           A.disabled = true;
-          scope.$digest();
-
           optionElements = element.find("option");
           expect(optionElements.length).toEqual(4);
           expect(scope.obj.value).toBe(null);
@@ -1970,15 +1903,11 @@ describe("select", () => {
           expect(optionElements[0].value).toEqual(unknownValue(undefined));
 
           B.disabled = true;
-          scope.$digest();
-
           optionElements = element.find("option");
           expect(optionElements.length).toEqual(4);
           expect(optionElements[0].value).toEqual(unknownValue(undefined));
 
           scope.obj.value = "B";
-          scope.$digest();
-
           optionElements = element.find("option");
           expect(optionElements.length).toEqual(3);
           expect(scope.obj.value).toBe("B");
@@ -2024,16 +1953,12 @@ describe("select", () => {
           expect(scope.obj.value).toBe("A");
 
           A.disabled = true;
-          scope.$digest();
-
           optionElements = element.find("option");
           expect(optionElements.length).toEqual(4);
           expect(scope.obj.value).toBe(null);
           expect(element.val()).toBe("? object:null ?");
 
           A.disabled = false;
-          scope.$digest();
-
           optionElements = element.find("option");
           expect(optionElements.length).toEqual(4);
           expect(scope.obj.value).toBe(null);
@@ -2073,8 +1998,6 @@ describe("select", () => {
           expect(optionElements.length).toEqual(3);
 
           scope.options.push(C);
-          scope.$digest();
-
           optionElements = element.find("option");
           expect(optionElements.length).toEqual(3);
           expect(optionElements[2].selected).toBe(true);
@@ -2113,8 +2036,6 @@ describe("select", () => {
           expect(optionElements.length).toEqual(3);
 
           scope.obj.value = "C";
-          scope.$digest();
-
           optionElements = element.find("option");
           expect(element.val()).toBe(prop === "ngValue" ? "string:C" : "C");
           expect(optionElements.length).toEqual(3);
@@ -2122,8 +2043,6 @@ describe("select", () => {
           expect(scope.obj.value).toBe("C");
 
           scope.options = [{ name: "A" }, { name: "B" }, { name: "C" }];
-          scope.$digest();
-
           optionElements = element.find("option");
           expect(element.val()).toBe(prop === "ngValue" ? "string:C" : "C");
           expect(optionElements.length).toEqual(3);
@@ -2182,8 +2101,6 @@ describe("select", () => {
             ngModelCtrlSpy.calls.reset();
             scope.options.shift();
             scope.options.pop();
-            scope.$digest();
-
             optionElements = element.find("option");
             expect(optionElements.length).toEqual(1);
             expect(scope.obj.value).toEqual([]);
@@ -2247,8 +2164,6 @@ describe("select", () => {
             ngModelCtrlSpy.calls.reset();
             A.name = "X";
             C.name = "Z";
-            scope.$digest();
-
             optionElements = element.find("option");
             expect(optionElements.length).toEqual(3);
             expect(scope.obj.value).toEqual([]);
@@ -2314,8 +2229,6 @@ describe("select", () => {
             ngModelCtrlSpy.calls.reset();
             A.disabled = true;
             C.disabled = true;
-            scope.$digest();
-
             optionElements = element.find("option");
             expect(optionElements.length).toEqual(4);
             expect(scope.obj.value).toEqual(["D"]);
@@ -2361,15 +2274,11 @@ describe("select", () => {
 
             A.disabled = true;
             D.disabled = true;
-            scope.$digest();
-
             optionElements = element.find("option");
             expect(optionElements.length).toEqual(4);
             expect(element[0].value).toBe("");
 
             scope.obj.value = prop === "ngValue" ? [A, C, D] : ["A", "C", "D"];
-            scope.$digest();
-
             optionElements = element.find("option");
             expect(optionElements.length).toEqual(4);
             expect(optionElements.eq(0)[0].selected).toBe(true);
@@ -2413,8 +2322,6 @@ describe("select", () => {
             expect(optionElements.eq(1)[0].selected).toBe(true);
 
             scope.options.push(C);
-            scope.$digest();
-
             optionElements = element.find("option");
 
             expect(optionElements.length).toEqual(3);
@@ -2457,8 +2364,6 @@ describe("select", () => {
             expect(optionElements.length).toEqual(3);
 
             scope.obj.value = ["B", "C"];
-            scope.$digest();
-
             optionElements = element.find("option");
 
             expect(optionElements.length).toEqual(3);
@@ -2467,8 +2372,6 @@ describe("select", () => {
             expect(scope.obj.value).toEqual(["B", "C"]);
 
             scope.options = [{ name: "A" }, { name: "B" }, { name: "C" }];
-            scope.$digest();
-
             optionElements = element.find("option");
 
             expect(optionElements.length).toEqual(3);

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

@@ -22,7 +22,7 @@ export function ngShowDirective($animate) {
             tempClasses: NG_HIDE_IN_PROGRESS_CLASS,
           });
         } else {
-          scope.$$postDigest(() => {
+          scope.$postUpdate(() => {
             if (value) {
               element
                 .elements()
@@ -56,7 +56,7 @@ export function ngHideDirective($animate) {
             tempClasses: NG_HIDE_IN_PROGRESS_CLASS,
           });
         } else {
-          scope.$$postDigest(() => {
+          scope.$postUpdate(() => {
             if (value) {
               element
                 .elements()