Skip to content

Commit

Permalink
🐛 Fixed infinite scroll of posts/pages screens not working in Safari
Browse files Browse the repository at this point in the history
closes TryGhost/Ghost#10521
- bumped `ember-in-viewport` and `ember-infinity` which fixed the Safari bug
- forced resolution of `ember-in-viewport` to 3.2.2 to avoid conflicts across project sub-dependencies
- switched to fork of `ember-light-table` which contains a compatibility fix with `ember-in-viewport@3.2.2` (PR'd here adopted-ember-addons/ember-light-table#674)
  • Loading branch information
kevinansfield committed Mar 15, 2019
1 parent 948d995 commit 4c3a44e
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 20 deletions.
9 changes: 6 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,9 @@
"ember-exam": "2.0.3",
"ember-export-application-global": "2.0.0",
"ember-fetch": "6.5.0",
"ember-in-viewport": "~3.0.3",
"ember-infinity": "1.2.6",
"ember-light-table": "1.13.2",
"ember-in-viewport": "3.2.2",
"ember-infinity": "1.3.4",
"ember-light-table": "https://github.com/kevinansfield/ember-light-table#bump-ember-in-viewport",
"ember-load": "0.0.17",
"ember-load-initializers": "2.0.0",
"ember-mocha": "0.14.0",
Expand Down Expand Up @@ -130,5 +130,8 @@
"lib/asset-delivery",
"lib/koenig-editor"
]
},
"resolutions": {
"ember-in-viewport": "3.2.2"
}
}
26 changes: 9 additions & 17 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4906,7 +4906,7 @@ ember-hash-helper-polyfill@^0.2.0:
ember-cli-babel "^6.8.2"
ember-cli-version-checker "^2.1.0"

ember-in-viewport@^3.1.5:
ember-in-viewport@3.2.2, ember-in-viewport@^3.2.2, ember-in-viewport@~3.0.0, ember-in-viewport@~3.2.2:
version "3.2.2"
resolved "https://registry.yarnpkg.com/ember-in-viewport/-/ember-in-viewport-3.2.2.tgz#81110e04076cf693f29d19e58daf5a3a5b8da60e"
integrity sha512-EGQ7hwSlDsjaV80Adxc9zdTpXGCtZgO05ZIlEHE4C2oUNO+aS3jVgYRgqR8AzQwx3bmC8xAB4qpcLrvKVQJKWg==
Expand All @@ -4916,20 +4916,13 @@ ember-in-viewport@^3.1.5:
intersection-observer-admin "0.0.5"
raf-pool "0.0.4"

ember-in-viewport@~3.0.0, ember-in-viewport@~3.0.3:
version "3.0.3"
resolved "https://registry.yarnpkg.com/ember-in-viewport/-/ember-in-viewport-3.0.3.tgz#49c60b52525795246761742ed4495ad6cd9bf70d"
integrity sha512-Iw8qquApABdrP9xA8hJFaYAxz/iOGLJ0Acq4QptemEnpsHcQqAET/SKL/A1fbtDGQAVtB5+bULaJcsrzRMCteg==
dependencies:
ember-cli-babel "^6.6.0"

ember-infinity@1.2.6:
version "1.2.6"
resolved "https://registry.yarnpkg.com/ember-infinity/-/ember-infinity-1.2.6.tgz#b935f13e386f5bf2ebc973b96b5ca45addadf546"
integrity sha512-1Ju5un0IIlawAm8p8RsSxKnYBgPQ6ygtftNYi3s4IglR+pSgoWiAoA2iwDSa85cZMDTHr1XiOBcM1xedu75mjg==
ember-infinity@1.3.4:
version "1.3.4"
resolved "https://registry.yarnpkg.com/ember-infinity/-/ember-infinity-1.3.4.tgz#cb2cc08a044436023da394d408373d5cda576196"
integrity sha512-7kbeapUUoWzMkaHqqZykKcQgSkf1IxBQiNURVL7IRLuOaN1ZQWTaoqeMt12tvdFh9X+KvM0KouGUHfEFjfzeaA==
dependencies:
ember-cli-babel "~7.1.2"
ember-in-viewport "^3.1.5"
ember-in-viewport "~3.2.2"

"ember-inflector@^2.0.0 || ^3.0.0", ember-inflector@^3.0.0:
version "3.0.0"
Expand All @@ -4952,18 +4945,17 @@ ember-lifeline@^3.0.1:
dependencies:
ember-cli-babel "^7.1.3"

ember-light-table@1.13.2:
"ember-light-table@https://github.com/kevinansfield/ember-light-table#bump-ember-in-viewport":
version "1.13.2"
resolved "https://registry.yarnpkg.com/ember-light-table/-/ember-light-table-1.13.2.tgz#be9ec8ce4c3b41d43bdf8e571e18ae0cfed6c9b7"
integrity sha512-pmilGVQa8il2o+BbrM33jgf16mWSnbjl+hReCDCcapbLlB5tgA6WfbbUDK8myunw1GsPhSREoo3SzwoXQDazFg==
resolved "https://github.com/kevinansfield/ember-light-table#a757399504755ad8dde5cb4196576201881b93d4"
dependencies:
"@html-next/vertical-collection" "^1.0.0-beta.12"
ember-cli-babel "^6.11.0"
ember-cli-htmlbars "^2.0.3"
ember-cli-string-helpers "^1.8.1"
ember-composable-helpers "^2.1.0"
ember-get-config "^0.2.4"
ember-in-viewport "~3.0.3"
ember-in-viewport "^3.2.2"
ember-scrollable "^0.5.0"
ember-truth-helpers "^2.0.0"
ember-wormhole "^0.5.4"
Expand Down

0 comments on commit 4c3a44e

Please sign in to comment.