From 0816607c427b8596d004554865018db459c67a77 Mon Sep 17 00:00:00 2001 From: chicpro Date: Tue, 22 Oct 2013 17:22:01 +0900 Subject: [PATCH 1/4] =?UTF-8?q?=EB=AA=A8=EB=B0=94=EC=9D=BC=20=EC=87=BC?= =?UTF-8?q?=ED=95=91=EB=AA=B0=EC=97=90=EC=84=9C=20swipe=EC=8B=9C=20?= =?UTF-8?q?=EC=A0=9C=EC=99=B8=ED=95=A0=20=ED=83=9C=EA=B7=B8=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- js/shop.mobile.main.js | 2 +- mobile/skin/shop/basic/item.form.skin.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/js/shop.mobile.main.js b/js/shop.mobile.main.js index 4a6296623..2a80e8904 100644 --- a/js/shop.mobile.main.js +++ b/js/shop.mobile.main.js @@ -258,7 +258,7 @@ } }, threshold: 100, - excludedElements:".noSwipe", + excludedElements:"button, input, select, textarea, .noSwipe", allowPageScroll:"vertical" }); } diff --git a/mobile/skin/shop/basic/item.form.skin.php b/mobile/skin/shop/basic/item.form.skin.php index 0c0867d82..8c803b282 100644 --- a/mobile/skin/shop/basic/item.form.skin.php +++ b/mobile/skin/shop/basic/item.form.skin.php @@ -378,7 +378,7 @@ $(function(){ return false; }, threshold: 100, - excludedElements:".noSwipe", + excludedElements:"button, input, select, textarea, .noSwipe", allowPageScroll:"vertical" }; From 6a836231708022a476f1a41f4880d7ac3b75c67f Mon Sep 17 00:00:00 2001 From: gnuboard Date: Tue, 22 Oct 2013 18:12:36 +0900 Subject: [PATCH 2/4] =?UTF-8?q?=EC=84=A4=EC=B9=98=EC=8B=9C=20=ED=99=98?= =?UTF-8?q?=EA=B2=BD=EC=84=A4=EC=A0=95=EC=9D=98=20=EA=B4=80=EB=A6=AC?= =?UTF-8?q?=EC=9E=90=20=EB=A9=94=EC=9D=BC=20=EC=A3=BC=EC=86=8C=EC=97=90=20?= =?UTF-8?q?=EA=B0=92=EC=9D=84=20=EB=84=A3=EC=96=B4=EC=A4=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- install/install_db.php | 1 + 1 file changed, 1 insertion(+) diff --git a/install/install_db.php b/install/install_db.php index cbea3c476..c10009d41 100644 --- a/install/install_db.php +++ b/install/install_db.php @@ -73,6 +73,7 @@ $download_point = 0; $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', From a1d4303d09434724cf4dedbbbc4ee357190fd579 Mon Sep 17 00:00:00 2001 From: chicpro Date: Tue, 22 Oct 2013 18:27:29 +0900 Subject: [PATCH 3/4] =?UTF-8?q?alert=20layer=EA=B0=80=20=EC=9E=88=EC=9D=84?= =?UTF-8?q?=20=EB=95=8C=EB=8F=84=20touchmove=20=EC=9D=B4=EB=B2=A4=ED=8A=B8?= =?UTF-8?q?=20=EB=90=98=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- js/jquery.fancyalert.js | 7 ------- 1 file changed, 7 deletions(-) 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() { From c63f4f6ecd2c153373d0c18d9db7105f70b92f47 Mon Sep 17 00:00:00 2001 From: chicpro Date: Wed, 23 Oct 2013 09:38:50 +0900 Subject: [PATCH 4/4] =?UTF-8?q?=EC=83=81=ED=92=88=EC=83=81=EC=84=B8=20?= =?UTF-8?q?=EC=8A=AC=EB=9D=BC=EC=9D=B4=EB=93=9C=20=EB=B0=98=EC=9D=91?= =?UTF-8?q?=EC=84=B1=20=EA=B0=9C=EC=84=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- js/shop.mobile.main.js | 2 +- mobile/shop/iteminfo.php | 2 +- mobile/skin/shop/basic/item.form.skin.php | 98 ++++++++++++----------- 3 files changed, 52 insertions(+), 50 deletions(-) diff --git a/js/shop.mobile.main.js b/js/shop.mobile.main.js index 2a80e8904..8d712815d 100644 --- a/js/shop.mobile.main.js +++ b/js/shop.mobile.main.js @@ -257,7 +257,7 @@ break; } }, - threshold: 100, + 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) { -