mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
Merge pull request #297 from jellyfin/release-10.3.z
Backmerge for 10.3.2 release
This commit is contained in:
commit
12589460cf
6 changed files with 24 additions and 33 deletions
|
@ -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;
|
||||
|
|
|
@ -141,8 +141,6 @@ 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) {
|
||||
|
||||
if (!this.dragging) {
|
||||
|
@ -168,7 +166,6 @@ define(['browser', 'dom', 'layoutManager', 'css!./emby-slider', 'registerElement
|
|||
}, {
|
||||
passive: true
|
||||
});
|
||||
}
|
||||
|
||||
if (!supportsNativeProgressStyle) {
|
||||
|
||||
|
|
|
@ -163,11 +163,6 @@ define([
|
|||
autoFocus: false,
|
||||
roles: "admin"
|
||||
});
|
||||
defineRoute({
|
||||
path: "/livetvseriestimer.html",
|
||||
autoFocus: false,
|
||||
controller: "livetvseriestimer"
|
||||
});
|
||||
defineRoute({
|
||||
path: "/livetvsettings.html",
|
||||
autoFocus: false
|
||||
|
|
|
@ -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"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue