diff --git a/install/install_db.php b/install/install_db.php index bb2b77089..f5b82b6eb 100644 --- a/install/install_db.php +++ b/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', diff --git a/js/jquery.fancyalert.js b/js/jquery.fancyalert.js index bac3f721f..eb4cc6bba 100644 --- a/js/jquery.fancyalert.js +++ b/js/jquery.fancyalert.js @@ -18,13 +18,6 @@ function fancyalert(msg) box += ""; $("body").append(box); - - $("html, body").on("touchmove", blockScroll); -} - -function blockScroll(event) -{ - event.preventDefault(); } $(function() { diff --git a/js/shop.mobile.main.js b/js/shop.mobile.main.js index 4a6296623..8d712815d 100644 --- a/js/shop.mobile.main.js +++ b/js/shop.mobile.main.js @@ -257,8 +257,8 @@ break; } }, - threshold: 100, - excludedElements:".noSwipe", + threshold: 70, + excludedElements:"button, input, select, textarea, .noSwipe", allowPageScroll:"vertical" }); } diff --git a/mobile/shop/iteminfo.php b/mobile/shop/iteminfo.php index fab968ea2..ecd49ed15 100644 --- a/mobile/shop/iteminfo.php +++ b/mobile/shop/iteminfo.php @@ -97,7 +97,7 @@ switch($info) { -