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

Merge branch 'master' of https://github.com/bwssytems/ha-bridge

Browse Source
This commit is contained in:
Monica Goward
2017-02-06 21:24:44 +00:00
parent 2fbf26a5fa 3016712ad8
commit 470f6b3c15
14 changed files with 44 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1187,7 +1187,7 @@ app.controller('ValueDialogCtrl', function ($scope, bridgeService, ngDialog) {
$scope.slider = {
value: 100,
options: {
floor: 0,
floor: 1,
ceil: 100,
showSelectionBar: true
}
@@ -1196,8 +1196,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;
@@ -1206,7 +1206,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