From a0a2d9061721884294e8d40ff4af41a40d48744d Mon Sep 17 00:00:00 2001 From: Admin Date: Wed, 4 Jan 2017 11:21:23 -0600 Subject: [PATCH] javascript updates --- pom.xml | 2 +- src/main/resources/public/scripts/app.js | 283 +++++++++++------------ 2 files changed, 141 insertions(+), 144 deletions(-) diff --git a/pom.xml b/pom.xml index 7f3801d..0299ac3 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.bwssystems.HABridge ha-bridge - 4beta2.4 + 4beta2.5 jar HA Bridge diff --git a/src/main/resources/public/scripts/app.js b/src/main/resources/public/scripts/app.js index 6b91875..de17974 100644 --- a/src/main/resources/public/scripts/app.js +++ b/src/main/resources/public/scripts/app.js @@ -1,49 +1,49 @@ -var app = angular.module('habridge', ['ngRoute','ngToast','rzModule','ngDialog','scrollable-table']); +var app = angular.module ('habridge', ['ngRoute', 'ngToast', 'rzModule', 'ngDialog', 'scrollable-table']); -app.config(function ($routeProvider) { - $routeProvider.when('/#', { +app.config (function ($routeProvider) { + $routeProvider.when ('/#', { templateUrl: 'views/configuration.html', controller: 'ViewingController' - }).when('/system', { + }).when ('/system', { templateUrl: 'views/system.html', controller: 'SystemController' - }).when('/logs', { + }).when ('/logs', { templateUrl: 'views/logs.html', controller: 'LogsController' - }).when('/editor', { + }).when ('/editor', { templateUrl: 'views/editor.html', controller: 'EditController' - }).when('/editdevice', { + }).when ('/editdevice', { templateUrl: 'views/editdevice.html', controller: 'EditController' - }).when('/veradevices', { + }).when ('/veradevices', { templateUrl: 'views/veradevice.html', controller: 'VeraController' - }).when('/verascenes', { + }).when ('/verascenes', { templateUrl: 'views/verascene.html', controller: 'VeraController' - }).when('/harmonydevices', { + }).when ('/harmonydevices', { templateUrl: 'views/harmonydevice.html', controller: 'HarmonyController' - }).when('/harmonyactivities', { + }).when ('/harmonyactivities', { templateUrl: 'views/harmonyactivity.html', controller: 'HarmonyController' - }).when('/nest', { + }).when ('/nest', { templateUrl: 'views/nestactions.html', controller: 'NestController' - }).when('/huedevices', { + }).when ('/huedevices', { templateUrl: 'views/huedevice.html', controller: 'HueController' - }).when('/haldevices', { + }).when ('/haldevices', { templateUrl: 'views/haldevice.html', controller: 'HalController' - }).when('/mqttmessages', { + }).when ('/mqttmessages', { templateUrl: 'views/mqttpublish.html', controller: 'MQTTController' - }).when('/hassdevices', { + }).when ('/hassdevices', { templateUrl: 'views/hassdevice.html', controller: 'HassController' - }).otherwise({ + }).otherwise ({ templateUrl: 'views/configuration.html', controller: 'ViewingController' }) @@ -55,7 +55,7 @@ app.run( function (bridgeService) { bridgeService.viewMapTypes(); }); -String.prototype.replaceAll = function(search, replace) +String.prototype.replaceAll = function (search, replace) { //if replace is not sent, return original string otherwise it will //replace search string with 'undefined'. @@ -67,14 +67,14 @@ String.prototype.replaceAll = function(search, replace) }; -app.service('bridgeService', function ($http, $window, ngToast) { +app.service ('bridgeService', function ($http, $window, ngToast) { var self = this; this.state = {base: window.location.origin + "/api/devices", bridgelocation: window.location.origin, systemsbase: window.location.origin + "/system", huebase: window.location.origin + "/api", configs: [], backups: [], devices: [], device: [], mapandid: [], type: "", settings: [], myToastMsg: [], logMsgs: [], loggerInfo: [], mapTypes: [], olddevicename: "", logShowAll: false, isInControl: false, showVera: false, showHarmony: false, showNest: false, showHue: false, showHal: false, showMqtt: false, showHass: false, habridgeversion: ""}; this.displayWarn = function(errorTitle, error) { var toastContent = errorTitle; - if(error != null && typeof(error) != 'undefined') { - if(error.data != null) + if (error !== null && typeof(error) !== 'undefined') { + if (error.data !== null) toastContent = toastContent + " " + error.data.message + " with status: " + error.statusText + " - " + error.status; else toastContent = error; @@ -88,7 +88,7 @@ app.service('bridgeService', function ($http, $window, ngToast) { this.displayError = function(errorTitle, error) { var toastContent = errorTitle; - if(error != null && typeof(error) != 'undefined') + if (error !== null && typeof(error) !== 'undefined') toastContent = toastContent + " " + error.data.message + " with status: " + error.statusText + " - " + error.status; ngToast.create({ className: "danger", @@ -97,7 +97,7 @@ app.service('bridgeService', function ($http, $window, ngToast) { content: toastContent}); }; - this.displayErrorMessage = function(errorTitle, errorMessage) { + this.displayErrorMessage = function (errorTitle, errorMessage) { ngToast.create({ className: "danger", dismissButton: true, @@ -105,7 +105,7 @@ app.service('bridgeService', function ($http, $window, ngToast) { content: errorTitle + errorMessage}); }; - this.displaySuccess = function(theTitle) { + this.displaySuccess = function (theTitle) { ngToast.create({ className: "success", content: theTitle}); @@ -134,7 +134,7 @@ app.service('bridgeService', function ($http, $window, ngToast) { }; this.clearDevice = function () { - if(self.state.device == null) + if(self.state.device === null) self.state.device = []; self.state.device.id = ""; self.state.device.mapType = null; @@ -152,7 +152,6 @@ app.service('bridgeService', function ($http, $window, ngToast) { self.state.device.contentBody = null; self.state.device.contentBodyDim = null; self.state.device.contentBodyOff = null; - self.state.device.requesterAddress = null; self.state.olddevicename = ""; }; @@ -321,7 +320,7 @@ app.service('bridgeService', function ($http, $window, ngToast) { }; this.viewHarmonyActivities = function () { - if(!this.state.showHarmony) + if (!this.state.showHarmony) return; return $http.get(this.state.base + "/harmony/activities").then( function (response) { @@ -334,7 +333,7 @@ app.service('bridgeService', function ($http, $window, ngToast) { }; this.viewHarmonyDevices = function () { - if(!this.state.showHarmony) + if (!this.state.showHarmony) return; return $http.get(this.state.base + "/harmony/devices").then( function (response) { @@ -347,7 +346,7 @@ app.service('bridgeService', function ($http, $window, ngToast) { }; this.viewHalDevices = function () { - if(!this.state.showHal) + if (!this.state.showHal) return; return $http.get(this.state.base + "/hal/devices").then( function (response) { @@ -360,7 +359,7 @@ app.service('bridgeService', function ($http, $window, ngToast) { }; this.viewMQTTDevices = function () { - if(!this.state.showMqtt) + if (!this.state.showMqtt) return; return $http.get(this.state.base + "/mqtt/devices").then( function (response) { @@ -373,7 +372,7 @@ app.service('bridgeService', function ($http, $window, ngToast) { }; this.viewHassDevices = function () { - if(!this.state.showHass) + if (!this.state.showHass) return; return $http.get(this.state.base + "/hass/devices").then( function (response) { @@ -396,18 +395,18 @@ app.service('bridgeService', function ($http, $window, ngToast) { ); }; - this.getMapType = function(aMapType) { + this.getMapType = function (aMapType) { var i, s, len = self.state.mapTypes.length; for (i=0; i -1) { $scope.bulk.devices.splice(idx, 1); - if($scope.bulk.devices.length == 0 && $scope.selectAll) + if($scope.bulk.devices.length === 0 && $scope.selectAll) $scope.selectAll = false; } @@ -1263,7 +1260,7 @@ app.controller('HarmonyController', function ($scope, $location, $http, bridgeSe }; $scope.addDevice = function () { - if($scope.device.name == "" && $scope.device.onUrl == "") + if($scope.device.name === "" && $scope.device.onUrl === "") return; bridgeService.addDevice($scope.device).then( function () { @@ -1354,7 +1351,7 @@ app.controller('NestController', function ($scope, $location, $http, bridgeServi }; $scope.addDevice = function () { - if($scope.device.name == "" && $scope.device.onUrl == "") + if($scope.device.name === "" && $scope.device.onUrl === "") return; bridgeService.addDevice($scope.device).then( function () { @@ -1407,7 +1404,7 @@ app.controller('HueController', function ($scope, $location, $http, bridgeServic }; $scope.addDevice = function () { - if($scope.device.name == "" && $scope.device.onUrl == "") + if($scope.device.name === "" && $scope.device.onUrl === "") return; bridgeService.addDevice($scope.device).then( function () { @@ -1426,7 +1423,7 @@ app.controller('HueController', function ($scope, $location, $http, bridgeServic var devicesList = []; for(var i = 0; i < $scope.bulk.devices.length; i++) { for(var x = 0; x < bridgeService.state.huedevices.length; x++) { - if(bridgeService.state.huedevices[x].device.uniqueid == $scope.bulk.devices[i]) { + if(bridgeService.state.huedevices[x].device.uniqueid === $scope.bulk.devices[i]) { $scope.buildDeviceUrls(bridgeService.state.huedevices[x]); devicesList[i] = { name: $scope.device.name, @@ -1468,7 +1465,7 @@ app.controller('HueController', function ($scope, $location, $http, bridgeServic // is currently selected if (idx > -1) { $scope.bulk.devices.splice(idx, 1); - if($scope.bulk.devices.length == 0 && $scope.selectAll) + if($scope.bulk.devices.length === 0 && $scope.selectAll) $scope.selectAll = false; } @@ -1533,18 +1530,18 @@ app.controller('HalController', function ($scope, $location, $http, bridgeServic var nameCmd = ""; var aDeviceType; var postCmd = "?Token=" + $scope.bridge.settings.haltoken; - if(haldevice.haldevicetype == "Group") { + if(haldevice.haldevicetype === "Group") { aDeviceType = "group"; preOnCmd = "/GroupService!GroupCmd=On"; preOffCmd = "/GroupService!GroupCmd=Off"; nameCmd = "!GroupName="; } - else if(haldevice.haldevicetype == "Macro") { + else if(haldevice.haldevicetype === "Macro") { aDeviceType = "macro"; preOnCmd = "/MacroService!MacroCmd=Set!MacroName="; preOffCmd = preOnCmd; } - else if(haldevice.haldevicetype == "Scene") { + else if(haldevice.haldevicetype === "Scene") { aDeviceType = "scene"; preOnCmd = "/SceneService!SceneCmd=Set!SceneName="; preOffCmd = preOnCmd; @@ -1556,7 +1553,7 @@ app.controller('HalController', function ($scope, $location, $http, bridgeServic preOffCmd = "/DeviceService!DeviceCmd=SetDevice!DeviceValue=Off"; nameCmd = "!DeviceName="; } - if((dim_control.indexOf("byte") >= 0 || dim_control.indexOf("percent") >= 0 || dim_control.indexOf("math") >= 0) && aDeviceType == "switch") + if((dim_control.indexOf("byte") >= 0 || dim_control.indexOf("percent") >= 0 || dim_control.indexOf("math") >= 0) && aDeviceType === "switch") dimpayload = "http://" + haldevice.haladdress + preDimCmd + dim_control @@ -1677,7 +1674,7 @@ app.controller('HalController', function ($scope, $location, $http, bridgeServic }; $scope.addDevice = function () { - if($scope.device.name == "" && $scope.device.onUrl == "") + if($scope.device.name === "" && $scope.device.onUrl === "") return; bridgeService.addDevice($scope.device).then( function () { @@ -1696,10 +1693,10 @@ app.controller('HalController', function ($scope, $location, $http, bridgeServic var devicesList = []; for(var i = 0; i < $scope.bulk.devices.length; i++) { for(var x = 0; x < bridgeService.state.haldevices.length; x++) { - if(bridgeService.state.haldevices[x].haldevicename == $scope.bulk.devices[i]) { - if(bridgeService.state.haldevices[x].haldevicetype == "HVAC") + if(bridgeService.state.haldevices[x].haldevicename === $scope.bulk.devices[i]) { + if(bridgeService.state.haldevices[x].haldevicetype === "HVAC") $scope.buildHALAutoUrls(bridgeService.state.haldevices[x]); - else if(bridgeService.state.haldevices[x].haldevicetype == "HOME") + else if(bridgeService.state.haldevices[x].haldevicetype === "HOME") $scope.buildHALHomeUrls(bridgeService.state.haldevices[x]); else $scope.buildDeviceUrls(bridgeService.state.haldevices[x],dim_control); @@ -1742,7 +1739,7 @@ app.controller('HalController', function ($scope, $location, $http, bridgeServic // is currently selected if (idx > -1) { $scope.bulk.devices.splice(idx, 1); - if($scope.bulk.devices.length == 0 && $scope.selectAll) + if($scope.bulk.devices.length === 0 && $scope.selectAll) $scope.selectAll = false; } @@ -1805,7 +1802,7 @@ app.controller('MQTTController', function ($scope, $location, $http, bridgeServi }; $scope.addDevice = function () { - if($scope.device.name == "" && $scope.device.onUrl == "") + if($scope.device.name === "" && $scope.device.onUrl === "") return; bridgeService.addDevice($scope.device).then( function () { @@ -1919,7 +1916,7 @@ app.controller('HassController', function ($scope, $location, $http, bridgeServi }; $scope.addDevice = function () { - if($scope.device.name == "" && $scope.device.onUrl == "") + if($scope.device.name === "" && $scope.device.onUrl === "") return; bridgeService.addDevice($scope.device).then( function () { @@ -1938,8 +1935,8 @@ app.controller('HassController', function ($scope, $location, $http, bridgeServi var devicesList = []; for(var i = 0; i < $scope.bulk.devices.length; i++) { for(var x = 0; x < bridgeService.state.hassdevices.length; x++) { - if(bridgeService.state.hassdevices[x].deviceName == $scope.bulk.devices[i]) { - if(bridgeService.state.hassdevices[x].domain == "climate") + if(bridgeService.state.hassdevices[x].deviceName === $scope.bulk.devices[i]) { + if(bridgeService.state.hassdevices[x].domain === "climate") $scope.buildHassAutoUrls(bridgeService.state.hassdevices[x]); else $scope.buildDeviceUrls(bridgeService.state.hassdevices[x],dim_control); @@ -1982,7 +1979,7 @@ app.controller('HassController', function ($scope, $location, $http, bridgeServi // is currently selected if (idx > -1) { $scope.bulk.devices.splice(idx, 1); - if($scope.bulk.devices.length == 0 && $scope.selectAll) + if($scope.bulk.devices.length === 0 && $scope.selectAll) $scope.selectAll = false; } @@ -2041,7 +2038,7 @@ app.controller('EditController', function ($scope, $location, $http, bridgeServi }; $scope.addDevice = function () { - if($scope.device.name == "" && $scope.device.onUrl == "") + if($scope.device.name === "" && $scope.device.onUrl === "") return; $scope.device.mapType = $scope.mapTypeSelected[0]; bridgeService.addDevice($scope.device).then( @@ -2055,12 +2052,12 @@ app.controller('EditController', function ($scope, $location, $http, bridgeServi }; $scope.copyDevice = function () { - if($scope.device.name == "" && $scope.device.onUrl == "") { + if($scope.device.name === "" && $scope.device.onUrl === "") { $scope.clearDevice(); return; } - if($scope.device.name == $scope.bridge.olddevicename) { + if($scope.device.name === $scope.bridge.olddevicename) { $scope.clearDevice(); return; } @@ -2080,7 +2077,7 @@ app.controller('EditController', function ($scope, $location, $http, bridgeServi app.filter('availableHarmonyActivityId', function(bridgeService) { return function(input) { var out = []; - if(input == null) + if(input === null) return out; for (var i = 0; i < input.length; i++) { if(!bridgeService.findDeviceByMapId(input[i].activity.id, input[i].hub, "harmonyActivity")){ @@ -2094,7 +2091,7 @@ app.filter('availableHarmonyActivityId', function(bridgeService) { app.filter('unavailableHarmonyActivityId', function(bridgeService) { return function(input) { var out = []; - if(input == null) + if(input === null) return out; for (var i = 0; i < input.length; i++) { if(bridgeService.findDeviceByMapId(input[i].activity.id, input[i].hub, "harmonyActivity")){ @@ -2108,7 +2105,7 @@ app.filter('unavailableHarmonyActivityId', function(bridgeService) { app.filter('availableVeraDeviceId', function(bridgeService) { return function(input) { var out = []; - if(input == null) + if(input === null) return out; for (var i = 0; i < input.length; i++) { if(!bridgeService.findDeviceByMapId(input[i].id, input[i].veraname, "veraDevice")){ @@ -2122,7 +2119,7 @@ app.filter('availableVeraDeviceId', function(bridgeService) { app.filter('unavailableVeraDeviceId', function(bridgeService) { return function(input) { var out = []; - if(input == null) + if(input === null) return out; for (var i = 0; i < input.length; i++) { if(bridgeService.findDeviceByMapId(input[i].id, input[i].veraname, "veraDevice")){ @@ -2136,7 +2133,7 @@ app.filter('unavailableVeraDeviceId', function(bridgeService) { app.filter('availableVeraSceneId', function(bridgeService) { return function(input) { var out = []; - if(input == null) + if(input === null) return out; for (var i = 0; i < input.length; i++) { if(!bridgeService.findDeviceByMapId(input[i].id, input[i].veraname, "veraScene")){ @@ -2150,7 +2147,7 @@ app.filter('availableVeraSceneId', function(bridgeService) { app.filter('unavailableVeraSceneId', function(bridgeService) { return function(input) { var out = []; - if(input == null) + if(input === null) return out; for (var i = 0; i < input.length; i++) { if(bridgeService.findDeviceByMapId(input[i].id,input[i].veraname, "veraScene")){ @@ -2164,7 +2161,7 @@ app.filter('unavailableVeraSceneId', function(bridgeService) { app.filter('availableNestItemId', function(bridgeService) { return function(input) { var out = []; - if(input == null) + if(input === null) return out; for (var i = 0; i < input.length; i++) { if(!bridgeService.findNestItemByMapId(input[i].id, "nestHomeAway")){ @@ -2178,10 +2175,10 @@ app.filter('availableNestItemId', function(bridgeService) { app.filter('unavailableNestItemId', function(bridgeService) { return function(input) { var out = []; - if(input == null) + if(input === null) return out; for (var i = 0; i < input.length; i++) { - if(input[i].mapType != null && bridgeService.aContainsB(input[i].mapType, "nest")){ + if(input[i].mapType !== null && bridgeService.aContainsB(input[i].mapType, "nest")){ out.push(input[i]); } } @@ -2192,7 +2189,7 @@ app.filter('unavailableNestItemId', function(bridgeService) { app.filter('availableHueDeviceId', function(bridgeService) { return function(input) { var out = []; - if(input == null) + if(input === null) return out; for (var i = 0; i < input.length; i++) { if(!bridgeService.findDeviceByMapId(input[i].device.uniqueid, input[i].huename, "hueDevice")){ @@ -2206,7 +2203,7 @@ app.filter('availableHueDeviceId', function(bridgeService) { app.filter('unavailableHueDeviceId', function(bridgeService) { return function(input) { var out = []; - if(input == null) + if(input === null) return out; for (var i = 0; i < input.length; i++) { if(bridgeService.findDeviceByMapId(input[i].device.uniqueid, input[i].huename, "hueDevice")){ @@ -2220,7 +2217,7 @@ app.filter('unavailableHueDeviceId', function(bridgeService) { app.filter('availableHalDeviceId', function(bridgeService) { return function(input) { var out = []; - if(input == null) + if(input === null) return out; for (var i = 0; i < input.length; i++) { if(!bridgeService.findDeviceByMapId(input[i].haldevicename + "-" + input[i].halname, input[i].halname, "halDevice") && @@ -2235,10 +2232,10 @@ app.filter('availableHalDeviceId', function(bridgeService) { app.filter('unavailableHalDeviceId', function(bridgeService) { return function(input) { var out = []; - if(input == null) + if(input === null) return out; for (var i = 0; i < input.length; i++) { - if(input[i].mapType != null && bridgeService.aContainsB(input[i].mapType, "hal")){ + if(input[i].mapType !== null && bridgeService.aContainsB(input[i].mapType, "hal")){ out.push(input[i]); } } @@ -2249,10 +2246,10 @@ app.filter('unavailableHalDeviceId', function(bridgeService) { app.filter('configuredButtons', function() { return function(input) { var out = []; - if(input == null) + if(input === null) return out; for (var i = 0; i < input.length; i++) { - if(input[i].mapType == "harmonyButton"){ + if(input[i].mapType === "harmonyButton"){ out.push(input[i]); } } @@ -2263,10 +2260,10 @@ app.filter('configuredButtons', function() { app.filter('configuredMqttMsgs', function() { return function(input) { var out = []; - if(input == null) + if(input === null) return out; for (var i = 0; i < input.length; i++) { - if(input[i].mapType == "mqttMessage"){ + if(input[i].mapType === "mqttMessage"){ out.push(input[i]); } } @@ -2277,7 +2274,7 @@ app.filter('configuredMqttMsgs', function() { app.filter('availableHassDeviceId', function(bridgeService) { return function(input) { var out = []; - if(input == null) + if(input === null) return out; for (var i = 0; i < input.length; i++) { if(!bridgeService.findDeviceByMapId(input[i].hassdevicename + "-" + input[i].hassname, input[i].hassname, "hassDevice")){ @@ -2291,10 +2288,10 @@ app.filter('availableHassDeviceId', function(bridgeService) { app.filter('unavailableHassDeviceId', function(bridgeService) { return function(input) { var out = []; - if(input == null) + if(input === null) return out; for (var i = 0; i < input.length; i++) { - if(input[i].mapType != null && bridgeService.aContainsB(input[i].mapType, "hass")){ + if(input[i].mapType !== null && bridgeService.aContainsB(input[i].mapType, "hass")){ out.push(input[i]); } }