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

js/jquery.fancylist.js

@@ -18,6 +18,9 @@
         var $element = this.find(cfg.element);
         var $this = this;
 
+        if($element.length < 1)
+            return;
+
         function item_arrange()
         {
             var $el = $element.filter(":first");

js/shop.mobile.main.js

@@ -8,7 +8,8 @@
                 slide_class: "sidx_slide",
                 active_class: "slide_active",
                 tab_active: "tab_active",
-                duration: 500
+                duration: 500,
+                width_increase: 10
             };
 
         if(typeof option == "object")
@@ -33,7 +34,6 @@
         var idx = next = 0;
         var tabw_width = 0;
         var tab_width = 0;
-        var li_left = 0;
         var pos_left = 0;
 
         function tab_make()
@@ -57,6 +57,12 @@
                 $tabs = $tab.find("li");
                 $btns = $tab.find("button");
 
+                $tabs.each(function() {
+                    $(this)
+                        .css("width", $(this).width())
+                        .data("width", $(this).outerWidth());
+                });
+
                 $btns.on("click", function() {
                     tab_click($(this));
                 });
@@ -82,7 +88,7 @@
             $slides.not("."+cfg.active_class).css("left", "-"+width+"px");
 
             if(count == 1) {
-                tab_width = $tabs.eq(0).outerWidth();
+                tab_width = $tabs.eq(0).data("width");
                 pos_left = parseInt((tabw_width - tab_width) / 2);
                 $tabs.eq(0).css("left", pos_left).addClass(cfg.tab_active);
             } else if(count == 2) {
@@ -96,6 +102,8 @@
                 $slides.eq((idx - 1)).css("left", "-"+width+"px");
                 $slides.eq((idx + 1) % count).css("left", width+"px");
             }
+
+            set_tab_width(idx);
         }
 
         function swipe_left()
@@ -126,6 +134,8 @@
                 $tabs.eq(next).addClass(cfg.tab_active);
             }
 
+            set_tab_width(next);
+
             $slides.eq(idx).clearQueue().animate(
                 { left: "-="+width }, cfg.duration,
                 function() {
@@ -174,6 +184,8 @@
                 $tabs.eq(next).addClass(cfg.tab_active);
             }
 
+            set_tab_width(next);
+
             $slides.eq(idx).clearQueue().animate(
                 { left: "+="+width }, cfg.duration,
                 function() {
@@ -192,6 +204,15 @@
             $slides.eq(next).addClass(cfg.active_class);
         }
 
+        function set_tab_width(idx)
+        {
+            $tabs.each(function() {
+                $(this).css("width", $(this).data("width"));
+            });
+
+            $tabs.eq(idx).css("width", "+="+cfg.width_increase);
+        }
+
         function tab_position(idx)
         {
             $tabs.removeClass(cfg.tab_actie+" tab_listed tab_left").css("left", "-"+tabw_width+"px");
@@ -199,8 +220,8 @@
             var $tab_l = $tabs.eq(idx - 1);
             var $tab_c = $tabs.eq(idx);
             var $tab_r = $tabs.eq((idx + 1) % count);
-            var w_c = $tab_c.outerWidth();
+            var w_c = $tab_c.data("width");
-            var w_r = $tab_r.outerWidth();
+            var w_r = $tab_r.data("width");
 
             var pl = 0;
             var pc = parseInt((tabw_width - w_c) / 2);
@@ -233,15 +254,10 @@
                 swipe_left();
         }
 
-        $(window).on("load", function(e) {
+        $(window).on("load resize", function(e) {
             swipe_init();
         });
 
-        $(window).on("resize", function(e) {
-            swipe_init();
-        });
-
-
         // swipe event
         this.swipe({
             swipe: function(event, direction, duration, fingerCount) {

mobile/skin/shop/basic/item.form.skin.php

@@ -361,14 +361,14 @@ $(function(){
             switch(direction) {
                 case "left":
                     <?php if($next_href) { ?>
-                    content_slide(direction);
+                    content_swipe(direction);
                     <?php } else { ?>
                     fancyalert("다음 상품이 없습니다.");
                     <?php } ?>
                     break;
                 case "right":
                     <?php if($prev_href) { ?>
-                    content_slide(direction);
+                    content_swipe(direction);
                     <?php } else { ?>
                     fancyalert("이전 상품이 없습니다.");
                     <?php } ?>
@@ -385,61 +385,26 @@ $(function(){
     $("#container").swipe(swipeOptions);
 });
 
-function content_slide(direction)
+function content_swipe(direction)
 {
     // 로딩 레이어
     load_message();
 
+    var next_href = '<?php echo $next_href; ?>';
+    var prev_href = '<?php echo $prev_href; ?>';
+    var str;
+
+    if(direction == "left") {
+        str = next_href;
+    } else {
+        str = prev_href;
+    }
+
+    var href = str.match(/https?:\/{2}[^\"]+/gi);
+
     setTimeout(function() {
-        var content = $("#container").clone()
+        document.location.href = href[0];
-                        .find("#form_btn_layer").remove()
+    }, 500);
-                        .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";
-        }
-
-        $("#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()