From eeecfe1699cf161b22bf2190e2c9a2bc129d0307 Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Tue, 23 Aug 2016 10:01:58 -0400
Subject: #310 - option to disable native trans

Former-commit-id: 62daeae024d9633c5caa11562fd3782d84d7d58f
---
 www/js/DataModel.js           |  8 ++++++++
 www/js/app.js                 | 13 ++++++++++---
 www/lang/locale-en.json       |  2 ++
 www/templates/devoptions.html |  6 ++++++
 4 files changed, 26 insertions(+), 3 deletions(-)

(limited to 'www')

diff --git a/www/js/DataModel.js b/www/js/DataModel.js
index 150796c6..fcbb34e6 100644
--- a/www/js/DataModel.js
+++ b/www/js/DataModel.js
@@ -101,6 +101,7 @@ angular.module('zmApp.controllers')
             'language': 'en',
             'reachability': true,
             'forceImageModePath': false,
+            'disableNative': false
 
 
 
@@ -657,6 +658,13 @@ angular.module('zmApp.controllers')
 
                                 }
 
+                                if (typeof loginData.disableNative == 'undefined') {
+                                    zmDebug("disableNative not found, setting to false");
+                                    loginData.disableNative = false;
+
+                                }
+
+                                
                                 zmLog("DataModel init recovered this loginData as " + JSON.stringify(loginData));
                             } else {
                                 zmLog("defaultServer configuration NOT found. Keeping login at defaults");
diff --git a/www/js/app.js b/www/js/app.js
index 36bc255b..a43f710e 100644
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -1286,9 +1286,16 @@ angular.module('zmApp', [
 
 
 
-
-                $ionicNativeTransitions.enable(true, false);
-                
+                if (ZMDataModel.getLogin().disableNative)
+                {
+                    ZMDataModel.zmLog ("Disabling native transitions...");
+                    $ionicNativeTransitions.enable(false);
+                }
+                else
+                {
+                    ZMDataModel.zmLog ("Enabling native transitions...");
+                    $ionicNativeTransitions.enable(true);
+                }
                 // At this stage, DataModel.init is not called yet
                 // but I do need to know the language
                 
diff --git a/www/lang/locale-en.json b/www/lang/locale-en.json
index 32a0f8a8..4db47f2f 100644
--- a/www/lang/locale-en.json
+++ b/www/lang/locale-en.json
@@ -52,6 +52,8 @@
     "kDeletingEvent"             :"deleting event",
     "kDevOptions"                :"Dev. Settings",
     "kDeveloperOptionsFor"       :"Developer Options for",
+    "kDisableNative"             :"Disable Native transitions",
+    "kDisableNativeSub"          :"Enable if the menu is freezing",
     "kDisablePush"               :"disable APNS/GCM",
     "kDiscovering"               :"discovering",
     "kDiscoveringAPI"            :"discovering api",
diff --git a/www/templates/devoptions.html b/www/templates/devoptions.html
index 48fe9413..3d521d7a 100644
--- a/www/templates/devoptions.html
+++ b/www/templates/devoptions.html
@@ -158,6 +158,12 @@
             <label>
                 <ion-toggle ng-model="loginData.enableBlog" ng-checked="{{loginData.enableBlog}}" toggle-class="toggle-calm"> {{'kEnableNewsUpdates' | translate}}</ion-toggle>
             </label>
+            
+            
+            <label ng-if = "$root.platformOS != 'desktop'">
+                <ion-toggle ng-model="loginData.disableNative" ng-checked="{{loginData.disableNative}}" toggle-class="toggle-calm"> {{'kDisableNative' | translate}}<p>{{'kDisableNativeSub' | translate}}</p></ion-toggle>
+                
+            </label>
 
 
         </div>
-- 
cgit v1.2.3