firstgarden/firstgarden-web-gnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

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

Browse Source
This commit is contained in:
whitedot
2013-10-23 09:40:07 +09:00
parent a0ea103fd1 c63f4f6ecd
commit 6aeca6bfff
5 changed files with 55 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
install/install_db.php
View File

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

7
js/jquery.fancyalert.js
View File

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

4
js/shop.mobile.main.js
View File

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

2
mobile/shop/iteminfo.php
View File

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

12
mobile/skin/shop/basic/item.form.skin.php
View File

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