Upgrade to Ember 3.7.0

2019-03-20 12:50:13 +01:00
parent f2c6a160e5
commit f3d0d8fe7d
33 changed files with 222 additions and 166 deletions
@@ -100,7 +100,7 @@ export default Ember.Component.extend({

        if (this.appEvents) {
          // xxx: don't run during qunit tests
-          this.appEvents.on("ace:resize", () => this.resize());
+          this.appEvents.on("ace:resize", this, "resize");
        }

        if (this.get("autofocus")) {
@@ -10,12 +10,13 @@ export default Discourse.Route.extend({
    const routeName = "adminUsersList.show";

    if (transition.targetName === routeName) {
-      const params = transition.params[routeName];
+      const params = transition.routeInfos.find(a => a.name === routeName)
+        .params;
      const controller = this.controllerFor(routeName);
      if (controller) {
        controller.setProperties({
-          order: transition.queryParams.order,
-          ascending: transition.queryParams.ascending,
+          order: transition.to.queryParams.order,
+          ascending: transition.to.queryParams.ascending,
          query: params.filter,
          showEmails: false,
          refreshing: false