Merge remote-tracking branch 'upstream/master'

Author: SteveGilvarry

www/js/EventServer.js

@@ -489,7 +489,7 @@ angular.module('zmApp.controllers')
       }
 
       // get permission if we need it
-      FirebasePlugin.hasPermission(function(hasPermission){
+      window.FirebasePlugin.hasPermission(function(hasPermission){
         if (!hasPermission) {
           window.FirebasePlugin.grantPermission(function(hasPermission){
             if (hasPermission) {
@@ -549,7 +549,7 @@ angular.module('zmApp.controllers')
         };
 
         // Create the channel
-        FirebasePlugin.createChannel(channel,
+        window.FirebasePlugin.createChannel(channel,
         function(){
           NVR.debug('push: Channel created: ' + channel.id);
         },

www/js/NVR.js

@@ -385,10 +385,8 @@ angular.module('zmApp.controllers')
       function object_to_query_string(obj) {
         var str = [];
         for (var p in obj)
-          str.push(encodeURIComponent(p) + "=" +
-            encodeURIComponent(obj[p]));
-        var params = str.join("&");
-        return params;
+          str.push(encodeURIComponent(p) + "=" + encodeURIComponent(obj[p]));
+        return str.join("&");
       }
 
       // custom caching function as native http doesn't cache
@@ -3886,6 +3884,8 @@ angular.module('zmApp.controllers')
           return loginData.currentZMState;
         },
 
+        object_to_query_string: object_to_query_string,
+
         getRecordingURL: function (id) {
           var idnum = parseInt(id);
           for (var i = 0; i < monitors.length; i++) {

www/js/StateCtrl.js

@@ -352,7 +352,7 @@ $scope.toggleServer = function() {
           //console.log(JSON.stringify(success));
           // load returns 3 params - one in the middle is avg.
           NVR.debug("StateCtrl/getLoadStatus: success");
-          $scope.zmLoad = success.data.load[1];
+          $scope.zmLoad = Math.round(success.data.load[1]*10)/10;
 
           // console.log("X"+success.data.result+"X");
         },