Skip to content

Commit

Permalink
Merge branch 'master' into pr/256
Browse files Browse the repository at this point in the history
  • Loading branch information
snewcomer committed Dec 24, 2020
2 parents 22a6536 + f7e5bfa commit 405dab4
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 8 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@

- Updating to th v3.0 series was due to removing `scrollWhenPainted` as a config option. Also, we fixed some hidden bugs with scheduling when to scroll to your last y position.

## 3.3.5
* [#269](https://github.com/DockYard/ember-router-scroll/pull/269) [Enhancement]: improve idle case with improved scrollTo under high loads

## 3.3.4
* [#266](https://github.com/DockYard/ember-router-scroll/pull/266) [Deps]: bump app-scheduler 5.1.1

## 3.3.0
* [#246](https://github.com/DockYard/ember-router-scroll/pull/246) Add Evented trigger didScroll

Expand Down
7 changes: 0 additions & 7 deletions addon/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,6 @@ const CALLBACK = function(transition) {
class EmberRouterScroll extends EmberRouter {
@inject('router-scroll') service;

idlePool;

@computed
get isFastBoot() {
const fastboot = getOwner(this).lookup('service:fastboot');
Expand Down Expand Up @@ -97,11 +95,6 @@ class EmberRouterScroll extends EmberRouter {
* @param {transition|transition[]} transition If before Ember 3.6, this will be an array of transitions, otherwise
*/
updateScrollPosition(transition) {
if (this.idlePool) {
this.idlePool.destroy();
this.idlePool = null;
}

const url = get(this, 'currentURL');
const hashElement = url ? document.getElementById(url.split('#').pop()) : null;

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ember-router-scroll",
"version": "3.3.5",
"version": "3.3.6",
"description": "Scroll to top with preserved browser history scroll position",
"keywords": [
"ember-addon",
Expand Down

0 comments on commit 405dab4

Please sign in to comment.