Merge branch 'hotfix/yohocoinuse' into develop
Conflicts: static/js/cart/order-ensure.js
Showing
1 changed file
with
6 additions
and
4 deletions
@@ -79,14 +79,14 @@ $('.checkbox').on('touchstart', function() { | @@ -79,14 +79,14 @@ $('.checkbox').on('touchstart', function() { | ||
79 | } | 79 | } |
80 | }); | 80 | }); |
81 | 81 | ||
82 | -$('.invoice').on('touchend', '.checkbox', function() { | 82 | +$invoice.on('touchend', '.checkbox', function() { |
83 | var $this = $(this); | 83 | var $this = $(this); |
84 | 84 | ||
85 | if ($this.hasClass('icon-cb-checked')) { | 85 | if ($this.hasClass('icon-cb-checked')) { |
86 | - $('.invoice').addClass('focus'); | 86 | + $invoice.addClass('focus'); |
87 | } | 87 | } |
88 | if ($this.hasClass('icon-checkbox')) { | 88 | if ($this.hasClass('icon-checkbox')) { |
89 | - $('.invoice').removeClass('focus'); | 89 | + $invoice.removeClass('focus'); |
90 | } | 90 | } |
91 | return false; | 91 | return false; |
92 | }); | 92 | }); |
@@ -243,10 +243,12 @@ $('.coin').on('touchend', function() { | @@ -243,10 +243,12 @@ $('.coin').on('touchend', function() { | ||
243 | orderCompute(); | 243 | orderCompute(); |
244 | }); | 244 | }); |
245 | 245 | ||
246 | -$invoice.on('touchend', function() { | 246 | +$invoice.on('touchend', function(e) { |
247 | var $this = $(this); | 247 | var $this = $(this); |
248 | 248 | ||
249 | orderInfo('invoice', $this.find('.checkbox').hasClass('icon-cb-checked')); | 249 | orderInfo('invoice', $this.find('.checkbox').hasClass('icon-cb-checked')); |
250 | + e.preventDefault(); | ||
251 | + e.stopPropagation(); | ||
250 | }); | 252 | }); |
251 | 253 | ||
252 | $invoice.find('[name="invoice-title"]').on('blur', function() { | 254 | $invoice.find('[name="invoice-title"]').on('blur', function() { |
-
Please register or login to post a comment