off-canvas toggle can not click on android 4

t3framework · Dec 23, 2014 · 38aaaec · 38aaaec
1 parent db21421
commit 38aaaec
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 4 deletions.
diff --git a/source/plg_system_t3/base-bs3/js/off-canvas.js b/source/plg_system_t3/base-bs3/js/off-canvas.js
@@ -10,8 +10,17 @@
  * @Link:         http://t3-framework.org
  *------------------------------------------------------------------------------
  */
-
 jQuery (document).ready(function($){
+    function getAndroidVersion(ua) {
+        var ua = ua || navigator.userAgent; 
+        var match = ua.match(/Android\s([0-9\.]*)/);
+        return match ? match[1] : false;
+    };
+
+    if (parseInt(getAndroidVersion()) == 4) {
+        $('#t3-mainnav').addClass('t3-mainnav-android');
+    }
+    var JA_isLoading = false;
     // fix for old ie
     if (/MSIE\s([\d.]+)/.test(navigator.userAgent) ? new Number(RegExp.$1) < 10 : false) {
         $('html').addClass ('old-ie');
@@ -108,6 +117,10 @@ jQuery (document).ready(function($){
         return false;
     });
     var oc_show = function () {
+        if (JA_isLoading == true) {
+            return;
+        }
+        JA_isLoading=true;
         $wrapper.addClass ('off-canvas-open');
         $inner.on ('click', oc_hide);
         $close.on ('click', oc_hide);
@@ -121,9 +134,14 @@ jQuery (document).ready(function($){
             $inner.animate (p1);
             $nav.animate (p2);
         }
+        setTimeout (function (){JA_isLoading=false;}, 200);
     };
 
     var oc_hide = function () {
+        if (JA_isLoading == true) {
+            return;
+        }
+        JA_isLoading=true;
 
         //remove events
         $inner.off ('click', oc_hide);
@@ -152,7 +170,8 @@ jQuery (document).ready(function($){
               }
               $(window).data('scroll-events', null);
             }
-        }, 550);
+            JA_isLoading=false;
+        }, 700);
 
         // fix for old ie
         if ($('html').hasClass ('old-ie')) {
@@ -162,6 +181,7 @@ jQuery (document).ready(function($){
             $inner.animate (p1);
             $nav.animate (p2);
         }
+
     };
 
     var stopBubble = function (e) {

diff --git a/source/plg_system_t3/base-bs3/less/off-canvas.less b/source/plg_system_t3/base-bs3/less/off-canvas.less
@@ -79,6 +79,15 @@ body {
   }
 }
 
+.t3-mainnav-android {
+	-webkit-transition: -webkit-transform 0.5s;
+	transition: transform 0.5s;
+	&::after {
+		-webkit-transition: opacity 0.5s, width 0.1s 0.5s, height 0.1s 0.5s;
+		transition: opacity 0.5s, width 0.1s 0.5s, height 0.1s 0.5s;
+	}
+}
+
 .off-canvas-open {
   .t3-wrapper::after {
     width: 100%;
@@ -87,6 +96,10 @@ body {
     -webkit-transition: opacity 0.5s;
     transition: opacity 0.5s;
   }
+  .t3-mainnav-android::after {
+    -webkit-transition: opacity 0.5s;
+    transition: opacity 0.5s;
+  }
 }
 
 
@@ -324,7 +337,8 @@ html[dir="ltr"] .off-canvas-right.t3-off-canvas {
 
 // Effect 4: Slide along
 // ---------------------
-.off-canvas-effect-4.off-canvas-open .t3-wrapper {
+.off-canvas-effect-4.off-canvas-open .t3-wrapper,
+.off-canvas-effect-4.off-canvas-open .t3-mainnav-android {
   -webkit-transform: translate3d(@t3-off-canvas-width, 0, 0);
   transform: translate3d(@t3-off-canvas-width, 0, 0);
 }
@@ -347,7 +361,8 @@ html[dir="ltr"] .off-canvas-right.t3-off-canvas {
 }
 
 // off-canvas on right side
-.off-canvas-right.off-canvas-effect-4.off-canvas-open .t3-wrapper {
+.off-canvas-right.off-canvas-effect-4.off-canvas-open .t3-wrapper,
+.off-canvas-right.off-canvas-effect-4.off-canvas-open .t3-mainnav-android {
   -webkit-transform: translate3d(-@t3-off-canvas-width, 0, 0);
   transform: translate3d(-@t3-off-canvas-width, 0, 0);
 }