diff options
| -rw-r--r-- | www/js/MontageCtrl.js | 16 | ||||
| -rw-r--r-- | www/js/NVR.js | 1 |
2 files changed, 15 insertions, 2 deletions
diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js index 44290fd2..967decfe 100644 --- a/www/js/MontageCtrl.js +++ b/www/js/MontageCtrl.js @@ -5,7 +5,7 @@ /* global cordova,StatusBar,angular,console,ionic,Packery, Draggabilly, imagesLoaded, ConnectSDK, moment */ angular.module('zmApp.controllers') - .controller('zmApp.MontageCtrl', ['$scope', '$rootScope', 'NVR', '$ionicSideMenuDelegate', '$timeout', '$interval', '$ionicModal', '$ionicLoading', '$http', '$state', '$ionicPopup', '$stateParams', '$ionicHistory', '$ionicScrollDelegate', '$ionicPlatform', 'zm', '$ionicPopover', '$controller', 'imageLoadingDataShare', '$window', '$localstorage', '$translate', 'SecuredPopups', 'EventServer', 'message', function ($scope, $rootScope, NVR, $ionicSideMenuDelegate, $timeout, $interval, $ionicModal, $ionicLoading, $http, $state, $ionicPopup, $stateParams, $ionicHistory, $ionicScrollDelegate, $ionicPlatform, zm, $ionicPopover, $controller, imageLoadingDataShare, $window, $localstorage, $translate, SecuredPopups, EventServer, message) { + .controller('zmApp.MontageCtrl', ['$scope', '$rootScope', 'NVR', '$ionicSideMenuDelegate', '$timeout', '$interval', '$ionicModal', '$ionicLoading', '$http', '$state', '$ionicPopup', '$stateParams', '$ionicHistory', '$ionicScrollDelegate', '$ionicPlatform', 'zm', '$ionicPopover', '$controller', 'imageLoadingDataShare', '$window', '$localstorage', '$translate', 'SecuredPopups', 'EventServer', 'message', '$q',function ($scope, $rootScope, NVR, $ionicSideMenuDelegate, $timeout, $interval, $ionicModal, $ionicLoading, $http, $state, $ionicPopup, $stateParams, $ionicHistory, $ionicScrollDelegate, $ionicPlatform, zm, $ionicPopover, $controller, imageLoadingDataShare, $window, $localstorage, $translate, SecuredPopups, EventServer, message,$q) { //--------------------------------------------------------------------- // Controller main @@ -226,6 +226,7 @@ angular.module('zmApp.controllers') duration: zm.loadingTimeout });*/ + var d = $q.defer(); currentStreamState = streamState.SNAPSHOT_LOWQUALITY; $scope.areImagesLoading = true; @@ -361,6 +362,8 @@ angular.module('zmApp.controllers') //NVR.regenConnKeys(); //randEachTime(); currentStreamState = streamState.ACTIVE; + d.resolve(true); + return d.promise; },300); @@ -455,6 +458,7 @@ angular.module('zmApp.controllers') } + return d.promise; } @@ -1045,7 +1049,15 @@ angular.module('zmApp.controllers') ld.packeryPositions = undefined; NVR.setLogin(ld) .then (function() { - initPackery(); + initPackery().then (function () { + NVR.debug ("initPackery over, storing positions"); + var positions = pckry.getShiftPositions('data-item-id'); + var ld = NVR.getLogin(); + + ld.packeryPositions = JSON.stringify(positions); + NVR.setLogin(ld); + + }); }); diff --git a/www/js/NVR.js b/www/js/NVR.js index 5b1cbc56..32c605cb 100644 --- a/www/js/NVR.js +++ b/www/js/NVR.js @@ -519,6 +519,7 @@ angular.module('zmApp.controllers') //debug ('Groups are:'+JSON.stringify(data)); if (data && data.groups) { + zmgroups = []; for (var i=0; i< data.groups.length; i++) { zmgroups.push(data.groups[i].Group.Name); //console.log( "Checking Group "+data.groups[i].Group.Name); |