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 ++++++++++---
 2 files changed, 18 insertions(+), 3 deletions(-)

(limited to 'www/js')

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
                 
-- 
cgit v1.2.3