diff --git a/js/jquery.floatmenu.js b/js/jquery.floatmenu.js index 1c5fb6069..91afe6756 100644 --- a/js/jquery.floatmenu.js +++ b/js/jquery.floatmenu.js @@ -105,7 +105,19 @@ .clearQueue() .stop() .css({ top: element_y+"px", display: "block" }) - .animate({ top: "-="+height }, cfg.duration, function() { $this.data("animated", false); }); + .animate({ top: "-="+height }, cfg.duration, + function() { + $this.data("animated", false); + + scroll_y = $(window).scrollTop(); + w_height = $(window).height(); + var temp_y = scroll_y + w_height - height; + + if( temp_y != element_y) { + $this.css("top", temp_y+"px"); + } + } + ); }, show: function() { diff --git a/js/jquery.slideview.js b/js/jquery.slideview.js index 684d8398c..5b355c373 100644 --- a/js/jquery.slideview.js +++ b/js/jquery.slideview.js @@ -117,6 +117,8 @@ if(check_animated()) return; + $(window).on("touchmove", blockMove); + idx = $slides.index($slides.filter("."+cfg.active_class)); next = (idx + 1) % count; @@ -149,6 +151,8 @@ $tabs.eq((next + 1) % count).addClass("tab_listed").css("left", pos_right+"px"); } + $(window).off("touchmove", blockMove); + $wrap.height(next_height); $tabs.eq(next).addClass(cfg.tab_active); } @@ -166,6 +170,8 @@ if(check_animated()) return; + $(window).on("touchmove", blockMove); + idx = $slides.index($slides.filter("."+cfg.active_class)); next = idx - 1; if(next < 0) @@ -200,6 +206,8 @@ $tabs.eq((next + 1) % count).addClass("tab_listed").css("left", pos_right+"px"); } + $(window).off("touchmove", blockMove); + $wrap.height(next_height); $tabs.eq(next).addClass(cfg.tab_active); } @@ -236,6 +244,11 @@ swipe_left(); } + function blockMove(event) + { + event.preventDefault(); + } + $(window).on("load", function(e) { swipe_init(); }); diff --git a/mobile/shop/iteminfo.php b/mobile/shop/iteminfo.php index 5c27f9f17..38b75c67c 100644 --- a/mobile/shop/iteminfo.php +++ b/mobile/shop/iteminfo.php @@ -66,7 +66,6 @@ function pg_anchor($info) { } ?> -