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`
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',

7
js/jquery.fancyalert.js
View File

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

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

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

2
mobile/shop/iteminfo.php
View File

@ -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>

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

@ -377,8 +377,8 @@ $(function(){
return false;
},
threshold: 100,
excludedElements:".noSwipe",
threshold: 70,
excludedElements:"button, input, select, textarea, .noSwipe",
allowPageScroll:"vertical"
};
@ -387,57 +387,59 @@ $(function(){
function content_slide(direction)
{
var content = $("#container").clone()
.find("#form_btn_layer").remove()
.end().find(".sit_pvi_btn").remove()
.end().html();
var pos = $("#container").position();
var width = $("#container").width();
var height = $("#container").height();
var pad_top = $("#container").css("padding-top");
var next_href = '<?php echo $next_href; ?>';
var prev_href = '<?php echo $prev_href; ?>';
var str, left_value;
var duration = 500;
if(direction == "left") {
str = next_href;
left_value = "-="+width+"px";
} else {
str = prev_href;
left_value = "+="+width+"px";
}
// 로딩 레이어
load_message();
$("#container")
.css({
width: width+"px",
height: height+"px"
})
.before("<div id=\"container_clone\">"+content+"</div>")
.find("*:visible").hide();
setTimeout(function() {
var content = $("#container").clone()
.find("#form_btn_layer").remove()
.end().find(".sit_pvi_btn").remove()
.end().html();
var pos = $("#container").position();
var width = $("#container").width();
var height = $("#container").height();
var pad_top = $("#container").css("padding-top");
var next_href = '<?php echo $next_href; ?>';
var prev_href = '<?php echo $prev_href; ?>';
var str, left_value;
var duration = 500;
$("#container_clone")
.css({
display: "block",
width: width+"px",
height: height+"px",
position: "absolute",
top: pos.top+"px",
left: pos.left+"px",
zIndex: "1000",
paddingTop: pad_top
})
.animate(
{ left: left_value }, duration,
function() {
$("#container_clone").remove();
var href = str.match(/https?:\/{2}[^\"]+/gi);
document.location.href = href[0];
}
);
if(direction == "left") {
str = next_href;
left_value = "-="+width+"px";
} else {
str = prev_href;
left_value = "+="+width+"px";
}
$("#container")
.css({
width: width+"px",
height: height+"px"
})
.before("<div id=\"container_clone\">"+content+"</div>")
.find("*:visible").hide();
$("#container_clone")
.css({
display: "block",
width: width+"px",
height: height+"px",
position: "absolute",
top: pos.top+"px",
left: pos.left+"px",
zIndex: "1000",
paddingTop: pad_top
})
.animate(
{ left: left_value }, duration,
function() {
$("#container_clone").remove();
var href = str.match(/https?:\/{2}[^\"]+/gi);
document.location.href = href[0];
}
);
}, 100);
}
function load_message()