MOBILE-994 panels: Content not showing up in Android 4.4.2

moodlehq · Jun 26, 2015 · a669320 · a669320
1 parent 9a9608e
commit a669320
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 16 deletions.
diff --git a/config.json b/config.json
@@ -1,6 +1,6 @@
 {
 "app_id" : "com.moodle.moodlemobile",
-"versioncode" : "389",
+"versioncode" : "390",
 "versionname" : "1.15",
 "cache_expiration_time" : 300000,
 "default_lang" : "en",

diff --git a/config.xml b/config.xml
@@ -3,7 +3,7 @@
         xmlns:gap = "http://phonegap.com/ns/1.0"
         xmlns:android = "http://schemas.android.com/apk/res/android"
         id        = "com.moodle.moodlemobile"
-        versionCode = "389"
+        versionCode = "390"
         version   = "1.15">
     <name>Moodle Mobile</name>
 

diff --git a/lib/mm.js b/lib/mm.js
@@ -499,20 +499,23 @@ var MM = {
         $("#header-icon-right").css("left", MM.panels.sizes.threePanels.center + MM.panels.sizes.threePanels.right - 25);
 
         // Swipe detection.
-        $('#panel-center, #panel-right').swipe({
-            swipeLeft: function(event, direction, distance, duration, fingerCount) {
-                MM.log('Swipe' + direction + ' fingers ' + fingerCount);
-                MM.panels.menuShow(false);
-            },
-            swipeRight: function(event, direction, distance, duration, fingerCount) {
-                MM.log('Swipe' + direction + ' fingers ' + fingerCount);
-                MM.panels.menuShow(true);
-            },
-            click: function(event, direction, distance, duration, fingerCount) {
-            },
-            threshold: 50,
-            excludedElements: "button, input, select, textarea, .noSwipe, .content-actions"
-        });
+        // Disable for android, see MOBILE-994.
+        if (MM.deviceOS != 'android') {
+            $('#panel-center, #panel-right').swipe({
+                swipeLeft: function(event, direction, distance, duration, fingerCount) {
+                    MM.log('Swipe' + direction + ' fingers ' + fingerCount);
+                    MM.panels.menuShow(false);
+                },
+                swipeRight: function(event, direction, distance, duration, fingerCount) {
+                    MM.log('Swipe' + direction + ' fingers ' + fingerCount);
+                    MM.panels.menuShow(true);
+                },
+                click: function(event, direction, distance, duration, fingerCount) {
+                },
+                threshold: 50,
+                excludedElements: "button, input, select, textarea, .noSwipe, .content-actions"
+            });
+        }
     },
 
     /**