update scroll container selector

Author: MartinMalinda

app/components/ember-anchor.js

@@ -13,7 +13,7 @@ export default AnchorComponent.extend({
     let offset = (elem && elem.offset && elem.offset()) ? elem.offset().top : null;
     if (offset) {
       const navMenuHeight = $('header').outerHeight();
-      $(config.APP.scrollContainerElement).scrollTop(offset - navMenuHeight - 10);
+      $(config.APP.scrollContainerSelector).scrollTop(offset - navMenuHeight - 10);
     }
   }
 });

app/services/scroll-position-reset.js

@@ -2,7 +2,7 @@ import Service from '@ember/service';
 import $ from 'jquery';
 import config from 'ember-api-docs/config/environment';
 
-const { scrollContainerElement } = config.APP;
+const { scrollContainerSelector } = config.APP;
 
 
 export default Service.extend({
@@ -27,7 +27,7 @@ export default Service.extend({
 
   doReset() {
     if (this.get('_shouldResetScroll')) {
-      $(scrollContainerElement).scrollTop(0);
+      $(scrollContainerSelector).scrollTop(0);
       this.set('_shouldResetScroll', false);
     }
   }

config/environment.js

@@ -23,7 +23,7 @@ module.exports = function(environment) {
     APP: {
       // Here you can pass flags/options to your application instance
       // when it is created
-      scrollContainerElement: 'body'
+      scrollContainerSelector: 'body, html'
     },
 
     fastboot: {
@@ -58,7 +58,7 @@ module.exports = function(environment) {
     ENV.APP.LOG_VIEW_LOOKUPS = false;
 
     ENV.APP.rootElement = '#ember-testing';
-    ENV.APP.scrollContainerElement = '#ember-testing-container';
+    ENV.APP.scrollContainerSelector = '#ember-testing-container';
 
     ENV.percy = {
       breakpointsConfig: {

tests/acceptance/scroll-reset-on-transition-test.js

@@ -4,63 +4,63 @@ import moduleForAcceptance from 'ember-api-docs/tests/helpers/module-for-accepta
 import { visit } from 'ember-native-dom-helpers';
 import config from 'ember-api-docs/config/environment';
 
-const { scrollContainerElement } = config.APP;
+const { scrollContainerSelector } = config.APP;
 
 moduleForAcceptance('Acceptance | scroll reset on transition');
 
 test('reset scroll on transitions', async function(assert) {
   await visit('/');
 
-  $(scrollContainerElement).scrollTop(1000);
-  assert.notEqual($(scrollContainerElement).scrollTop(), 0, 'scroll position is NOT zero after scroll on fresh visit');
+  $(scrollContainerSelector).scrollTop(1000);
+  assert.notEqual($(scrollContainerSelector).scrollTop(), 0, 'scroll position is NOT zero after scroll on fresh visit');
 
   await visit('/ember/1.0/classes/Ember.View');
 
-  assert.equal($(scrollContainerElement).scrollTop(), 0, 'scroll position is zero after transition to different route');
-  $(scrollContainerElement).scrollTop(1000);
+  assert.equal($(scrollContainerSelector).scrollTop(), 0, 'scroll position is zero after transition to different route');
+  $(scrollContainerSelector).scrollTop(1000);
 
   await visit('/ember/1.0/classes/Ember.Component');
 
-  assert.equal($(scrollContainerElement).scrollTop(), 0, 'scroll position is resetted after transition: project.version.class.index to project-version.class.index (same route different model)');
-  $(scrollContainerElement).scrollTop(1000);
+  assert.equal($(scrollContainerSelector).scrollTop(), 0, 'scroll position is resetted after transition: project.version.class.index to project-version.class.index (same route different model)');
+  $(scrollContainerSelector).scrollTop(1000);
 
   await visit('ember/1.0/modules/ember');
 
-  assert.equal($(scrollContainerElement).scrollTop(), 0, 'scroll position is resetted after transition: project-version.class.index to project-version.module.index');
-  $(scrollContainerElement).scrollTop(1000);
+  assert.equal($(scrollContainerSelector).scrollTop(), 0, 'scroll position is resetted after transition: project-version.class.index to project-version.module.index');
+  $(scrollContainerSelector).scrollTop(1000);
 
   await visit('ember/1.0/modules/runtime');
 
-  assert.equal($(scrollContainerElement).scrollTop(), 0, 'scroll position is resetted after transition: project-version.module.index to project-version.module.index (same route different model)');
-  $(scrollContainerElement).scrollTop(1000);
+  assert.equal($(scrollContainerSelector).scrollTop(), 0, 'scroll position is resetted after transition: project-version.module.index to project-version.module.index (same route different model)');
+  $(scrollContainerSelector).scrollTop(1000);
 
   await visit('ember/1.0/namespaces/Ember');
 
-  assert.equal($(scrollContainerElement).scrollTop(), 0, 'scroll position is resetted after transition: project-version.module.index to project-version.namespace.index');
-  $(scrollContainerElement).scrollTop(1000);
+  assert.equal($(scrollContainerSelector).scrollTop(), 0, 'scroll position is resetted after transition: project-version.module.index to project-version.namespace.index');
+  $(scrollContainerSelector).scrollTop(1000);
 
   await visit('ember/1.0/namespaces/Ember.run');
 
-  assert.equal($(scrollContainerElement).scrollTop(), 0, 'scroll position is resetted after transition: project-version.namespace.index to project-version.namespace.index (same route different model)');
-  $(scrollContainerElement).scrollTop(1000);
+  assert.equal($(scrollContainerSelector).scrollTop(), 0, 'scroll position is resetted after transition: project-version.namespace.index to project-version.namespace.index (same route different model)');
+  $(scrollContainerSelector).scrollTop(1000);
 
   await visit('ember/1.0/classes/Ember.RenderBuffer/');
 
-  assert.equal($(scrollContainerElement).scrollTop(), 0, 'scroll position is resetted after transition: project-version.namespace.index to project-version.class.index');
-  $(scrollContainerElement).scrollTop(1000);
+  assert.equal($(scrollContainerSelector).scrollTop(), 0, 'scroll position is resetted after transition: project-version.namespace.index to project-version.class.index');
+  $(scrollContainerSelector).scrollTop(1000);
 
   await visit('ember/1.0/classes/Ember.RenderBuffer/properties');
 
 
-  assert.notEqual($(scrollContainerElement).scrollTop(), 0, 'scroll position is NOT resetted after changing tab in project-version.class (properties)');
-  $(scrollContainerElement).scrollTop(1000);
+  assert.notEqual($(scrollContainerSelector).scrollTop(), 0, 'scroll position is NOT resetted after changing tab in project-version.class (properties)');
+  $(scrollContainerSelector).scrollTop(1000);
 
   await visit('ember/1.0/classes/Ember.RenderBuffer/methods');
 
-  assert.notEqual($(scrollContainerElement).scrollTop(), 0, 'scroll position is NOT resetted after changing tab in project-version.class (methods)');
-  $(scrollContainerElement).scrollTop(1000);
+  assert.notEqual($(scrollContainerSelector).scrollTop(), 0, 'scroll position is NOT resetted after changing tab in project-version.class (methods)');
+  $(scrollContainerSelector).scrollTop(1000);
 
   await visit('ember/1.0/classes/Ember.Route/methods');
 
-  assert.equal($(scrollContainerElement).scrollTop(), 0, 'scroll position is resetted after visiting route with same tab but different model');
+  assert.equal($(scrollContainerSelector).scrollTop(), 0, 'scroll position is resetted after visiting route with same tab but different model');
 });