Merge branch 'development' into searchfeature

Author: iamareebjamal

app/controllers/public/sessions.js

@@ -1,8 +1,7 @@
 import classic from 'ember-classic-decorator';
-import { action, computed } from '@ember/object';
+import { computed } from '@ember/object';
 import Controller from '@ember/controller';
 import moment from 'moment';
-import $ from 'jquery';
 
 @classic
 export default class SessionsController extends Controller {
@@ -12,21 +11,7 @@ export default class SessionsController extends Controller {
   sort = 'starts-at';
   isTrackVisible = false;
   timezone = null;
-
-  constructor(...args) {
-    super(...args);
-
-    this.addObserver('model.session', this, 'sessionChanged');
-  }
-
-  @action
-  sessionChanged() {
-    if (this.model.isFiltering) {
-      $('html,body').animate({
-        scrollTop: $('#session-heading').offset()?.top
-      });
-    }
-  }
+  preserveScrollPosition = true;
 
   @computed('model.event.startsAt', 'model.event.endsAt', 'timezone')
   get allDates() {

app/routes/public/sessions.js

@@ -129,8 +129,6 @@ export default class SessionsRoute extends Route {
       });
     }
 
-    const isFiltering = params.room || params.track || params.date || params.search;
-
     return {
       event   : eventDetails,
       session : await this.infinity.model('sessions', {
@@ -142,8 +140,7 @@ export default class SessionsRoute extends Route {
         perPageParam : 'page[size]',
         pageParam    : 'page[number]',
         store        : eventDetails
-      }),
-      isFiltering
+      })
     };
   }
 }