Fix ngInclude event ordering

Author: tolyo

src/directive/include/include.js

@@ -87,10 +87,9 @@ export function ngIncludeDirective(
           const thisChangeId = ++changeCounter;
 
           if (src) {
-            // set the 2nd param to true to ignore the template request error so that the inner
-            // contents and scope can be cleaned up.
-            await $templateRequest(src).then(
-              (response) => {
+            scope.$emit("$includeContentRequested", src);
+            $templateRequest(src)
+              .then((response) => {
                 if (scope._destroyed) return;
 
                 if (thisChangeId !== changeCounter) return;
@@ -121,18 +120,16 @@ export function ngIncludeDirective(
                 currentElement = clone;
                 currentScope.$emit("$includeContentLoaded", src);
                 scope.$eval(onloadExp);
-              },
-              (err) => {
+              })
+              .catch((err) => {
                 if (scope._destroyed) return;
 
                 if (thisChangeId === changeCounter) {
                   cleanupLastIncludeContent();
                   scope.$emit("$includeContentError", src);
                 }
                 $exceptionHandler(new Error(err));
-              },
-            );
-            scope.$emit("$includeContentRequested", src);
+              });
           } else {
             cleanupLastIncludeContent();
             ctrl.template = null;

src/directive/include/include.spec.js

@@ -329,7 +329,7 @@ describe("ngInclude", () => {
       }));
       EL.innerHTML = "<svg><test></test></svg>";
       angular.bootstrap(EL, ["myModule"]);
-      getScope(EL).$on("$includeContentRequested", () => {
+      getScope(EL).$on("$includeContentLoaded", () => {
         const child = EL.querySelectorAll("rect");
         expect(child.length).toBe(2);
         expect(child[0] instanceof SVGRectElement).toBe(true);