From d7a6748ff89d3f1b061348bda57c0bf5028e2b3d Mon Sep 17 00:00:00 2001 From: Paul Kim Date: Fri, 29 Mar 2024 17:53:39 +0900 Subject: [PATCH] issue #11 Fix text overflow issue on amenity item selection order lists. --- procentric/application/lib/hoteltv.api.js | 2 +- procentric/application/lib/hoteltv.js | 24 ++++++++++++------- .../theme/HJS00001/hoteltv.app.full.popup.css | 2 ++ 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/procentric/application/lib/hoteltv.api.js b/procentric/application/lib/hoteltv.api.js index 40d7298..599fb09 100755 --- a/procentric/application/lib/hoteltv.api.js +++ b/procentric/application/lib/hoteltv.api.js @@ -802,7 +802,7 @@ HotelTV.api = (function() { "mac_wifi": "", "mac_bt": "", "speed": 0, - "manufacture": "LG", + "manufacture": _dev_inf['manufacture'], "model": "", "hw_ver": "1.00", "sw_ver": "1.1.5", diff --git a/procentric/application/lib/hoteltv.js b/procentric/application/lib/hoteltv.js index 43f4bf6..2c5a452 100755 --- a/procentric/application/lib/hoteltv.js +++ b/procentric/application/lib/hoteltv.js @@ -130,6 +130,12 @@ function __fxn_Set_DebugOpt() { console.log("OPT" + navigator.appVersion); if (navigator.appVersion.includes("Web0S") == true) { HotelTV.dbginfo['emulator'] = false; + HotelTV.devinfo['manufacture'] = "LG"; + HotelTV.devinfo['tvOS'] = "Web0S"; + } else if (navigator.appVersion.includes("Tizen") == true) { + HotelTV.dbginfo['emulator'] = false; + HotelTV.devinfo['manufacture'] = "SAMSUNG"; + HotelTV.devinfo['tvOS'] = "Tizen"; } else { HotelTV.dbginfo['emulator'] = true; } @@ -209,7 +215,7 @@ HotelTV.Init = async function() { $('.error #countdown #message').text(`System will be reboot in ${_tmval} second...`); }, "cb_eoe": function() { - setTimeout(HotelTV.hcap.Reboot(), 500); + setTimeout(HotelTV.hcap.Reboot, 500); } }); } @@ -236,7 +242,7 @@ HotelTV.Init = async function() { $('.error #countdown #message').text(`The Device ID is ${HotelTV.devinfo.serial_number}.\r\n\r\nSystem will be reboot in ${_tmval} second...`); }, "cb_eoe": function() { - setTimeout(HotelTV.hcap.Reboot(), 500); + setTimeout(HotelTV.hcap.Reboot, 500); } }); } @@ -270,7 +276,7 @@ HotelTV.Init = async function() { $('.error #countdown #message').text(`System will be reboot in ${_tmval} second...`); }, "cb_eoe": function() { - setTimeout(HotelTV.hcap.Reboot(), 500); + setTimeout(HotelTV.hcap.Reboot, 500); } }); return; @@ -291,7 +297,7 @@ HotelTV.Init = async function() { $('.error #countdown #message').text(`The Device ID is ${HotelTV.devinfo.serial_number}.\r\n\r\nSystem will be reboot in ${_tmval} second...`); }, "cb_eoe": function() { - setTimeout(HotelTV.hcap.Reboot(), 500); + setTimeout(HotelTV.hcap.Reboot, 500); } }); } @@ -314,7 +320,7 @@ HotelTV.Init = async function() { $('.error #countdown #message').text(`The Device ID is ${HotelTV.devinfo.serial_number}.\r\n\r\nSystem will be reboot in ${_tmval} second...`); }, "cb_eoe": function() { - setTimeout(HotelTV.hcap.Reboot(), 500); + setTimeout(HotelTV.hcap.Reboot, 500); } }); } @@ -343,7 +349,7 @@ HotelTV.Init = async function() { $('.error #countdown #message').text(`The Device ID is ${HotelTV.devinfo.serial_number}.\r\n\r\nSystem will be reboot in ${_tmval} second...`); }, "cb_eoe": function() { - setTimeout(HotelTV.hcap.Reboot(), 500); + setTimeout(HotelTV.hcap.Reboot, 500); } }); } @@ -366,7 +372,7 @@ HotelTV.Init = async function() { $('.error #countdown #message').text(`The Device ID is ${HotelTV.devinfo.serial_number}.\r\n\r\nSystem will be reboot in ${_tmval} second...`); }, "cb_eoe": function() { - setTimeout(HotelTV.hcap.Reboot(), 500); + setTimeout(HotelTV.hcap.Reboot, 500); } }); } @@ -401,7 +407,7 @@ HotelTV.Init = async function() { $('.error #countdown #message').text(`The Device ID is ${HotelTV.devinfo.serial_number}.\r\n\r\nSystem will be reboot in ${_tmval} second...`); }, "cb_eoe": function() { - setTimeout(HotelTV.hcap.Reboot(), 500); + setTimeout(HotelTV.hcap.Reboot, 500); } }); } @@ -424,7 +430,7 @@ HotelTV.Init = async function() { $('.error #countdown #message').text(`The Device ID is ${HotelTV.devinfo.serial_number}.\r\n\r\nSystem will be reboot in ${_tmval} second...`); }, "cb_eoe": function() { - setTimeout(HotelTV.hcap.Reboot(), 500); + setTimeout(HotelTV.hcap.Reboot, 500); } }); } diff --git a/procentric/application/theme/HJS00001/hoteltv.app.full.popup.css b/procentric/application/theme/HJS00001/hoteltv.app.full.popup.css index ac8117f..e813035 100755 --- a/procentric/application/theme/HJS00001/hoteltv.app.full.popup.css +++ b/procentric/application/theme/HJS00001/hoteltv.app.full.popup.css @@ -1055,6 +1055,8 @@ width: 50%; float: left; padding: 0px 0px 0px 20px; + text-overflow: ellipsis; + overflow: hidden; } .popup .amenity .bg .owl-carousel .owl-stage .am_item_sel_cart_win .winright>.cart_table>.tbl_record tbody tr>.cartItem>#quantity {