diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js index c7a38670cc..b53e706067 100644 --- a/dashboard-ui/scripts/mediaplayer.js +++ b/dashboard-ui/scripts/mediaplayer.js @@ -1199,17 +1199,21 @@ } }; - self.volumeUp = function () { - - if (currentMediaElement) { - currentMediaElement.volume = Math.max(currentMediaElement.volume - 5, 0); - } - }; - self.volumeDown = function () { if (currentMediaElement) { - currentMediaElement.volume = Math.min(currentMediaElement.volume + 5, 100); + currentMediaElement.volume = Math.max(currentMediaElement.volume - .025, 0); + + volumeSlider.val(currentMediaElement.volume); + } + }; + + self.volumeUp = function () { + + if (currentMediaElement) { + currentMediaElement.volume = Math.min(currentMediaElement.volume + .025, 1); + + volumeSlider.val(currentMediaElement.volume); } }; diff --git a/dashboard-ui/scripts/remotecontrol.js b/dashboard-ui/scripts/remotecontrol.js index eef917a30b..87331f446a 100644 --- a/dashboard-ui/scripts/remotecontrol.js +++ b/dashboard-ui/scripts/remotecontrol.js @@ -646,7 +646,22 @@ html += ''; - html += '

'; + html += '

'; + html += '

Commands

'; + html += '
'; + + html += '

'; + + html += ''; + html += ''; + + html += '

'; + + html += '
'; + html += '
'; + + + html += '

'; html += ''; @@ -686,6 +701,41 @@ } + $('.btnGoHome', popup).on('click', function () { + + var id = $('#selectSession', popup).val(); + + ApiClient.sendSystemCommand(id, 'GoHome'); + }); + + $('.btnGoToSettings', popup).on('click', function () { + + var id = $('#selectSession', popup).val(); + + ApiClient.sendSystemCommand(id, 'GoToSettings'); + }); + + $('.btnVolumeDown', popup).on('click', function () { + + var id = $('#selectSession', popup).val(); + + ApiClient.sendSystemCommand(id, 'VolumeDown'); + }); + + $('.btnVolumeUp', popup).on('click', function () { + + var id = $('#selectSession', popup).val(); + + ApiClient.sendSystemCommand(id, 'VolumeUp'); + }); + + $('.btnToggleMute', popup).on('click', function () { + + var id = $('#selectSession', popup).val(); + + ApiClient.sendSystemCommand(id, 'ToggleMute'); + }); + $('.btnStop', popup).on('click', function () { var id = $('#selectSession', popup).val(); @@ -769,6 +819,9 @@ html += ''; html += ''; html += ''; + html += ''; + html += ''; + html += ''; html += ''; diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js index f43d904a7e..74a28194a8 100644 --- a/dashboard-ui/scripts/site.js +++ b/dashboard-ui/scripts/site.js @@ -848,7 +848,8 @@ var Dashboard = { }; WebNotifications.show(notification); - } else { + } + else { Dashboard.showFooterNotification({ html: "" + cmd.Header + ":   " + cmd.Text, timeout: cmd.TimeoutMs }); }