diff options
Diffstat (limited to 'www/js')
| -rwxr-xr-x | www/js/DataModel.js | 8 | ||||
| -rwxr-xr-x | www/js/app.js | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/www/js/DataModel.js b/www/js/DataModel.js index 51773a9d..d2b21c2c 100755 --- a/www/js/DataModel.js +++ b/www/js/DataModel.js @@ -150,6 +150,7 @@ angular.module('zmApp.controllers') 'timelineScale': -1, 'hideArchived': false, 'videoPlaybackSpeed': 2, + 'enableGIFMP4': false, }; @@ -986,6 +987,13 @@ angular.module('zmApp.controllers') } + if (typeof loginData.enableGIFMP4 == 'undefined') + { + + loginData.enableGIFMP4 = true; + + } + log("DataModel init recovered this loginData as " + JSON.stringify(loginData)); } else diff --git a/www/js/app.js b/www/js/app.js index 9d8e4994..d0f30afe 100755 --- a/www/js/app.js +++ b/www/js/app.js @@ -1090,7 +1090,7 @@ angular.module('zmApp', [ $http( { method: 'POST', - timeout:5000, + timeout:15000, //withCredentials: true, url: loginData.url + '/index.php', headers: |