Skip to content

Commit

Permalink
Revert "Revert "Updated translation file and version bump""
Browse files Browse the repository at this point in the history
This reverts commit 00d982d.
  • Loading branch information
FrankM1 committed Dec 2, 2020
1 parent dae51b0 commit 1fc574a
Show file tree
Hide file tree
Showing 7 changed files with 349 additions and 254 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
v1.0.12
- Fixed broken mobile menu
- Updated translation file

v1.0.11
- Improved blog styling
- Correct title tags in related posts
Expand Down
2 changes: 1 addition & 1 deletion assets/frontend/css/analytica-site-header-rtl.min.css

Large diffs are not rendered by default.

129 changes: 66 additions & 63 deletions assets/frontend/js/analytica-navigation.js
Original file line number Diff line number Diff line change
@@ -1,63 +1,66 @@
( function() {

var self = this;

this.events = function() {

// Add parent class to items with sub-menus
jQuery( 'ul.sub-menu' ).parent().addClass( 'parent' );

var mobilemenu_instance = jQuery( '.nav-horizontal' ).data( 'dlmenu' );

if ( window.matchMedia( 'screen and (max-width: 1024px)' ).matches ) {

if ( ! mobilemenu_instance ) {
jQuery( '.nav-horizontal' ).dlmenu();
}

} else {

// action for screen widths below 768 pixels
if ( mobilemenu_instance ) {
jQuery( '.nav-horizontal' ).dlmenu( 'destroy' ); // kill it
}

// Enable hover dropdowns for window size above tablet width
jQuery( '.nav-horizontal' ).find( '.menu li.parent' ).hoverIntent({
sensitivity: 3, // number = sensitivity threshold (must be 1 or higher)
interval: 100, // number = milliseconds for onMouseOver polling interval
timeout: 200, // number = milliseconds delay before onMouseOut
over: function() {
jQuery( this ).find( 'ul.sub-menu' ).first().addClass( 'open' );
},
out: function() {
jQuery( this ).find( 'ul.sub-menu' ).first().removeClass( 'open' );
}
});

}
};

this.init = function() {

if ( typeof jQuery.fn.dlmenu === 'undefined' ) {
return;
}

self.events();

window.addEventListener( 'orientationchange', function() {
self.events();
}, true );

jQuery( window ).smartresize( function() {
self.events();
});
};

jQuery( document ).ready( function() {
self.init();
});


}() );
(function () {
var self = this;

this.events = function () {
// Add parent class to items with sub-menus
jQuery("ul.sub-menu").parent().addClass("parent");

var mobilemenu_instance = jQuery(".nav-horizontal").data("dlmenu");

if (window.matchMedia("screen and (max-width: 1024px)").matches) {
if (!mobilemenu_instance) {
jQuery(".nav-horizontal").dlmenu();
}
} else {
// action for screen widths below 768 pixels
if (mobilemenu_instance) {
jQuery(".nav-horizontal").dlmenu("destroy"); // kill it
}

// Enable hover dropdowns for window size above tablet width
jQuery(".nav-horizontal")
.find(".menu li.parent")
.hoverIntent({
sensitivity: 3, // number = sensitivity threshold (must be 1 or higher)
interval: 100, // number = milliseconds for onMouseOver polling interval
timeout: 200, // number = milliseconds delay before onMouseOut
over: function () {
jQuery(this)
.find("ul.sub-menu")
.first()
.addClass("open");
},
out: function () {
jQuery(this)
.find("ul.sub-menu")
.first()
.removeClass("open");
},
});
}
};

this.init = function () {
if (typeof jQuery.fn.dlmenu === "undefined") {
return;
}

self.events();

window.addEventListener(
"orientationchange",
function () {
self.events();
},
true
);

jQuery(window).smartresize(function () {
self.events();
});
};

jQuery(document).ready(function () {
self.init();
});
})();
2 changes: 1 addition & 1 deletion includes/config/options.php
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ public static function defaults() {

// Footer
'site-back-to-top' => true,
'site-footer-copyright-text' => esc_html__('Copyright © [year] Qazana. All rights reserved.', 'analytica'),
'site-footer-copyright-text' => esc_html__('Copyright © [year] Your Company or website name here. All rights reserved.', 'analytica'),
'site-footer-layout' => '4',
'site-footer-width' => false,
'site-footer-widgets' => true,
Expand Down
Loading

0 comments on commit 1fc574a

Please sign in to comment.