From 05a1beebaf198bfc413f3a7b9c55ff59adbcf580 Mon Sep 17 00:00:00 2001 From: dkanada Date: Thu, 25 Apr 2019 11:16:01 -0700 Subject: [PATCH 1/6] move livetv controller to the old location --- src/{controllers => scripts}/livetvseriestimers.js | 0 src/scripts/routes.js | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename src/{controllers => scripts}/livetvseriestimers.js (100%) diff --git a/src/controllers/livetvseriestimers.js b/src/scripts/livetvseriestimers.js similarity index 100% rename from src/controllers/livetvseriestimers.js rename to src/scripts/livetvseriestimers.js diff --git a/src/scripts/routes.js b/src/scripts/routes.js index 070cfdc10a..419f5a8c89 100644 --- a/src/scripts/routes.js +++ b/src/scripts/routes.js @@ -166,7 +166,7 @@ define([ defineRoute({ path: "/livetvseriestimer.html", autoFocus: false, - controller: "livetvseriestimer" + controller: "scripts/livetvseriestimer" }); defineRoute({ path: "/livetvsettings.html", @@ -432,4 +432,4 @@ define([ isDefaultRoute: true, autoFocus: false, }); -}); \ No newline at end of file +}); From 6c7d64b4de8e0100123fcacc70e4e1bdb05b9c82 Mon Sep 17 00:00:00 2001 From: dkanada Date: Thu, 25 Apr 2019 11:16:11 -0700 Subject: [PATCH 2/6] remove unnecessary route --- src/scripts/routes.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/scripts/routes.js b/src/scripts/routes.js index 419f5a8c89..37f3b2dc6f 100644 --- a/src/scripts/routes.js +++ b/src/scripts/routes.js @@ -163,11 +163,6 @@ define([ autoFocus: false, roles: "admin" }); - defineRoute({ - path: "/livetvseriestimer.html", - autoFocus: false, - controller: "scripts/livetvseriestimer" - }); defineRoute({ path: "/livetvsettings.html", autoFocus: false From 2cac48cf2b17c3e19aa001d363cb464a54a1d07e Mon Sep 17 00:00:00 2001 From: bugfixin Date: Fri, 26 Apr 2019 17:51:49 +0000 Subject: [PATCH 3/6] Remove extraneous padding from sliders --- src/components/emby-slider/emby-slider.css | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/emby-slider/emby-slider.css b/src/components/emby-slider/emby-slider.css index 179270e22f..ee71abd0b6 100644 --- a/src/components/emby-slider/emby-slider.css +++ b/src/components/emby-slider/emby-slider.css @@ -17,7 +17,6 @@ _:-ms-input-placeholder { -ms-user-select: none; user-select: none; outline: 0; - padding: 1em 0; color: #00a4dc; -webkit-align-self: center; -ms-flex-item-align: center; From d9210a7aa15b717403550f42ca08f2a1ffab809b Mon Sep 17 00:00:00 2001 From: bugfixin Date: Fri, 26 Apr 2019 23:00:44 +0000 Subject: [PATCH 4/6] Remove outdated firefox exception for slider bubble --- src/components/emby-slider/emby-slider.js | 45 +++++++++++------------ 1 file changed, 21 insertions(+), 24 deletions(-) diff --git a/src/components/emby-slider/emby-slider.js b/src/components/emby-slider/emby-slider.js index 3daaf8841d..1ca1448ea1 100644 --- a/src/components/emby-slider/emby-slider.js +++ b/src/components/emby-slider/emby-slider.js @@ -141,34 +141,31 @@ define(['browser', 'dom', 'layoutManager', 'css!./emby-slider', 'registerElement passive: true }); - // In firefox this feature disrupts the ability to move the slider - if (!browser.firefox) { - dom.addEventListener(this, (window.PointerEvent ? 'pointermove' : 'mousemove'), function (e) { + dom.addEventListener(this, (window.PointerEvent ? 'pointermove' : 'mousemove'), function (e) { - if (!this.dragging) { - var rect = this.getBoundingClientRect(); - var clientX = e.clientX; - var bubbleValue = (clientX - rect.left) / rect.width; - bubbleValue *= 100; - updateBubble(this, bubbleValue, sliderBubble); + if (!this.dragging) { + var rect = this.getBoundingClientRect(); + var clientX = e.clientX; + var bubbleValue = (clientX - rect.left) / rect.width; + bubbleValue *= 100; + updateBubble(this, bubbleValue, sliderBubble); - if (hasHideClass) { - sliderBubble.classList.remove('hide'); - hasHideClass = false; - } + if (hasHideClass) { + sliderBubble.classList.remove('hide'); + hasHideClass = false; } + } - }, { - passive: true - }); + }, { + passive: true + }); - dom.addEventListener(this, (window.PointerEvent ? 'pointerleave' : 'mouseleave'), function () { - sliderBubble.classList.add('hide'); - hasHideClass = true; - }, { - passive: true - }); - } + dom.addEventListener(this, (window.PointerEvent ? 'pointerleave' : 'mouseleave'), function () { + sliderBubble.classList.add('hide'); + hasHideClass = true; + }, { + passive: true + }); if (!supportsNativeProgressStyle) { @@ -269,4 +266,4 @@ define(['browser', 'dom', 'layoutManager', 'css!./emby-slider', 'registerElement prototype: EmbySliderPrototype, extends: 'input' }); -}); \ No newline at end of file +}); From 02ad6c51af05d5ae01b1d8048f254f560d156111 Mon Sep 17 00:00:00 2001 From: bugfixin Date: Fri, 26 Apr 2019 23:36:00 +0000 Subject: [PATCH 5/6] Change reference to correct autoplaydetect file --- src/scripts/site.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scripts/site.js b/src/scripts/site.js index f984f20ebb..6ca850a0f5 100644 --- a/src/scripts/site.js +++ b/src/scripts/site.js @@ -703,7 +703,7 @@ var AppInfo = {}; itemHelper: componentsPath + "/itemhelper", itemShortcuts: componentsPath + "/shortcuts", playQueueManager: componentsPath + "/playback/playqueuemanager", - autoPlayDetect: componentsPath + "/playback/autoPlayDetect", + autoPlayDetect: componentsPath + "/playback/autoplaydetect", nowPlayingHelper: componentsPath + "/playback/nowplayinghelper", pluginManager: componentsPath + "/pluginmanager", packageManager: componentsPath + "/packagemanager" From 6f3b28d7b0ed70ba301f6771a37e974273cf0aa2 Mon Sep 17 00:00:00 2001 From: Joshua Boniface Date: Tue, 30 Apr 2019 12:58:31 -0400 Subject: [PATCH 6/6] Fix "Password Reset by PIN" page --- src/controllers/forgotpassword.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/controllers/forgotpassword.js b/src/controllers/forgotpassword.js index bb9489a11a..ac010a9b34 100644 --- a/src/controllers/forgotpassword.js +++ b/src/controllers/forgotpassword.js @@ -12,9 +12,12 @@ define([], function() { }); if ("PinCode" == result.Action) { var msg = Globalize.translate("MessageForgotPasswordFileCreated"); - return msg += "
", msg += "
", msg += "Enter PIN here to finish Password Reset" ,msg += "
",msg += result.PinFile, msg += "
", void Dashboard.alert({ + return msg += "
", msg += "
", msg += "Enter PIN here to finish Password Reset
" ,msg += "
",msg += result.PinFile, msg += "
", void Dashboard.alert({ message: msg, - title: Globalize.translate("HeaderForgotPassword") + title: Globalize.translate("HeaderForgotPassword"), + callback: function() { + Dashboard.navigate("forgotpasswordpin.html") + } }) } } @@ -31,4 +34,4 @@ define([], function() { } view.querySelector("form").addEventListener("submit", onSubmit) } -}); \ No newline at end of file +});