From 0f29a6e3efe800bda9282d7dc74afea9399aed71 Mon Sep 17 00:00:00 2001 From: Max Lynch Date: Fri, 25 Oct 2013 11:32:34 -0500 Subject: [PATCH] Scroll stuff --- dist/js/ionic.js | 4 +- js/views/scrollerView.js | 4 +- test/scroll_forms.html | 93 ++++++++++++++++++++++++++++++++++++++++ test/scroll_horiz.html | 13 ++++-- test/scroller.html | 59 +++++++++++++++++++++++++ 5 files changed, 166 insertions(+), 7 deletions(-) create mode 100644 test/scroll_forms.html create mode 100644 test/scroller.html diff --git a/dist/js/ionic.js b/dist/js/ionic.js index 8609dc3701..ba804a07d1 100644 --- a/dist/js/ionic.js +++ b/dist/js/ionic.js @@ -2908,7 +2908,8 @@ window.ionic = { })(ionic); ; /** - * Adapted from the great iScroll for Ionic. iScroll is licensed under MIT just like Ionic. + * Adapted from the great iScroll 5 for Ionic. iScroll is licensed under MIT just like Ionic. + * iScroll v5.0.5 ~ (c) 2008-2013 Matteo Spinelli ~ http://cubiq.org/license * * Think of ionic.views.Scroll like a Javascript version of UIScrollView or any * scroll container in any UI library. You could just use -webkit-overflow-scrolling: touch, @@ -2916,7 +2917,6 @@ window.ionic = { * like UIScrollView, and you don't get events after the finger stops touching the * device (after a flick, for example) * - * iScroll v5.0.5 ~ (c) 2008-2013 Matteo Spinelli ~ http://cubiq.org/license */ (function (window, document, Math, ionic) { 'use strict'; diff --git a/js/views/scrollerView.js b/js/views/scrollerView.js index 4ad28155f3..1480839e95 100644 --- a/js/views/scrollerView.js +++ b/js/views/scrollerView.js @@ -1,5 +1,6 @@ /** - * Adapted from the great iScroll for Ionic. iScroll is licensed under MIT just like Ionic. + * Adapted from the great iScroll 5 for Ionic. iScroll is licensed under MIT just like Ionic. + * iScroll v5.0.5 ~ (c) 2008-2013 Matteo Spinelli ~ http://cubiq.org/license * * Think of ionic.views.Scroll like a Javascript version of UIScrollView or any * scroll container in any UI library. You could just use -webkit-overflow-scrolling: touch, @@ -7,7 +8,6 @@ * like UIScrollView, and you don't get events after the finger stops touching the * device (after a flick, for example) * - * iScroll v5.0.5 ~ (c) 2008-2013 Matteo Spinelli ~ http://cubiq.org/license */ (function (window, document, Math, ionic) { 'use strict'; diff --git a/test/scroll_forms.html b/test/scroll_forms.html new file mode 100644 index 0000000000..53ac0bea8b --- /dev/null +++ b/test/scroll_forms.html @@ -0,0 +1,93 @@ + + + + Scroll Forms + + + + + + + +
+
+ Edit +

Scroll Me

+ Delete +
+
+
+
+ + + + + + + + +
+ +
+
+
+ + + + diff --git a/test/scroll_horiz.html b/test/scroll_horiz.html index 14a3a32609..4097762471 100644 --- a/test/scroll_horiz.html +++ b/test/scroll_horiz.html @@ -14,6 +14,11 @@ .list-item { padding: 10px; } + #wrapper { + position: relative; + height: 400px; + overflow: hidden; + } @@ -23,8 +28,10 @@

Scroll Me

Delete -
-
+
+
+
+
@@ -47,7 +54,7 @@ var scroll = new ionic.views.ScrollView({ el: s, isHorizontalEnabled: true, - isVerticalEnabled: false + isVerticalEnabled: true }); diff --git a/test/scroller.html b/test/scroller.html new file mode 100644 index 0000000000..e73de2a8d1 --- /dev/null +++ b/test/scroller.html @@ -0,0 +1,59 @@ + + + + Scroll Horiz + + + + + + + +
+
+ Edit +

Scroll Me

+ Delete +
+
+
+
+
+
+
+ + + +