Merge pull request #110 from FameThemes/development

Fix issue can click to nav link
FameThemes · Jun 2, 2016 · cd37038 · cd37038
2 parents 6a8cabe + 1c5428c
commit cd37038
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 38 deletions.
diff --git a/assets/js/theme.js b/assets/js/theme.js
@@ -1,36 +1,4 @@
-/**
- * Initialise Menu Toggle
- */
-( function() {
-
-    jQuery('#nav-toggle').on('click', function(event){
-        event.preventDefault();
-        jQuery('#nav-toggle').toggleClass('nav-is-visible');
-        jQuery('.main-navigation .onepress-menu').toggleClass("onepress-menu-mobile");
-        jQuery('.header-widget').toggleClass("header-widget-mobile");
-    });
-
-    jQuery('.onepress-menu li.menu-item-has-children, .onepress-menu li.page_item_has_children').each( function() {
-		jQuery(this).prepend('<div class="nav-toggle-subarrow"><i class="fa fa-angle-down"></i></div>');
-	});
-
-    jQuery('.nav-toggle-subarrow, .nav-toggle-subarrow .nav-toggle-subarrow').click(
-        function () {
-            jQuery(this).parent().toggleClass("nav-toggle-dropdown");
-        }
-    );
-
-    // toggle mobile dropdown menu after click menu link
-    jQuery( '.onepress-menu a' ).on( 'click', function ( e ) {
-        e.preventDefault();
-        var $om = jQuery( '.onepress-menu' );
-        if ( ! $om.hasClass( 'onepress-menu-mobile' ) ) {
-            return false;
-        }
-        jQuery( '#nav-toggle' ).trigger( 'click' );
-    } );
 
-} )();
 
 /**
  * skip-link-focus-fix.js
@@ -259,23 +227,46 @@
 
 
 
-
-
 /*
+* Nav Menu & element actions
+*
 * Smooth scroll for navigation and other elements
 */
 ( function() {
 
+    // Initialise Menu Toggle
+    jQuery('#nav-toggle').on('click', function(event){
+        event.preventDefault();
+        jQuery('#nav-toggle').toggleClass('nav-is-visible');
+        jQuery('.main-navigation .onepress-menu').toggleClass("onepress-menu-mobile");
+        jQuery('.header-widget').toggleClass("header-widget-mobile");
+    });
+
+    jQuery('.onepress-menu li.menu-item-has-children, .onepress-menu li.page_item_has_children').each( function() {
+        jQuery(this).prepend('<div class="nav-toggle-subarrow"><i class="fa fa-angle-down"></i></div>');
+    });
+
+    jQuery('.nav-toggle-subarrow, .nav-toggle-subarrow .nav-toggle-subarrow').click(
+        function () {
+            jQuery(this).parent().toggleClass("nav-toggle-dropdown");
+        }
+    );
+
     // Get the header height and wpadminbar height if enable.
+    var h;
     if ( onepress_js_settings.onepress_disable_sticky_header != '1' ) {
-        var h = jQuery('#wpadminbar').height() + jQuery('.site-header').height();
+        h = jQuery('#wpadminbar').height() + jQuery('.site-header').height();
     } else {
-        var h = jQuery('#wpadminbar').height();
+        h = jQuery('#wpadminbar').height();
     }
 
     // Navigation click to section.
     jQuery('.home #site-navigation li a[href*="#"]').on('click', function(event){
         event.preventDefault();
+        // if in mobile mod
+        if (  jQuery( '.onepress-menu' ).hasClass( 'onepress-menu-mobile' ) ) {
+            jQuery( '#nav-toggle' ).trigger( 'click' );
+        }
         smoothScroll(jQuery(this.hash));
     });
 

diff --git a/assets/sass/style.scss b/assets/sass/style.scss
@@ -4,7 +4,7 @@ Theme URI: https://www.famethemes.com/themes/onepress/
 Author: FameThemes
 Author URI: http://www.famethemes.com
 Description: OnePress is an outstanding creative and flexible WordPress one page theme well suited for business website, portfolio, digital agency, product showcase, freelancers and everyone else who appreciate good design. The theme overall is an elegant and classic one, a fine example of Bootstrap 4 WordPress theme which compatibility with latest version of WooCommerce. (Live preview : http://www.famethemes.com/preview/?theme=OnePress)
-Version: 1.2.3
+Version: 1.2.4
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Text Domain: onepress

diff --git a/changelog.md b/changelog.md
@@ -1,6 +1,9 @@
 ====================================================================
 CHANGELOG
 ====================================================================
+## 1.2.4
+* Fix issue can click to nav link.
+
 ## 1.2.3
 * Fix Background image full screen when header transparent.
 * Fix issue No Custom CSS under Theme Options when defined DISALLOW_FILE_EDIT = false.

diff --git a/style.css b/style.css
@@ -4,7 +4,7 @@ Theme URI: https://www.famethemes.com/themes/onepress/
 Author: FameThemes
 Author URI: http://www.famethemes.com
 Description: OnePress is an outstanding creative and flexible WordPress one page theme well suited for business website, portfolio, digital agency, product showcase, freelancers and everyone else who appreciate good design. The theme overall is an elegant and classic one, a fine example of Bootstrap 4 WordPress theme which compatibility with latest version of WooCommerce. (Live preview : http://www.famethemes.com/preview/?theme=OnePress)
-Version: 1.2.3
+Version: 1.2.4
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Text Domain: onepress