diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2018-04-22 15:25:25 -0400 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2018-04-22 15:25:25 -0400 |
| commit | aa29550a71443e3d3272aee87ea6b778f3a372ea (patch) | |
| tree | 19d3bb61c6a5af1ecfddf4c8d0fbe1547a2cf766 /www/js/PortalLoginCtrl.js | |
| parent | cf644cc65b462362474512160eb0ae1f51a0b158 (diff) | |
tiny bits here and there
Diffstat (limited to 'www/js/PortalLoginCtrl.js')
| -rw-r--r-- | www/js/PortalLoginCtrl.js | 37 |
1 files changed, 26 insertions, 11 deletions
diff --git a/www/js/PortalLoginCtrl.js b/www/js/PortalLoginCtrl.js index f7ade984..bdc3fffe 100644 --- a/www/js/PortalLoginCtrl.js +++ b/www/js/PortalLoginCtrl.js @@ -236,11 +236,19 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic if (NVRDataModel.versionCompare(data, zm.recommendedAppVersion) == -1 && data != "0.0.0") { - $state.go('app.importantmessage', - { - "ver": data + NVRDataModel.hrsSinceChecked("zmVersion") + .then (function (val) { + if (val >=24) { + NVRDataModel.updateHrsSinceChecked("zmVersion"); + $state.go('app.importantmessage', + { + "ver": data + }); + return; + } + }); - return; + } /*if (data == "0.0.0") @@ -449,16 +457,23 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic if (NVRDataModel.versionCompare(data, zm.recommendedAppVersion) == -1 && data != "0.0.0") { + + NVRDataModel.hrsSinceChecked("zmVersion") + .then (function (val) { + if (val >=24) { + NVRDataModel.updateHrsSinceChecked("zmVersion"); + $state.go('app.importantmessage', + { + "ver": data + }); + return; - // console.log (">>>>>>>>>>>>> HERE AND VERSION SAYS " +NVRDataModel.versionCompare(data, zm.recommendedAppVersion)); - //console.log ("GOING TO IMPORTANT"); - $state.go('app.importantmessage', - { - "ver": data + } + }); - return; + } - + /*if (data == "0.0.0") { |