Merge branch 'master' of github.com:gnuboard/yc4s

install/install_db.php

@@ -96,6 +96,7 @@ if($g5_install || !$result) {
     $sql = " insert into `{$table_prefix}config`
                 set cf_title = '".G5_VERSION."',
                     cf_admin = '$admin_id',
+                    cf_admin_email = '$admin_email',
                     cf_use_point = '1',
                     cf_use_norobot = '1',
                     cf_use_copy_log = '1',

js/jquery.fancyalert.js

@@ -18,13 +18,6 @@ function fancyalert(msg)
     box += "</div>";
 
     $("body").append(box);
-
-    $("html, body").on("touchmove", blockScroll);
-}
-
-function blockScroll(event)
-{
-    event.preventDefault();
 }
 
 $(function() {

js/shop.mobile.main.js

@@ -257,8 +257,8 @@
                         break;
                 }
             },
-            threshold: 100,
-            excludedElements:".noSwipe",
+            threshold: 70,
+            excludedElements:"button, input, select, textarea, .noSwipe",
             allowPageScroll:"vertical"
         });
     }

mobile/shop/iteminfo.php

@@ -97,7 +97,7 @@ switch($info) {
 <div id="menu_button" class="menu_hidden">
     <button type="button">메뉴열기</button>
 </div>
-<div id="menu_list" class="menu_hidden">
+<div id="menu_list">
     <?php echo pg_anchor($info); ?>
 </div>
 

mobile/skin/shop/basic/item.form.skin.php

@@ -377,8 +377,8 @@ $(function(){
 
             return false;
         },
-        threshold: 100,
-        excludedElements:".noSwipe",
+        threshold: 70,
+        excludedElements:"button, input, select, textarea, .noSwipe",
         allowPageScroll:"vertical"
     };
 
@@ -387,6 +387,10 @@ $(function(){
 
 function content_slide(direction)
 {
+    // 로딩 레이어
+    load_message();
+
+    setTimeout(function() {
         var content = $("#container").clone()
                         .find("#form_btn_layer").remove()
                         .end().find(".sit_pvi_btn").remove()
@@ -408,9 +412,6 @@ function content_slide(direction)
             left_value = "+="+width+"px";
         }
 
-    // 로딩 레이어
-    load_message();
-
         $("#container")
             .css({
                 width: width+"px",
@@ -438,6 +439,7 @@ function content_slide(direction)
                     document.location.href = href[0];
                 }
             );
+    }, 100);
 }
 
 function load_message()