Merge remote-tracking branch 'origin/hotfix/xieweiguang'

@@ -4,8 +4,7 @@
  * @date: 2015/10/14
  * @date: 2015/10/14
  */
  */
 
 
-var $ = require('jquery'),
-    Hammer = require('yoho.hammer');
+var $ = require('jquery');
 
 
 var $nav = $('.category-nav'),
 var $nav = $('.category-nav'),
     $categoryContainer = $('.category-container'),
     $categoryContainer = $('.category-container'),
@@ -15,7 +14,6 @@ var $nav = $('.category-nav'),
 
 
 var $curContent = $contents.not('.hide');
 var $curContent = $contents.not('.hide');
 
 
-var navHammer;
 
 
 //初始化container高度
 //初始化container高度
 (function() {
 (function() {
@@ -39,8 +37,7 @@ $('.category-container').bind('contextmenu', function(e) {
     return false;
     return false;
 });
 });
 
 
-navHammer = new Hammer($nav[0]);
-navHammer.on('tap pressup', function(e) {
+$nav.on('touchend touchcancel', function(e) {
     var $this = $(e.target).closest('li'),
     var $this = $(e.target).closest('li'),
         index = $this.index();
         index = $this.index();
 
 

@@ -5,7 +5,6 @@
  */
  */
 
 
 var $ = require('jquery'),
 var $ = require('jquery'),
-    Hammer = require('yoho.hammer'),
     Swiper = require('yoho.iswiper');
     Swiper = require('yoho.iswiper');
 
 
 var info = require('./info'),
 var info = require('./info'),
@@ -25,7 +24,7 @@ var $infoList = $('#info-list'),
 
 
 var state = {};
 var state = {};
 
 
-var mySwiper, navHammer;
+var mySwiper;
 
 
 if ($loadMoreInfo.length > 0) {
 if ($loadMoreInfo.length > 0) {
     $loading = $loadMoreInfo.children('.loading');
     $loading = $loadMoreInfo.children('.loading');
@@ -59,8 +58,7 @@ info.initInfosEvt($infoList);
 $nav.bind('contextmenu', function(e) {
 $nav.bind('contextmenu', function(e) {
     return false;
     return false;
 });
 });
-navHammer = new Hammer($nav[0]);
-navHammer.on('tap pressup', function(e) {
+$nav.on('touchend touchcancel', function(e) {
 
 
     var $this = $(e.target).closest('.guang-nav-item'),
     var $this = $(e.target).closest('.guang-nav-item'),
         $content,
         $content,

@@ -5,14 +5,13 @@
  */
  */
 
 
 var $ = require('jquery'),
 var $ = require('jquery'),
-    Hammer = require('yoho.hammer'),
     lazyLoad = require('yoho.lazyload'),
     lazyLoad = require('yoho.lazyload'),
     Swiper = require('yoho.iswiper');
     Swiper = require('yoho.iswiper');
 
 
 var $navs = $('#nav-tab > li'),
 var $navs = $('#nav-tab > li'),
     $contents = $('#ps-content > .content');
     $contents = $('#ps-content > .content');
 
 
-var mySwiper, navHammer;
+var mySwiper;
 
 
 lazyLoad($('img.lazy'));
 lazyLoad($('img.lazy'));
 
 
@@ -23,8 +22,7 @@ mySwiper = new Swiper('.swiper-container', {
 $('#nav-tab').bind('contextmenu', function(e) {
 $('#nav-tab').bind('contextmenu', function(e) {
     return false;
     return false;
 });
 });
-navHammer = new Hammer(document.getElementById('nav-tab'));
-navHammer.on('tap pressup', function(e) {
+$('#nav-tab').on('touchend touchcancel', function(e) {
     var $this = $(e.target).closest('li');
     var $this = $(e.target).closest('li');
 
 
     if ($this.hasClass('focus')) {
     if ($this.hasClass('focus')) {

@@ -70,7 +70,6 @@ var $listNav = $('#list-nav'),
     },
     },
     $pre = $listNav.find('.active'), //纪录进入筛选前的active项，初始为选中项
     $pre = $listNav.find('.active'), //纪录进入筛选前的active项，初始为选中项
     searching,
     searching,
-    navHammer,
     btnIntroHammer,
     btnIntroHammer,
     introHammer,
     introHammer,
     brandColHammer;
     brandColHammer;
@@ -285,8 +284,8 @@ writeSearch.bindWirteLocal($('#search-form'));
 $listNav.bind('contextmenu', function(e) {
 $listNav.bind('contextmenu', function(e) {
     return false;
     return false;
 });
 });
-navHammer = new Hammer($listNav[0]);
-navHammer.on('tap pressup', function(e) {
+
+$listNav.on('touchend touchcancel', function(e) {
     var $this = $(e.target).closest('li'),
     var $this = $(e.target).closest('li'),
         nav,
         nav,
         navType,
         navType,

@@ -6,7 +6,6 @@
 
 
 var $ = require('jquery'),
 var $ = require('jquery'),
     Swiper = require('yoho.iswiper'),
     Swiper = require('yoho.iswiper'),
-    Hammer = require('yoho.hammer'),
     lazyLoad = require('yoho.lazyload');
     lazyLoad = require('yoho.lazyload');
 
 
 var swiper;
 var swiper;
@@ -62,7 +61,6 @@ var $listNav = $('#list-nav'),
         }
         }
     },
     },
     $pre = $listNav.find('.active'), //纪录进入筛选前的active项，初始为选中项
     $pre = $listNav.find('.active'), //纪录进入筛选前的active项，初始为选中项
-    navHammer,
     searching;
     searching;
 
 
 require('../suspend-cart'); //悬浮购物车
 require('../suspend-cart'); //悬浮购物车
@@ -266,8 +264,8 @@ lazyLoad($('.lazy'));
 $listNav.bind('contextmenu', function(e) {
 $listNav.bind('contextmenu', function(e) {
     return false;
     return false;
 });
 });
-navHammer = new Hammer($listNav[0]);
-navHammer.on('tap pressup', function(e) {
+
+$listNav.on('touchend touchcancel', function(e) {
     var $this = $(e.target).closest('li'),
     var $this = $(e.target).closest('li'),
         nav,
         nav,
         navType,
         navType,

@@ -6,7 +6,6 @@
 
 
 var $ = require('jquery'),
 var $ = require('jquery'),
     Swiper = require('yoho.iswiper'),
     Swiper = require('yoho.iswiper'),
-    Hammer = require('yoho.hammer'),
     lazyLoad = require('yoho.lazyload');
     lazyLoad = require('yoho.lazyload');
 
 
 var swiper,
 var swiper,
@@ -72,7 +71,6 @@ var $listNav = $('#list-nav'),
         }
         }
     },
     },
     $pre = $listNav.find('.active'), //纪录进入筛选前的active项，初始为选中项
     $pre = $listNav.find('.active'), //纪录进入筛选前的active项，初始为选中项
-    navHammer,
     searching;
     searching;
 
 
 require('../suspend-cart'); //悬浮购物车
 require('../suspend-cart'); //悬浮购物车
@@ -295,8 +293,8 @@ $listNav.bind('contextmenu', function(e) {
 //3.筛选无active时点击展开筛选面板
 //3.筛选无active时点击展开筛选面板
 //4.筛选有active时点击隐藏筛选面板并恢复点击筛选前active项的active状态
 //4.筛选有active时点击隐藏筛选面板并恢复点击筛选前active项的active状态
 //5.当前active为筛选并且点击其他项时，隐藏筛选面板
 //5.当前active为筛选并且点击其他项时，隐藏筛选面板
-navHammer = new Hammer($listNav[0]);
-navHammer.on('tap pressup', function(e) {
+// navHammer = new Hammer($listNav[0]);
+$listNav.on('touchend touchcancel', function(e) {
     var $this = $(e.target).closest('li'),
     var $this = $(e.target).closest('li'),
         nav,
         nav,
         navType,
         navType,
@@ -373,7 +371,7 @@ navHammer.on('tap pressup', function(e) {
             search();
             search();
         }
         }
     }
     }
-    e.srcEvent.stopPropagation();
+    e.stopPropagation();
 });
 });
 
 
 $(window).scroll(function() {
 $(window).scroll(function() {