From 0ecc9a2ca4c3604ef2590fef5b3072417689a7d3 Mon Sep 17 00:00:00 2001 From: thlo Date: Wed, 24 Jul 2013 20:32:03 +0200 Subject: Widget updates: - Multi-Server Support - Number key personalization for recordings - Timezone fix - Fix in YouTube Handling - Fix in Helpbar - Other misc fixes --- smarttv-client/Javascript/Buttons.js | 34 +++++++++++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 3 deletions(-) (limited to 'smarttv-client/Javascript/Buttons.js') diff --git a/smarttv-client/Javascript/Buttons.js b/smarttv-client/Javascript/Buttons.js index b881975..2e293fd 100644 --- a/smarttv-client/Javascript/Buttons.js +++ b/smarttv-client/Javascript/Buttons.js @@ -31,6 +31,7 @@ Buttons.init = function (){ this.ynButton = new ButtonHandler(); this.ynButton.hndlName = "ynButtons"; this.ynButton.enterCallback = Buttons.ynEnterCallback; + this.ynButton.returnCallback = Buttons.ynReturnCallback; this.ynButton.btnMax = 1; this.ynButton.elmName = "#yn-btn-"; this.ynButton.masterElm = "#yn-buttons"; @@ -41,6 +42,16 @@ Buttons.init = function (){ // $("#prc-buttons-anchor").attr("onkeydown", "Button.prButton.onInput();"); } }; +Buttons.ynReturnCallback = function () { + switch (Main.state) { + case Main.eOPT: + Options.drawServerList(); + break; + default: + break; + } + +}; Buttons.ynEnterCallback = function () { Main.log("Buttons.ynEnterCallback btnSelected= " + Buttons.ynButton.btnSelected); @@ -57,9 +68,14 @@ Buttons.ynEnterCallback = function () { break; case Main.eURLS: Server.deleteUrls(Data.getCurrentItem().childs[Main.selectedVideo].payload.guid); + break; + case Main.eOPT: + Config.deletedFromContext((Options.selectedLine -1)); // 0 is reserved for the input field + Options.drawServerList(); + break; } - + break; } Buttons.ynHide(); @@ -103,6 +119,7 @@ Buttons.show = function () { Buttons.hide = function () { this.prButton.hide(); // $("#prc-buttons-anchor").blur(); + Main.enableKeys(); }; @@ -126,7 +143,10 @@ Buttons.ynShow = function () { Buttons.ynHide = function () { this.ynButton.hide(); - Main.enableKeys(); + if (Main.state == Main.eOPT) + $("#optionsViewAnchor").focus(); + else + Main.enableKeys(); }; Buttons.createStyleSheet = function () { @@ -219,8 +239,16 @@ Buttons.createYnButtons= function () { table.append(tbody); var row = $("", {style: "width:100%; align:center"}); + var cell = $("", {style :"height:80%; width:100%", colspan:"3" }); + cell.css("align","center"); + var txt_div = $("
", {text: "Delete ?"}); + cell.append(txt_div); + row.append(cell); + tbody.append(row); - var cell = $("", {style :"height:80%; width:50%"}); + row = $("", {style: "width:100%; align:center"}); + cell = $("", {style :"height:80%; width:50%"}); + cell.css("align","right"); $("