From 06b2c0c3d58e28e369d86daffa6ba74d2dcdea4e Mon Sep 17 00:00:00 2001
From: Christian Esperar <christianesperar@gmail.com>
Date: Wed, 18 Nov 2015 17:26:41 +0800
Subject: [PATCH 1/2] Fix menu not working on touch device

---
 production/js/custom.js | 42 ++++++++++++++++++++---------------------
 1 file changed, 20 insertions(+), 22 deletions(-)

diff --git a/production/js/custom.js b/production/js/custom.js
index 366f2719..177a8ba6 100755
--- a/production/js/custom.js
+++ b/production/js/custom.js
@@ -9,42 +9,40 @@ $(function () {
     $('#sidebar-menu li ul').slideUp();
     $('#sidebar-menu li').removeClass('active');
 
-    $('#sidebar-menu li').click(function () {
-        if ($(this).is('.active')) {
-            $(this).removeClass('active');
-            $('ul', this).slideUp();
-            $(this).removeClass('nv');
-            $(this).addClass('vn');
+    $('#sidebar-menu li').on('click touchstart', function() {
+        var link = $('a', this).attr('href');
+
+        if(link) { 
+            window.location.href = link;
         } else {
-            $('#sidebar-menu li ul').slideUp();
-            $(this).removeClass('vn');
-            $(this).addClass('nv');
-            $('ul', this).slideDown();
-            $('#sidebar-menu li').removeClass('active');
-            $(this).addClass('active');
+            if ($(this).is('.active')) {
+                $(this).removeClass('active');
+                $('ul', this).slideUp();
+            } else {
+                $('#sidebar-menu li').removeClass('active');
+                $('#sidebar-menu li ul').slideUp();
+                
+                $(this).addClass('active');
+                $('ul', this).slideDown();
+            }
         }
     });
 
     $('#menu_toggle').click(function () {
         if ($('body').hasClass('nav-md')) {
-            $('body').removeClass('nav-md');
-            $('body').addClass('nav-sm');
-            $('.left_col').removeClass('scroll-view');
-            $('.left_col').removeAttr('style');
+            $('body').removeClass('nav-md').addClass('nav-sm');
+            $('.left_col').removeClass('scroll-view').removeAttr('style');
             $('.sidebar-footer').hide();
 
             if ($('#sidebar-menu li').hasClass('active')) {
-                $('#sidebar-menu li.active').addClass('active-sm');
-                $('#sidebar-menu li.active').removeClass('active');
+                $('#sidebar-menu li.active').addClass('active-sm').removeClass('active');
             }
         } else {
-            $('body').removeClass('nav-sm');
-            $('body').addClass('nav-md');
+            $('body').removeClass('nav-sm').addClass('nav-md');
             $('.sidebar-footer').show();
 
             if ($('#sidebar-menu li').hasClass('active-sm')) {
-                $('#sidebar-menu li.active-sm').addClass('active');
-                $('#sidebar-menu li.active-sm').removeClass('active-sm');
+                $('#sidebar-menu li.active-sm').addClass('active').removeClass('active-sm');
             }
         }
     });

From 725fdf86fcde1d35b45cf42ed3cfad7f9ec7e9ec Mon Sep 17 00:00:00 2001
From: Christian Esperar <christianesperar@gmail.com>
Date: Wed, 18 Nov 2015 18:14:11 +0800
Subject: [PATCH 2/2] Fix Uncaught TypeError: Cannot read property 'style' of
 null when NProgress start

---
 production/index.html   |  3 ---
 production/js/custom.js | 15 ++++++++++++++-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/production/index.html b/production/index.html
index f418a1ed..4c202603 100755
--- a/production/index.html
+++ b/production/index.html
@@ -25,9 +25,6 @@
 
     <script src="js/jquery.min.js"></script>
     <script src="js/nprogress.js"></script>
-    <script>
-        NProgress.start();
-    </script>
     
     <!--[if lt IE 9]>
         <script src="../assets/js/ie8-responsive-file-warning.js"></script>
diff --git a/production/js/custom.js b/production/js/custom.js
index 177a8ba6..c546c29b 100755
--- a/production/js/custom.js
+++ b/production/js/custom.js
@@ -303,6 +303,7 @@ $(function () {
 });
 
 /** ******  Accordion  *********************** **/
+
 /** ******  scrollview  *********************** **/
 $(document).ready(function () {
   
@@ -312,4 +313,16 @@ $(document).ready(function () {
             });
 
 });
-/** ******  /scrollview  *********************** **/
\ No newline at end of file
+/** ******  /scrollview  *********************** **/
+
+/** ******  NProgress  *********************** **/
+if (typeof NProgress != 'undefined') {
+    $(document).ready(function () {
+        NProgress.start();
+    });
+
+    $(window).load(function () {
+        NProgress.done();
+    });
+}
+/** ******  NProgress  *********************** **/
\ No newline at end of file