summaryrefslogtreecommitdiff
path: root/www/js/DataModel.js
diff options
context:
space:
mode:
authorpliablepixels <pliablepixels@gmail.com>2016-04-17 08:37:07 -0400
committerpliablepixels <pliablepixels@gmail.com>2016-04-17 08:37:07 -0400
commit9b96991f06a11513b524e45d06dab0ebbbd26ea7 (patch)
tree9bd9085d522c37021970c39d786bc2e24af16fa3 /www/js/DataModel.js
parenta1bae88bb0b7f75d28e300c5f4935aa1ab88a0b6 (diff)
allow for forcedresumeDelay to wait for network stack, switch to native scrolling (should improve android perf)
Former-commit-id: 4bcb4fa02be69677fd75a2acf84357d8dbfe201c
Diffstat (limited to 'www/js/DataModel.js')
-rw-r--r--www/js/DataModel.js9
1 files changed, 9 insertions, 0 deletions
diff --git a/www/js/DataModel.js b/www/js/DataModel.js
index 3633d384..ec2686b4 100644
--- a/www/js/DataModel.js
+++ b/www/js/DataModel.js
@@ -75,6 +75,7 @@ angular.module('zmApp.controllers')
'packeryPositions':'',
'packerySizes':'',
'timelineModalGraphType':'all',
+ 'resumeDelay':300,
};
@@ -451,6 +452,14 @@ angular.module('zmApp.controllers')
loginData.timelineModalGraphType = 'all';
}
+ if (typeof loginData.resumeDelay == 'undefined')
+ {
+ zmDebug ("resumeDelay does not exist. Setting to 0");
+ loginData.resumeDelay = "0";
+
+ }
+
+
if (typeof loginData.montageHistoryQuality == 'undefined')
{