From 036e3ebd90711535abadabbd8f671f34e5c55927 Mon Sep 17 00:00:00 2001
From: Kin Blas <jblas@adobe.com>
Date: Fri, 3 Dec 2010 09:46:49 -0800
Subject: [PATCH] Sync up the scrollview code with the jquery-mobile mainline.

---
 experiments/scrollview/scrollview-direction.html | 11 +----------
 experiments/scrollview/scrollview-nested.html    |  4 ++--
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/experiments/scrollview/scrollview-direction.html b/experiments/scrollview/scrollview-direction.html
index 2bc0d0a4..db0af59f 100644
--- a/experiments/scrollview/scrollview-direction.html
+++ b/experiments/scrollview/scrollview-direction.html
@@ -593,7 +593,7 @@
       	  <div class="square">y</div>
       </div>
       <h4>Scrollview Paging</h4>
-      <p>A scrollview can be set up so that it scrolls by pages. This feature is only enabled for horizontal or vertical scrollviews.</p>
+      <p>A scrollview can be set up so that it scrolls by pages. This feature is only enabled for horizontal or vertical scrollviews. Use data-scroll=&quot;xp&quot; or data-scroll=&quot;yp&quot; to turn on paging. The following scrollview pages horizontally.</p>
       <div id="ex4" data-scroll="xp" class="threeByThree">
         <div class="square">a</div>
         <div class="square">b</div>
@@ -765,15 +765,6 @@
         <div class="square">x</div>
         <div class="square">y</div>
       </div>
-      <button type="button" onclick="doit();">Foo</button>
-      <script type="text/javascript">
-
-function doit()
-{
-	$("#ex4").scrollview("scrollTo", 300, 300, 500);
-}
-
-      </script>
       <p>Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. <em>Aenean ultricies mi vitae est.</em> Mauris placerat eleifend leo. Quisque sit amet est et sapien ullamcorper pharetra. Vestibulum erat wisi, condimentum sed, <code>commodo vitae</code>, ornare sit amet, wisi. Aenean fermentum, elit eget tincidunt condimentum, eros ipsum rutrum orci, sagittis tempus lacus enim ac dui.Donec non enim in turpis pulvinar facilisis. Ut felis.</p>
       <p>Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. <em>Aenean ultricies mi vitae est.</em> Mauris placerat eleifend leo. Quisque sit amet est et sapien ullamcorper pharetra. Vestibulum erat wisi, condimentum sed, <code>commodo vitae</code>, ornare sit amet, wisi. Aenean fermentum, elit eget tincidunt condimentum, eros ipsum rutrum orci, sagittis tempus lacus enim ac dui.Donec non enim in turpis pulvinar facilisis. Ut felis.</p>
       <p>Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. <em>Aenean ultricies mi vitae est.</em> Mauris placerat eleifend leo. Quisque sit amet est et sapien ullamcorper pharetra. Vestibulum erat wisi, condimentum sed, <code>commodo vitae</code>, ornare sit amet, wisi. Aenean fermentum, elit eget tincidunt condimentum, eros ipsum rutrum orci, sagittis tempus lacus enim ac dui.Donec non enim in turpis pulvinar facilisis. Ut felis.</p>
diff --git a/experiments/scrollview/scrollview-nested.html b/experiments/scrollview/scrollview-nested.html
index d3cea894..465c4177 100644
--- a/experiments/scrollview/scrollview-nested.html
+++ b/experiments/scrollview/scrollview-nested.html
@@ -92,7 +92,7 @@
 <div data-role="page">
 
 	<div data-role="header">
-		<h1>Nested Lists</h1>
+		<h1>Nested Scrollviews</h1>
 	</div><!-- /header -->
 
 	<div data-role="content">
@@ -129,7 +129,7 @@
       	  <div class="square">7</div>
         </div>
       </div>
-      <h4>Example 1</h4>
+      <h4>Example 2</h4>
       <p>In the following example the #4 is actually a nested horizontal scrollview embedded within a horizontal scrollview. The idea here is that if you drag-scroll the nested scrollview, once it reaches either end of its view, it should start scrolling the outer view.</p>
       <div data-scroll="x" class="double-block-view-h">
         <div class="view">