diff options
Diffstat (limited to 'www/js')
| -rw-r--r-- | www/js/MontageCtrl.js | 10 | ||||
| -rw-r--r-- | www/js/NVR.js | 5 |
2 files changed, 10 insertions, 5 deletions
diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js index 7f978447..d01628c3 100644 --- a/www/js/MontageCtrl.js +++ b/www/js/MontageCtrl.js @@ -2411,11 +2411,12 @@ angular.module('zmApp.controllers') } - + $timeout(function () { - pckry.layout(); + + console.log ('******* DOING RESET'); pckry.once('layoutComplete', function () { - //console.log ("Layout complete"); + console.log ("Layout complete"); var positions = pckry.getShiftPositions('data-item-id'); //console.log ("POSITIONS MAP " + JSON.stringify(positions)); var ld = NVR.getLogin(); @@ -2436,9 +2437,10 @@ angular.module('zmApp.controllers') // $scope.slider.monsize = 2; }); + pckry.layout(); //pckry.layout(); - }, 20); + }, 20); }; diff --git a/www/js/NVR.js b/www/js/NVR.js index a103b69a..7632ba29 100644 --- a/www/js/NVR.js +++ b/www/js/NVR.js @@ -1034,6 +1034,7 @@ angular.module('zmApp.controllers') loginData = angular.copy(newLogin); + // console.log ('****** SET LOGIN:'+JSON.stringify(loginData)); $rootScope.LoginData = loginData; serverGroupList[loginData.serverName] = angular.copy(loginData); @@ -3429,7 +3430,9 @@ angular.module('zmApp.controllers') //console.log("ZMData getEvents called with ID=" + monitorId + "and Page=" + pageId); if (!loadingStr) { - loadingStr = $translate.instant('kLoadingEvents') + "..."; + loadingStr="<button class='button button-clear' style='line-height: normal; min-height: 0; min-width: 0; color:#fff;' ng-click='$root.cancelAuth()'><i class='ion-close-circled'></i> " + $translate.instant('kLoadingEvents') + "...</button>"; + + //loadingStr = $translate.instant('kLoadingEvents') + "..."; } //if (loadingStr) loa |