Move router service invents into a reopen

emberjs · Oct 3, 2018 · 411f7c4 · 411f7c4
1 parent 0f95c77
commit 411f7c4
Showing 1 changed file with 78 additions and 74 deletions.
diff --git a/packages/@ember/-internals/routing/lib/services/router.ts b/packages/@ember/-internals/routing/lib/services/router.ts
@@ -1,10 +1,10 @@
 import { Evented } from '@ember/-internals/runtime';
+import { EMBER_ROUTING_ROUTER_SERVICE } from '@ember/canary-features';
 import { readOnly } from '@ember/object/computed';
 import Service from '@ember/service';
 import { Transition } from 'router_js';
 import EmberRouter from '../system/router';
 import { extractRouteArgs, resemblesURL, shallowEqual } from '../utils';
-
 /**
    The Router service is the public API that provides access to the router.
 
@@ -38,79 +38,6 @@ import { extractRouteArgs, resemblesURL, shallowEqual } from '../utils';
 export default class RouterService extends Service {
   _router!: EmberRouter;
 
-  init() {
-    this._super(...arguments);
-    this._router.on('routeWillChange', (transition: Transition) => {
-      this.trigger('routeWillChange', transition);
-    });
-
-    this._router.on('routeDidChange', (transition: Transition) => {
-      this.trigger('routeDidChange', transition);
-    });
-  }
-
-  /**
-    The `routeWillChange` event is fired at the beginning of any
-    attempted transition with a `Transition` object as the sole
-    argument. This action can be used for aborting, redirecting,
-    or decorating the transition from the currently active routes.
-
-    A good example is preventing navigation when a form is
-    half-filled out:
-
-    ```app/routes/contact-form.js
-    import {inject as service} from '@ember/service';
-
-    export default Route.extend({
-      router: service('router'),
-      init() {
-        this._super(...arguments);
-        this.router.on('routeWillUpdate', (transition) => {
-          if (!transition.to.find(route => route.name === this.routeName)) {
-            alert("Please save or cancel your changes.");
-            transition.abort();
-          }
-        })
-      }
-    });
-    ```
-
-  The `routeWillChange` event fires whenever a new route is chosen as the desired target of a transition. This includes `transitionTo`, `replaceWith`, all redirection for any reason including error handling, and abort. Aborting implies changing the desired target back to where you already were. Once a transition has completed, `routeDidChange` fires.
-
-    @event routeWillChange
-    @param {Transition} transition
-    @public
-  */
-
-  /**
-    The `routeDidChange` event only fires once a transition has settled.
-    This includes aborts and error substates. Like the `routeWillChange` event
-    it recieves a Transition as the sole argument.
-
-    A good example is sending some analytics when the route has transitioned:
-
-    ```app/routes/contact-form.js
-    import {inject as service} from '@ember/service';
-
-    export default Route.extend({
-      router: service('router'),
-      init() {
-        this._super(...arguments);
-        this.router.on('routeDidUpdate', (transition) => {
-          ga.send('pageView', {
-            current: transition.to.name,
-            from: transition.from.name
-          });
-        })
-      }
-    });
-    ```
-
-    @event routeDidChange
-    @param {Transition} transition
-    @public
-  */
-
   /**
      Transition the application into another route. The route may
      be either a single route or route path:
@@ -326,3 +253,80 @@ RouterService.reopen(Evented, {
   */
   rootURL: readOnly('_router.rootURL'),
 });
+
+if (EMBER_ROUTING_ROUTER_SERVICE) {
+  RouterService.reopen(Evented, {
+    init() {
+      this._super(...arguments);
+      this._router.on('routeWillChange', (transition: Transition) => {
+        this.trigger('routeWillChange', transition);
+      });
+
+      this._router.on('routeDidChange', (transition: Transition) => {
+        this.trigger('routeDidChange', transition);
+      });
+    },
+    // Uncomment this when we go the feature
+    //   /**
+    //   The `routeWillChange` event is fired at the beginning of any
+    //   attempted transition with a `Transition` object as the sole
+    //   argument. This action can be used for aborting, redirecting,
+    //   or decorating the transition from the currently active routes.
+
+    //   A good example is preventing navigation when a form is
+    //   half-filled out:
+
+    //   ```app/routes/contact-form.js
+    //   import {inject as service} from '@ember/service';
+
+    //   export default Route.extend({
+    //     router: service('router'),
+    //     init() {
+    //       this._super(...arguments);
+    //       this.router.on('routeWillUpdate', (transition) => {
+    //         if (!transition.to.find(route => route.name === this.routeName)) {
+    //           alert("Please save or cancel your changes.");
+    //           transition.abort();
+    //         }
+    //       })
+    //     }
+    //   });
+    //   ```
+
+    // The `routeWillChange` event fires whenever a new route is chosen as the desired target of a transition. This includes `transitionTo`, `replaceWith`, all redirection for any reason including error handling, and abort. Aborting implies changing the desired target back to where you already were. Once a transition has completed, `routeDidChange` fires.
+
+    //   @event routeWillChange
+    //   @param {Transition} transition
+    //   @public
+    // */
+
+    //   /**
+    //   The `routeDidChange` event only fires once a transition has settled.
+    //   This includes aborts and error substates. Like the `routeWillChange` event
+    //   it recieves a Transition as the sole argument.
+
+    //   A good example is sending some analytics when the route has transitioned:
+
+    //   ```app/routes/contact-form.js
+    //   import {inject as service} from '@ember/service';
+
+    //   export default Route.extend({
+    //     router: service('router'),
+    //     init() {
+    //       this._super(...arguments);
+    //       this.router.on('routeDidUpdate', (transition) => {
+    //         ga.send('pageView', {
+    //           current: transition.to.name,
+    //           from: transition.from.name
+    //         });
+    //       })
+    //     }
+    //   });
+    //   ```
+
+    //   @event routeDidChange
+    //   @param {Transition} transition
+    //   @public
+    // */
+  });
+}