diff --git a/src/components/emby-slider/emby-slider.css b/src/components/emby-slider/emby-slider.css index 4a04571414..101058ca26 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; 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 +}); diff --git a/src/controllers/forgotpassword.js b/src/controllers/forgotpassword.js index ea81fedf2c..ac010a9b34 100644 --- a/src/controllers/forgotpassword.js +++ b/src/controllers/forgotpassword.js @@ -34,4 +34,4 @@ define([], function() { } view.querySelector("form").addEventListener("submit", onSubmit) } -}); \ No newline at end of file +}); 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 9c7bf70bc7..c96fa0fb68 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: "livetvseriestimer" - }); defineRoute({ path: "/livetvsettings.html", autoFocus: false @@ -432,4 +427,4 @@ define([ isDefaultRoute: true, autoFocus: false, }); -}); \ No newline at end of file +}); diff --git a/src/scripts/site.js b/src/scripts/site.js index dbabeb607f..5b73e67018 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"