diff --git a/css/default.css b/css/default.css
index d47a49703..254dd2fce 100644
--- a/css/default.css
+++ b/css/default.css
@@ -138,7 +138,7 @@ fieldset .btn_submit {height:22px;font-size:1em}
.btn_cancel {display:inline-block;padding:0 10px;height:22px;border:1px solid #ccc;background:#fafafa;line-height:2em}
button.btn_cancel {display:inline-block;padding:0 10px;height:24px;border:1px solid #ccc;background:#fafafa;line-height:2em}
.btn_cancel:focus, .btn_cancel:hover {text-decoration:none !important}
-.btn_frmline {display:inline-block;padding:0 7px 0 5px;height:22px;border:0;background:#333;color:#fff;letter-spacing:-0.1em;text-decoration:none;vertical-align:top;line-height:2em} /* 우편번호검색버튼 등 */
+a.btn_frmline, button.btn_frmline {display:inline-block;padding:0 7px 0 5px;height:22px;border:0;background:#333;color:#fff;letter-spacing:-0.1em;text-decoration:none;vertical-align:top;line-height:2em} /* 우편번호검색버튼 등 */
button.btn_frmline {font-size:1em}
.btn_win {clear:both;margin-bottom:20px;text-align:center} /* 새창용 */
.btn_win button {display:inline-block;padding:0 10px;height:30px;border:0;background:#666;color:#fff;vertical-align:top;line-height:2em;cursor:pointer}
diff --git a/js/iteminfoimageresize.js b/js/iteminfoimageresize.js
new file mode 100644
index 000000000..4d15c89ec
--- /dev/null
+++ b/js/iteminfoimageresize.js
@@ -0,0 +1,44 @@
+(function($) {
+ $.fn.iteminfoimageresize = function(selector)
+ {
+ var cfg = {
+ selector: "img"
+ };
+
+ if(typeof selector == "object") {
+ cfg = $.extend(cfg, selector);
+ } else {
+ if(selector) {
+ cfg = $.extend({ selector: selector });
+ }
+ }
+
+ var $img = this.find(cfg.selector);
+ var $this = this;
+
+ function image_resize()
+ {
+ var width = $this.width();
+
+ $img.each(function() {
+ $(this).removeAttr("width")
+ .removeAttr("height")
+ .css("width","")
+ .css("height", "");
+
+ if($(this).data("width") == undefined)
+ $(this).data("width", $(this).width());
+
+ if($(this).data("width") > width) {
+ $(this).css("width", "100%");
+ }
+ });
+ }
+
+ $(window).on("resize", function() {
+ image_resize();
+ });
+
+ image_resize();
+ }
+}(jQuery));
\ No newline at end of file
diff --git a/js/jquery.floatmenu.js b/js/jquery.floatmenu.js
index f87dad53e..df60c4eb9 100644
--- a/js/jquery.floatmenu.js
+++ b/js/jquery.floatmenu.js
@@ -52,10 +52,10 @@
{
hide_menu();
- origin_y = $("body").scrollTop();
+ origin_y = $(window).scrollTop();
timeout = setTimeout(function() {
- scroll_y = $("body").scrollTop();
+ scroll_y = $(window).scrollTop();
if(origin_y == scroll_y) {
$menu.css("top", (scroll_y - height)+"px").css("display", "block");
@@ -87,10 +87,10 @@
interval_count++;
}
- origin_y = $("body").scrollTop();
+ origin_y = $(window).scrollTop();
timeout = setTimeout(function() {
- scroll_y = $("body").scrollTop();
+ scroll_y = $(window).scrollTop();
if(origin_y == scroll_y) {
element_y = parseInt($menu.css("top"));
@@ -164,7 +164,7 @@
hide_menu();
timeout = setTimeout(function() {
- scroll_y = $("body").scrollTop();
+ scroll_y = $(window).scrollTop();
w_height = $(window).height();
element_y = scroll_y + w_height;
$menu.css("top", element_y+"px").css("display", "block");
@@ -176,10 +176,10 @@
{
hide_menu();
- origin_y = $("body").scrollTop();
+ origin_y = $(window).scrollTop();
timeout = setTimeout(function() {
- scroll_y = $("body").scrollTop();
+ scroll_y = $(window).scrollTop();
if(origin_y == scroll_y) {
w_height = $(window).height();
@@ -222,10 +222,10 @@
interval_count++;
}
- origin_y = $("body").scrollTop();
+ origin_y = $(window).scrollTop();
timeout = setTimeout(function() {
- scroll_y = $("body").scrollTop();
+ scroll_y = $(window).scrollTop();
if(origin_y == scroll_y) {
w_height = $(window).height();
diff --git a/js/viewimageresize.js b/js/viewimageresize.js
index 40e436143..7893ae45c 100644
--- a/js/viewimageresize.js
+++ b/js/viewimageresize.js
@@ -14,10 +14,12 @@
}
var $img = this.find(cfg.selector);
- var width = this.width();
+ var $this = this;
function image_resize()
{
+ var width = $this.width();
+
$img.each(function() {
$(this).removeAttr("width")
.removeAttr("height")
diff --git a/lib/common.lib.php b/lib/common.lib.php
index 116182e45..747e8580b 100644
--- a/lib/common.lib.php
+++ b/lib/common.lib.php
@@ -1879,7 +1879,12 @@ function convert_charset($from_charset, $to_charset, $str)
function escape_trim($field)
{
if ($field) {
- return mysql_real_escape_string(@trim($field));
+ $str = mysql_real_escape_string(@trim($field));
+
+ if(PHP_VERSION < '5.3.0')
+ $str = stripslashes($str);
+
+ return $str;
}
}
diff --git a/mobile/skin/shop/basic/itemqa.skin.php b/mobile/skin/shop/basic/itemqa.skin.php
index a4f8859a4..c48fbe95d 100644
--- a/mobile/skin/shop/basic/itemqa.skin.php
+++ b/mobile/skin/shop/basic/itemqa.skin.php
@@ -3,6 +3,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
?>
+
@@ -110,7 +111,12 @@ $(function(){
$con.slideUp();
} else {
$(".sit_qa_con:visible").hide();
- $con.slideDown();
+ $con.slideDown(
+ function() {
+ // 이미지 리사이즈
+ $con.iteminfoimageresize();
+ }
+ );
}
});
diff --git a/mobile/skin/shop/basic/itemqalist.skin.php b/mobile/skin/shop/basic/itemqalist.skin.php
index 824f23d1d..37d87b827 100644
--- a/mobile/skin/shop/basic/itemqalist.skin.php
+++ b/mobile/skin/shop/basic/itemqalist.skin.php
@@ -3,6 +3,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
?>
+