summaryrefslogtreecommitdiff
path: root/www/js/ModalCtrl.js
diff options
context:
space:
mode:
authorPliablePixels <pliablepixels@gmail.com>2015-08-18 20:40:25 -0400
committerPliablePixels <pliablepixels@gmail.com>2015-08-18 20:40:25 -0400
commit9f0172691266b92b5204e440c0b31188f0eeb4ac (patch)
tree9ca2db0692d7227cd7c00b19ee2d67442e4e323d /www/js/ModalCtrl.js
parentf06a8bf3e6a7cb8d83bb8c41aa26809784bba35a (diff)
This is a HOLY SHIT update. I broke something, really bad in montage view. I hope I fixed it.
Diffstat (limited to 'www/js/ModalCtrl.js')
-rw-r--r--www/js/ModalCtrl.js10
1 files changed, 9 insertions, 1 deletions
diff --git a/www/js/ModalCtrl.js b/www/js/ModalCtrl.js
index 1e90130c..87ec4b54 100644
--- a/www/js/ModalCtrl.js
+++ b/www/js/ModalCtrl.js
@@ -10,6 +10,7 @@ angular.module('zmApp.controllers').controller('ModalCtrl', ['$scope', '$rootSco
console.log("**** INSIDE MODAL CTRL, recomputing rand *****");
$scope.rand = Math.floor((Math.random() * 100000) + 1);
+ $rootScope.rand = Math.floor((Math.random() * 100000) + 1);
//$state.go($state.current, {}, {reload: true});
// This holds the PTZ menu control
@@ -28,7 +29,8 @@ angular.module('zmApp.controllers').controller('ModalCtrl', ['$scope', '$rootSco
$scope.showModalRangeSider = true;
console.log ("****SHOWING SLIDER");
},2000);
-
+
+
$scope.radialMenuOptions = {
content: '',
@@ -337,6 +339,12 @@ angular.module('zmApp.controllers').controller('ModalCtrl', ['$scope', '$rootSco
}
};
+
+$scope.reloadView = function()
+{
+ ZMDataModel.zmLog ("Reloading view for modal view, recomputing rand");
+ $rootScope.rand = Math.floor((Math.random() * 100000) + 1);
+};
$scope.scaleImage = function() {
console.log ("Switching image style");