Merge pull request #719 from OnsenUI/fix-stuff

Fix for ons-scroller and ons-carousel. Closes #707

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
 ----

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.

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;
+}

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;