diff --git a/CHANGELOG.md b/CHANGELOG.md index 3d22042822..13af14a1f9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -34,6 +34,8 @@ v1.3.3-dev * ons-navigator: Fixed [#691](https://github.com/OnsenUI/OnsenUI/issues/691). * ons-icon: Fixed [#687](https://github.com/OnsenUI/OnsenUI/issues/687). * ons-icon: Fixed [#688](https://github.com/OnsenUI/OnsenUI/issues/688). + * ons-scroller: Fixed [#707](https://github.com/OnsenUI/OnsenUI/issues/707). + * ons-carousel: Fixed a random error when event was undefined. v1.3.2 ---- diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 0c1fe6ecba..e69a0f10e5 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -25,5 +25,6 @@ List of code contributors (in no particular order): * [Ryohei Ikegami](https://github.com/seanchas116) * [Dominique Rahm](https://github.com/d3orn) * [Kon Yuichi](https://github.com/konpyu) +* [zack](https://github.com/zack24q) Please add yourself if you're not on this list but feel that you should be. diff --git a/core/css/scroller.css b/core/css/scroller.css index 2ec13c2437..4966b94d86 100644 --- a/core/css/scroller.css +++ b/core/css/scroller.css @@ -17,6 +17,7 @@ limitations under the License. ons-scroller { display: block; + height: 100%; overflow: scroll; -webkit-overflow-scrolling: touch; -ms-overflow-style: none; @@ -25,3 +26,8 @@ ons-scroller { ons-scroller::-webkit-scrollbar { display: none; } + +.ons-scroller__content { + height: 100%; + overflow: scroll; +} diff --git a/framework/views/carousel.js b/framework/views/carousel.js index ecc05dca19..af3ba431d0 100644 --- a/framework/views/carousel.js +++ b/framework/views/carousel.js @@ -511,7 +511,7 @@ limitations under the License. if (!waitForAction) { this._scrollToKillOverScroll(); } - } else if (this._lastDragEvent !== null) { + } else { this._startMomentumScroll(event); } this._lastDragEvent = null; @@ -537,7 +537,7 @@ limitations under the License. }, _startMomentumScroll: function(event) { - if (this._lastDragEvent !== null) { + if (this._lastDragEvent) { var velocity = this._getScrollVelocity(this._lastDragEvent); var duration = 0.3; var scrollDelta = duration * 100 * velocity;