From b3d971538cfa36527525ce16e11f25c8c77cb0f7 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Fri, 18 Oct 2013 17:33:53 +0900
Subject: [PATCH] =?UTF-8?q?=EB=AA=A8=EB=B0=94=EC=9D=BC=20=EC=83=81?=
 =?UTF-8?q?=ED=92=88=EC=83=81=EC=84=B8=20=ED=95=98=EB=8B=A8=20=ED=94=8C?=
 =?UTF-8?q?=EB=A1=9C=ED=8C=85=20=EB=A9=94=EB=89=B4=20=EC=A0=9C=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 js/jquery.floatmenu.js                    | 14 ++++-
 js/jquery.slideview.js                    | 13 ++++
 mobile/shop/iteminfo.php                  | 12 ----
 mobile/skin/shop/basic/item.form.skin.php | 72 +++++------------------
 4 files changed, 40 insertions(+), 71 deletions(-)

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) {
 }
 ?>
 
-<script src="<?php echo G5_JS_URL; ?>/jquery.touchwipe.min.js"></script>
 <script src="<?php echo G5_JS_URL; ?>/jquery.floatmenu.js"></script>
 
 <div id="info_top_layer">
@@ -111,17 +110,6 @@ $(function() {
         }, timeout);
     });
 
-    $(window).touchwipe({
-        wipeUp: function() {
-            $("#info_top_layer").floatTopMenu("hide");
-        },
-        wipeDown: function() {
-            $("#info_top_layer").floatTopMenu("hide");
-        },
-        min_move_y: 20,
-        preventDefaultEvents: false
-    });
-
     if(navigator.userAgent.toLowerCase().indexOf("android") > -1) {
         $(window).on("resize", function(e) {
             setTimeout(function() {
diff --git a/mobile/skin/shop/basic/item.form.skin.php b/mobile/skin/shop/basic/item.form.skin.php
index 8f1740dad..4c5de62b5 100644
--- a/mobile/skin/shop/basic/item.form.skin.php
+++ b/mobile/skin/shop/basic/item.form.skin.php
@@ -294,6 +294,20 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
     ?>
 </aside>
 
+<?php if ($it['it_use']) { ?>
+<div>
+    <ul id="sit_ov_btn">
+        <?php if (!$it['it_tel_inq']) { ?>
+        <li><input type="submit" onclick="document.pressed=this.value;" value="바로구매" id="sit_btn_buy"></li>
+        <li><input type="submit" onclick="document.pressed=this.value;" value="장바구니" id="sit_btn_cart"></li>
+        <?php } ?>
+
+        <li><a href="javascript:item_wish(document.fitem, '<?php echo $it['it_id']; ?>');" id="sit_btn_wish">위시리스트</a></li>
+        <li><a href="javascript:popup_item_recommend('<?php echo $it['it_id']; ?>');" id="sit_btn_rec">추천하기</a></li>
+    </ul>
+</div>
+<?php } ?>
+
 <?php
 $href = G5_SHOP_URL.'/iteminfo.php?it_id='.$it_id;
 ?>
@@ -308,20 +322,6 @@ $href = G5_SHOP_URL.'/iteminfo.php?it_id='.$it_id;
     </ul>
 </div>
 
-<?php if ($it['it_use']) { ?>
-<div id="form_btn_layer">
-    <ul id="sit_ov_btn">
-        <?php if (!$it['it_tel_inq']) { ?>
-        <li><input type="submit" onclick="document.pressed=this.value;" value="바로구매" id="sit_btn_buy"></li>
-        <li><input type="submit" onclick="document.pressed=this.value;" value="장바구니" id="sit_btn_cart"></li>
-        <?php } ?>
-
-        <li><a href="javascript:item_wish(document.fitem, '<?php echo $it['it_id']; ?>');" id="sit_btn_wish">위시리스트</a></li>
-        <li><a href="javascript:popup_item_recommend('<?php echo $it['it_id']; ?>');" id="sit_btn_rec">추천하기</a></li>
-    </ul>
-</div>
-<?php } ?>
-
 </form>
 
 <script>
@@ -485,53 +485,9 @@ $(function(){
             alert("이전 상품이 없습니다.");
             <?php } ?>
         },
-        wipeUp: function() {
-                    $("#form_btn_layer").floatBottomMenu("hide");
-                  },
-        wipeDown: function() {
-                    $("#form_btn_layer").floatBottomMenu("hide");
-                  },
         min_move_x: 20,
-        min_move_y: 20,
         preventDefaultEvents: false
     });
-
-
-    <?php if ($it['it_use']) { ?>
-    var scroll_timeout = null;
-    var timeout = 200;
-
-    $(window).on("load", function(e) {
-        setTimeout(function() {
-            $("#form_btn_layer").floatBottomMenu();
-        }, timeout);
-    });
-
-    if(navigator.userAgent.toLowerCase().indexOf("android") > -1) {
-        $(window).on("resize", function(e) {
-            setTimeout(function() {
-                $(window).trigger("scroll");
-            }, timeout);
-        });
-    }
-
-    $(window).on("scroll", function(e) {
-        clearTimeout(scroll_timeout);
-        $("#form_btn_layer").floatBottomMenu("hide");
-
-        scroll_timeout = setTimeout(function() {
-            $("#form_btn_layer").floatBottomMenu("show");
-        }, timeout);
-    });
-    <?php } ?>
-
-    // scroll event enable
-    $(window).on("movestart", function(e) {
-        if ((e.distX > e.distY && e.distX < -e.distY) ||
-        (e.distX < e.distY && e.distX > -e.distY)) {
-            e.preventDefault();
-        }
-    });
 });
 
 function load_message()