Merge branch 'release/1.2.2'

siteorigin · May 26, 2016 · cbf5f4c · cbf5f4c
2 parents 1c8800f + d2b8be7
commit cbf5f4c
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 18 deletions.
diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,8 @@
+= 1.2.2 - May 26 2016 =
+* Fixed warning message in customizer.
+* Removed duplicate is mobile body class.
+* Improved main menu touch device compatibility.
+
 = 1.2.1 - May 24 2016 =
 * Updated settings framework.
 * Added about page.

diff --git a/inc/extras.php b/inc/extras.php
@@ -51,10 +51,6 @@ function siteorigin_north_body_classes( $classes ) {
 		$classes[] = 'sticky-menu';
 	}
 
-	if( wp_is_mobile() ) {
-		$classes[] = 'is_mobile';
-	}
-
 	return $classes;
 }
 endif;

diff --git a/inc/settings b/inc/settings
diff --git a/js/north.js b/js/north.js
@@ -62,31 +62,33 @@ jQuery( function ( $ ) {
 		$( '.entry-content' ).fitVids();
 	}
 
-	// Remove the no-touch body class for touch devices
-	var isTouchDevice = 'ontouchstart' in document.documentElement;
-	if( isTouchDevice ) {
+	// This this is a touch device. We detect this through ontouchstart, msMaxTouchPoints and MaxTouchPoints.
+	if( 'ontouchstart' in document.documentElement || window.navigator.msMaxTouchPoints || window.navigator.MaxTouchPoints ) {
 		$('body').removeClass('no-touch');
 	}
 	if ( !$( 'body' ).hasClass( 'no-touch' ) ) {
-		$('.main-navigation #primary-menu').find('.menu-item-has-children > a').each( function() {
+		if ( /iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream ) {
+			$( 'body' ).css( 'cursor', 'pointer' );
+		}
+		$( '.main-navigation #primary-menu').find('.menu-item-has-children > a' ).each( function() {
 			$( this ).click( function(e){
 				var link = $(this);
 				e.stopPropagation();
-				link.parent().addClass('touch-drop');
+				link.parent().addClass( 'touch-drop' );
 
-				if( link.hasClass('hover') ) {
-					link.unbind('click');
+				if( link.hasClass( 'hover' ) ) {
+					link.unbind( 'click' );
 				} else {
-					link.addClass('hover');
+					link.addClass( 'hover' );
 					e.preventDefault();
 				}
 
-				$('.main-navigation #primary-menu > .menu-item-has-children:not(.touch-drop) > a').click( function() {
+				$( '.main-navigation #primary-menu > .menu-item-has-children:not(.touch-drop) > a' ).click( function() {
 					link.removeClass('hover').parent().removeClass('touch-drop');
 				} );
 
-				$(document).click( function() {
-					link.removeClass('hover').parent().removeClass('touch-drop');
+				$( document ).click( function() {
+					link.removeClass( 'hover' ).parent().removeClass( 'touch-drop' );
 				} );
 
 			} );

diff --git a/woocommerce/cart/cart.php b/woocommerce/cart/cart.php
@@ -134,8 +134,7 @@
 
 								<label for="coupon_code"><?php _e( 'Coupon', 'siteorigin-north' ); ?>:</label>
 								<input type="text" name="coupon_code" class="input-text" id="coupon_code" value="" placeholder="<?php esc_attr_e( 'Coupon code', 'siteorigin-north' ); ?>" />
-								<button type="submit" class="button" name="apply_coupon"><?php esc_attr_e( 'Apply Coupon', 'siteorigin-north' ); ?></button>
-
+								<input type="submit" class="button" name="apply_coupon"  value="<?php esc_attr_e( 'Apply Coupon', 'siteorigin-north' ); ?>">
 								<?php do_action( 'woocommerce_cart_coupon' ); ?>
 							</div>
 						<?php } ?>