Bug fix for input controls (bug with iscroll.js)

toddwprice · May 8, 2012 · 2625170 · 2625170
1 parent 2acaed4
commit 2625170
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/css/core.css b/css/core.css
@@ -371,10 +371,9 @@ div.overlay div.content div.simple-title {
 div.jsTouch div.content input {
 	border: 0px;
 	width: 100%;
-	font-size: 18px;
+	font-size: 20px;
 	margin: 0px;
-	padding-left: 0px; 
-	padding-right: 0px;
+	padding: 6px 0px 0px 0px !important; 
 	-webkit-appearance: none !important;
 	-webkit-tap-highlight-color: rgba(0,0,0,0) !important;
 	color: black;

diff --git a/includes/iscroll.js b/includes/iscroll.js
@@ -3,7 +3,7 @@
  * Released under MIT license, http://cubiq.org/license
  */
 
-(function() {
+(function(){
 var m = Math,
 	vendor = (/webkit/i).test(navigator.appVersion) ? 'webkit' :
 		(/firefox/i).test(navigator.userAgent) ? 'Moz' :
@@ -90,7 +90,9 @@ var m = Math,
 
 			// Events
 			onRefresh: null,
-			onBeforeScrollStart: function (e) { e.preventDefault(); },
+			onBeforeScrollStart: function (e) { 
+				if (e.target && e.target.tagName != 'INPUT' && e.target.tagName != 'TEXTAREA') e.preventDefault(); 
+			},
 			onScrollStart: null,
 			onBeforeScrollMove: null,
 			onScrollMove: null,

diff --git a/index.html b/index.html
@@ -1 +1 @@
-<!DOCTYPE html> <html manifest="manifest.php"><head>	<title>Web 2.0 Touch</title>	<meta name="viewport" content="initial-scale=1.0; maximum-scale=1.0; user-scalable=no; width=device-width;" />	<meta name="apple-mobile-web-app-capable" content="yes" />	<meta name="apple-mobile-web-app-status-bar-style" content="black" />	<link rel="apple-touch-startup-image" href="images/iphone_startup.png" />	<link rel="apple-touch-icon" href="images/iphone_icon.png" />	<link id="coreCSS" type="text/css" rel="stylesheet" media="screen" href="css/core.css">	<link id="mainCSS" type="text/css" rel="stylesheet" media="screen" href="css/ipad-dark.css">	<script type="text/javascript" src="includes/jquery.js"></script>	<script type="text/javascript" src="includes/jsTouch.js"></script>	<script type="text/javascript" src="includes/iscroll.js"></script>	<script type="text/javascript" src="index.js"></script></head><body style="background-image: url(images/iphone_startup.png) no-repeat;"></body></html>
+<!DOCTYPE html><html manifest="manifest.php"><head>	<title>Web 2.0 Touch</title>	<meta name="viewport" content="initial-scale=1.0; maximum-scale=1.0; user-scalable=no; width=device-width;" />	<meta name="apple-mobile-web-app-capable" content="yes" />	<meta name="apple-mobile-web-app-status-bar-style" content="black" />		<link rel="apple-touch-startup-image" href="images/iphone_startup.png" />	<link rel="apple-touch-icon" href="images/iphone_icon.png" />	<link id="coreCSS" type="text/css" rel="stylesheet" media="screen" href="css/core.css">	<link id="mainCSS" type="text/css" rel="stylesheet" media="screen" href="css/ipad-dark.css">		<script type="text/javascript" src="includes/jquery.js"></script>	<script type="text/javascript" src="includes/jsTouch.js"></script>	<script type="text/javascript" src="includes/iscroll.js"></script>	<script type="text/javascript" src="index.js"></script></head><body style="background-image: url(images/iphone_startup.png) no-repeat;"></body></html>

diff --git a/pages/home.html b/pages/home.html
@@ -14,11 +14,11 @@ <h2> Main Menu </h2>
 				<img src="images/tabs/phone.png" class="icon greenbox"> Lists <span class="arrow"></span>
 			</a>
 		</li>
-		<!--li>
+		<li>
 			<a onclick="jsTouch.loadPage('pages/forms.html', { transition: 'slide-left' });">
 				<img src="images/tabs/search.png" class="icon greenbox"> Form Controls<span class="arrow"></span>
 			</a>
-		</li-->
+		</li>
 		<li>
 			<a onclick="jsTouch.loadPage('pages/buttons.html', { transition: 'slide-left' });">
 				<img src="images/tabs/tag.png" class="icon greenbox"> Buttons <span class="arrow"></span>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<!DOCTYPE html> <html manifest="manifest.php"><head> <title>Web 2.0 Touch</title> <meta name="viewport" content="initial-scale=1.0; maximum-scale=1.0; user-scalable=no; width=device-width;" /> <meta name="apple-mobile-web-app-capable" content="yes" /> <meta name="apple-mobile-web-app-status-bar-style" content="black" /> <link rel="apple-touch-startup-image" href="images/iphone_startup.png" /> <link rel="apple-touch-icon" href="images/iphone_icon.png" /> <link id="coreCSS" type="text/css" rel="stylesheet" media="screen" href="css/core.css"> <link id="mainCSS" type="text/css" rel="stylesheet" media="screen" href="css/ipad-dark.css"> <script type="text/javascript" src="includes/jquery.js"></script> <script type="text/javascript" src="includes/jsTouch.js"></script> <script type="text/javascript" src="includes/iscroll.js"></script> <script type="text/javascript" src="index.js"></script></head><body style="background-image: url(images/iphone_startup.png) no-repeat;"></body></html>
		<!DOCTYPE html><html manifest="manifest.php"><head> <title>Web 2.0 Touch</title> <meta name="viewport" content="initial-scale=1.0; maximum-scale=1.0; user-scalable=no; width=device-width;" /> <meta name="apple-mobile-web-app-capable" content="yes" /> <meta name="apple-mobile-web-app-status-bar-style" content="black" /> <link rel="apple-touch-startup-image" href="images/iphone_startup.png" /> <link rel="apple-touch-icon" href="images/iphone_icon.png" /> <link id="coreCSS" type="text/css" rel="stylesheet" media="screen" href="css/core.css"> <link id="mainCSS" type="text/css" rel="stylesheet" media="screen" href="css/ipad-dark.css"> <script type="text/javascript" src="includes/jquery.js"></script> <script type="text/javascript" src="includes/jsTouch.js"></script> <script type="text/javascript" src="includes/iscroll.js"></script> <script type="text/javascript" src="index.js"></script></head><body style="background-image: url(images/iphone_startup.png) no-repeat;"></body></html>
Expand Down