summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpliablepixels <pliablepixels@gmail.com>2016-03-11 14:52:33 -0500
committerpliablepixels <pliablepixels@gmail.com>2016-03-11 14:52:33 -0500
commitd3c0afd5b4cbc6887e6786555d17ba4fd0a33ddf (patch)
tree3be4e35634254c4e62862cf5e56bb90043d4243b
parent289a59ba5abcd43c0487605424e217c42b39aba2 (diff)
removed montage warning. screw it.
Former-commit-id: bdece0cfe97c4d4f31ebf636898f5389cc0d9d22
-rw-r--r--www/js/DevOptionsCtrl.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/www/js/DevOptionsCtrl.js b/www/js/DevOptionsCtrl.js
index 9a42ce45..487bc1f8 100644
--- a/www/js/DevOptionsCtrl.js
+++ b/www/js/DevOptionsCtrl.js
@@ -56,14 +56,14 @@ angular.module('zmApp.controllers').controller('zmApp.DevOptionsCtrl', ['$scope'
{
ZMDataModel.zmDebug("SaveDevOptions: called");
- if (parseInt($scope.loginData.maxMontage) > zm.safeMontageLimit) {
+ /*if (parseInt($scope.loginData.maxMontage) > zm.safeMontageLimit) {
$rootScope.zmPopup= SecuredPopups.show('alert',{
title: 'Note',
template: 'You have selected to view more than 10 monitors in the Montage screen. Note that this is very resource intensive and may load the server or cause issues in the application. If you are not sure, please consider limiting this value to 10'
});
ZMDataModel.zmDebug("SaveDevOptions: " + $scope.loginData.maxMontage +
" monitors for montage");
- }
+ }*/
if ((parseInt($scope.loginData.maxFPS) < 0) || (parseInt($scope.loginData.maxFPS) > zm.maxFPS)) {
@@ -99,7 +99,7 @@ angular.module('zmApp.controllers').controller('zmApp.DevOptionsCtrl', ['$scope'
$scope.saveDevOptions = function () {
saveDevOptions();
- $rootScope.zmPopup.close();
+ // $rootScope.zmPopup.close();
$rootScope.zmPopup= SecuredPopups.show('alert',{
title: 'Settings Saved',
template: 'Please explore the menu and enjoy zmNinja!'