Browse Source

Scroll fixes

Nathaniel van Diepen 10 years ago
parent
commit
fdbca38067
5 changed files with 172 additions and 7 deletions
  1. 3 0
      css/style.css
  2. 132 1
      data/pages/index.template
  3. 3 1
      index.php
  4. 23 5
      js/index.js
  5. 11 0
      js/jquery.ui.touch-punch.min.js

+ 3 - 0
css/style.css

@@ -121,6 +121,9 @@ div#loading{
 		min-height: 35px;
 		width: 100%;
 	}
+	.mCSB_container{
+		overflow: auto !important;
+	}
 }
 @media screen and (min-width: 768px){
 	div#topbar{

+ 132 - 1
data/pages/index.template

@@ -1 +1,132 @@
-Welcome to bugs!
+<p>
+	Welcome to bugs!
+</p>
+<p>
+	Welcome to bugs!
+</p>
+<p>
+	Welcome to bugs!
+</p>
+<p>
+	Welcome to bugs!
+</p>
+<p>
+	Welcome to bugs!
+</p>
+<p>
+	Welcome to bugs!
+</p>
+<p>
+	Welcome to bugs!
+</p>
+<p>
+	Welcome to bugs!
+</p>
+<p>
+	Welcome to bugs!
+</p>
+<p>
+	Welcome to bugs!
+</p>
+<p>
+	Welcome to bugs!
+</p>
+<p>
+	Welcome to bugs!
+</p>
+<p>
+	Welcome to bugs!
+</p>
+<p>
+	Welcome to bugs!
+</p>
+<p>
+	Welcome to bugs!
+</p>
+<p>
+	Welcome to bugs!
+</p>
+<p>
+	Welcome to bugs!
+</p>
+<p>
+	Welcome to bugs!
+</p>
+<p>
+	Welcome to bugs!
+</p>
+<p>
+	Welcome to bugs!
+</p>
+<p>
+	Welcome to bugs!
+</p>
+<p>
+	Welcome to bugs!
+</p>
+<p>
+	Welcome to bugs!
+</p>
+<p>
+	Welcome to bugs!
+</p>
+<p>
+	Welcome to bugs!
+</p>
+<p>
+	Welcome to bugs!
+</p>
+<p>
+	Welcome to bugs!
+</p>
+<p>
+	Welcome to bugs!
+</p>
+<p>
+	Welcome to bugs!
+</p>
+<p>
+	Welcome to bugs!
+</p>
+<p>
+	Welcome to bugs!
+</p>
+<p>
+	Welcome to bugs!
+</p>
+<p>
+	Welcome to bugs!
+</p>
+<p>
+	Welcome to bugs!
+</p>
+<p>
+	Welcome to bugs!
+</p>
+<p>
+	Welcome to bugs!
+</p>
+<p>
+	Welcome to bugs!
+</p>
+<p>
+	Welcome to bugs!
+</p>
+<p>
+	Welcome to bugs!
+</p>
+<p>
+	Welcome to bugs!
+</p>
+<p>
+	Welcome to bugs!
+</p>
+<p>
+	Welcome to bugs!
+</p>
+<p>
+	Welcome to bugs!
+</p>
+<p>
+	Welcome to bugs!
+</p>

+ 3 - 1
index.php

@@ -56,11 +56,13 @@
 <!doctype html>
 <html>
 	<head>
-		<meta charset=utf-8> 
+		<meta charset=utf-8>
+		<meta name="viewport" content="width=device-width, user-scalable=false;">
 		<title>Bugs</title>
 		<script src="http://code.jquery.com/jquery-1.10.1.min.js"></script>
 		<script src="http://code.jquery.com/ui/1.10.3/jquery-ui.min.js"></script>
 		<script src="js/handlebars.js"></script>
+		<script src="js/jquery.ui.touch-punch.min.js"></script>
 		<script src="js/jquery.mCustomScrollbar.concat.min.js"></script>
 		<script src="js/jquery.history.js"></script>
 		<script src="js/jquery.cookie.js"></script>

+ 23 - 5
js/index.js

@@ -125,11 +125,10 @@
 				render.links('#topbar');
 			},
 			content: function(t,c){
-				$('#content').html(Handlebars.compile(t)(c)).mCustomScrollbar('destroy');
-				$('#content,.scroll').mCustomScrollbar({
-					theme: 'dark-2',
-					scrollInertia: 0
-				});
+				$('#content').html(
+					Handlebars.compile(t)(c)
+				);
+				render.scroll('#content');
 				render.links('#content');
 			},
 			links: function(selector){
@@ -149,6 +148,24 @@
 						});
 					}
 				});
+			},
+			scroll: function(selector){
+				/*if(!$.support.touch){
+					$(selector).mCustomScrollbar('destroy');
+					$(selector).mCustomScrollbar({
+						theme: 'dark-2',
+						scrollInertia: 0,
+						contentTouchScroll: true,
+						mouseWheel: true,
+						advanced: {
+							updateOnContentResize: true,
+							autoScrollOnFocus: true
+						}
+					});
+				}else{*/
+					$(selector).mCustomScrollbar('destroy');
+					$(selector).css('overflow','auto');
+				// }
 			}
 		};
 	if(exists($.cookie('key'))){
@@ -223,6 +240,7 @@
 			$('#topbar div.topbar-right, #topbar div.topbar-left').css({
 				'display': ''
 			});
+			render.scroll('#content');
 		}
 	});
 	$.fn.serializeObject = function(){

+ 11 - 0
js/jquery.ui.touch-punch.min.js

@@ -0,0 +1,11 @@
+/*
+ * jQuery UI Touch Punch 0.2.2
+ *
+ * Copyright 2011, Dave Furfero
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ *
+ * Depends:
+ *  jquery.ui.widget.js
+ *  jquery.ui.mouse.js
+ */
+(function(b){b.support.touch="ontouchend" in document;if(!b.support.touch){return;}var c=b.ui.mouse.prototype,e=c._mouseInit,a;function d(g,h){if(g.originalEvent.touches.length>1){return;}g.preventDefault();var i=g.originalEvent.changedTouches[0],f=document.createEvent("MouseEvents");f.initMouseEvent(h,true,true,window,1,i.screenX,i.screenY,i.clientX,i.clientY,false,false,false,false,0,null);g.target.dispatchEvent(f);}c._touchStart=function(g){var f=this;if(a||!f._mouseCapture(g.originalEvent.changedTouches[0])){return;}a=true;f._touchMoved=false;d(g,"mouseover");d(g,"mousemove");d(g,"mousedown");};c._touchMove=function(f){if(!a){return;}this._touchMoved=true;d(f,"mousemove");};c._touchEnd=function(f){if(!a){return;}d(f,"mouseup");d(f,"mouseout");if(!this._touchMoved){d(f,"click");}a=false;};c._mouseInit=function(){var f=this;f.element.bind("touchstart",b.proxy(f,"_touchStart")).bind("touchmove",b.proxy(f,"_touchMove")).bind("touchend",b.proxy(f,"_touchEnd"));e.call(f);};})(jQuery);