typos

ZoneMinder · Apr 18, 2021 · 4625317 · 4625317
1 parent f15e02a
commit 4625317
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js
@@ -285,7 +285,7 @@ angular.module('zmApp.controllers')
         if (positions[p].display == 'show' || positions[p].display=='blank') {
           pos_cnt++;
         }
-      };
+      }
 
       NVR.log("Monitors that are active" + cnt + " while grid has " + pos_cnt);
 
@@ -1843,7 +1843,7 @@ angular.module('zmApp.controllers')
       $scope.currentProfileName = mName;
       console.log ("NEW POS="+ld.packeryPositions);
       var positionsStr = ld.packeryPositions;
-      var positions = undefined;
+      var positions;
 
       if (positionsStr == '' || positionsStr == undefined) {
         NVR.debug ('No positions stored');
@@ -2100,7 +2100,7 @@ angular.module('zmApp.controllers')
                   NVR.debug ("All monitors is special, unhiding all");
                 for (var p = 0; p < getMonPos.length; p++) {
                   //console.log ("CHECK");
-                  if (!getMonPos[p].display != 'show') {
+                  if (getMonPos[p].display != 'show' && getMonPos[p].display != 'blank' ) {
                     getMonPos[p].display = 'show';
                     unHidden = true;
                   }
@@ -2355,7 +2355,7 @@ angular.module('zmApp.controllers')
         return undefined;
     }
     return positions;
-    };
+    }
 
     function loadStreamQueryStatus () {
 

diff --git a/www/js/NVR.js b/www/js/NVR.js
@@ -535,11 +535,11 @@ angular.module('zmApp.controllers')
           */
           var currentState = 'unknown';
 
-          for (var i=0; i < data['states'].length; i++ ) {
+          for (var i=0; i < data.states .length; i++ ) {
 
-            var active = data['states'][i].State.IsActive;
+            var active = data.states[i].State.IsActive;
             if (active == '1' ) {
-              currentState = data['states'][i].State.Name;
+              currentState = data.states[i].State.Name;
              break; 
             }
           }
@@ -560,9 +560,9 @@ angular.module('zmApp.controllers')
                 //$rootScope.$broadcast('zm-state-change');
                 proceedWithFreshLogin(true);
                 return d.promise;
-              })     
+              });     
 
-            })
+            });
 
           } else {
             debug ('ZM State has not changed, still at '+loginData.currentZMState);
@@ -3403,11 +3403,11 @@ angular.module('zmApp.controllers')
               d.resolve(monitors);
               return d.promise;
             }, function (err) {
-              debug ('Error in getZMState() '+JSON.stringify(err))
+              debug ('Error in getZMState() '+JSON.stringify(err));
               $ionicLoading.hide();
               d.resolve(monitors);
               return d.promise;
-            })
+            });
             //console.log ("Returning"+JSON.stringify(monitors));
             return d.promise;
           }