jinql
/
gentelella
mirror of https://github.com/ColorlibHQ/gentelella
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #30 from christianesperar/master 

Fix menu not working on touch device, IE and NProgress error
pull/42/head
Aigars Silkalns 2016-02-26 16:51:08 +02:00
parent a9ecf4e24d 725fdf86fc
commit d7cabeedd3
2 changed files with 34 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
production/index.html
View File

@ -25,9 +25,6 @@
<script src="js/jquery.min.js"></script> <script src="js/jquery.min.js"></script>
<script src="js/nprogress.js"></script> <script src="js/nprogress.js"></script>
<script>
NProgress.start();
</script>
<!--[if lt IE 9]> <!--[if lt IE 9]>
<script src="../assets/js/ie8-responsive-file-warning.js"></script> <script src="../assets/js/ie8-responsive-file-warning.js"></script>

57
production/js/custom.js
View File

@ -9,42 +9,40 @@ $(function () {
$('#sidebar-menu li ul').slideUp(); $('#sidebar-menu li ul').slideUp();
$('#sidebar-menu li').removeClass('active'); $('#sidebar-menu li').removeClass('active');
$('#sidebar-menu li').click(function () { $('#sidebar-menu li').on('click touchstart', function() {
if ($(this).is('.active')) { var link = $('a', this).attr('href');
$(this).removeClass('active');
$('ul', this).slideUp(); if(link) {
$(this).removeClass('nv'); window.location.href = link;
$(this).addClass('vn');
} else { } else {
$('#sidebar-menu li ul').slideUp(); if ($(this).is('.active')) {
$(this).removeClass('vn'); $(this).removeClass('active');
$(this).addClass('nv'); $('ul', this).slideUp();
$('ul', this).slideDown(); } else {
$('#sidebar-menu li').removeClass('active'); $('#sidebar-menu li').removeClass('active');
$(this).addClass('active'); $('#sidebar-menu li ul').slideUp();
$(this).addClass('active');
$('ul', this).slideDown();
}
} }
}); });
$('#menu_toggle').click(function () { $('#menu_toggle').click(function () {
if ($('body').hasClass('nav-md')) { if ($('body').hasClass('nav-md')) {
$('body').removeClass('nav-md'); $('body').removeClass('nav-md').addClass('nav-sm');
$('body').addClass('nav-sm'); $('.left_col').removeClass('scroll-view').removeAttr('style');
$('.left_col').removeClass('scroll-view');
$('.left_col').removeAttr('style');
$('.sidebar-footer').hide(); $('.sidebar-footer').hide();
if ($('#sidebar-menu li').hasClass('active')) { if ($('#sidebar-menu li').hasClass('active')) {
$('#sidebar-menu li.active').addClass('active-sm'); $('#sidebar-menu li.active').addClass('active-sm').removeClass('active');
$('#sidebar-menu li.active').removeClass('active');
} }
} else { } else {
$('body').removeClass('nav-sm'); $('body').removeClass('nav-sm').addClass('nav-md');
$('body').addClass('nav-md');
$('.sidebar-footer').show(); $('.sidebar-footer').show();
if ($('#sidebar-menu li').hasClass('active-sm')) { if ($('#sidebar-menu li').hasClass('active-sm')) {
$('#sidebar-menu li.active-sm').addClass('active'); $('#sidebar-menu li.active-sm').addClass('active').removeClass('active-sm');
$('#sidebar-menu li.active-sm').removeClass('active-sm');
} }
} }
}); });
@ -312,6 +310,7 @@ $(function () {
}); });
/** ****** Accordion *********************** **/ /** ****** Accordion *********************** **/
/** ****** scrollview *********************** **/ /** ****** scrollview *********************** **/
$(document).ready(function () { $(document).ready(function () {
@ -321,4 +320,16 @@ $(document).ready(function () {
}); });
}); });
/** ****** /scrollview *********************** **/ /** ****** /scrollview *********************** **/
/** ****** NProgress *********************** **/
if (typeof NProgress != 'undefined') {
$(document).ready(function () {
NProgress.start();
});
$(window).load(function () {
NProgress.done();
});
}
/** ****** NProgress *********************** **/