mhop/ha-bridge
1
0
Fork 0
mirror of https://github.com/bwssytems/ha-bridge.git synced 2025-12-19 08:28:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into NewConnectors1

Browse Source 
Conflicts:
	README.md
	pom.xml
This commit is contained in:
Admin
2017-02-16 15:22:06 -06:00
parent 61156e9820 3016712ad8
commit afd1af4094
16 changed files with 49 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/resources/public/scripts/app.js
View File

@@ -1167,7 +1167,7 @@ app.controller('ValueDialogCtrl', function ($scope, bridgeService, ngDialog) {
$scope.slider = {
value: 100,
options: {
floor: 0,
floor: 1,
ceil: 100,
showSelectionBar: true
}
@@ -1176,8 +1176,8 @@ app.controller('ValueDialogCtrl', function ($scope, bridgeService, ngDialog) {
$scope.valueType = "percentage";
$scope.changeScale = function () {
if($scope.valueType === "raw") {
$scope.slider.options.ceil = 255;
$scope.slider.value = 255;
$scope.slider.options.ceil = 254;
$scope.slider.value = 254;
}
else {
$scope.slider.options.ceil = 100;
@@ -1186,7 +1186,7 @@ app.controller('ValueDialogCtrl', function ($scope, bridgeService, ngDialog) {
};
$scope.setValue = function () {
ngDialog.close('ngdialog1');
var theValue = 0;
var theValue = 1;
if($scope.valueType === "percentage")
theValue = Math.round(($scope.slider.value * .01) * 255);
else