1
0
Fork 0
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:
Joshua M. Boniface 2019-04-30 23:35:40 -04:00 committed by GitHub
commit 12589460cf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 24 additions and 33 deletions

View file

@ -17,7 +17,6 @@ _:-ms-input-placeholder {
-ms-user-select: none; -ms-user-select: none;
user-select: none; user-select: none;
outline: 0; outline: 0;
padding: 1em 0;
color: #00a4dc; color: #00a4dc;
-webkit-align-self: center; -webkit-align-self: center;
-ms-flex-item-align: center; -ms-flex-item-align: center;

View file

@ -141,34 +141,31 @@ define(['browser', 'dom', 'layoutManager', 'css!./emby-slider', 'registerElement
passive: true passive: true
}); });
// In firefox this feature disrupts the ability to move the slider dom.addEventListener(this, (window.PointerEvent ? 'pointermove' : 'mousemove'), function (e) {
if (!browser.firefox) {
dom.addEventListener(this, (window.PointerEvent ? 'pointermove' : 'mousemove'), function (e) {
if (!this.dragging) { if (!this.dragging) {
var rect = this.getBoundingClientRect(); var rect = this.getBoundingClientRect();
var clientX = e.clientX; var clientX = e.clientX;
var bubbleValue = (clientX - rect.left) / rect.width; var bubbleValue = (clientX - rect.left) / rect.width;
bubbleValue *= 100; bubbleValue *= 100;
updateBubble(this, bubbleValue, sliderBubble); updateBubble(this, bubbleValue, sliderBubble);
if (hasHideClass) { if (hasHideClass) {
sliderBubble.classList.remove('hide'); sliderBubble.classList.remove('hide');
hasHideClass = false; hasHideClass = false;
}
} }
}
}, { }, {
passive: true passive: true
}); });
dom.addEventListener(this, (window.PointerEvent ? 'pointerleave' : 'mouseleave'), function () { dom.addEventListener(this, (window.PointerEvent ? 'pointerleave' : 'mouseleave'), function () {
sliderBubble.classList.add('hide'); sliderBubble.classList.add('hide');
hasHideClass = true; hasHideClass = true;
}, { }, {
passive: true passive: true
}); });
}
if (!supportsNativeProgressStyle) { if (!supportsNativeProgressStyle) {
@ -269,4 +266,4 @@ define(['browser', 'dom', 'layoutManager', 'css!./emby-slider', 'registerElement
prototype: EmbySliderPrototype, prototype: EmbySliderPrototype,
extends: 'input' extends: 'input'
}); });
}); });

View file

@ -34,4 +34,4 @@ define([], function() {
} }
view.querySelector("form").addEventListener("submit", onSubmit) view.querySelector("form").addEventListener("submit", onSubmit)
} }
}); });

View file

@ -163,11 +163,6 @@ define([
autoFocus: false, autoFocus: false,
roles: "admin" roles: "admin"
}); });
defineRoute({
path: "/livetvseriestimer.html",
autoFocus: false,
controller: "livetvseriestimer"
});
defineRoute({ defineRoute({
path: "/livetvsettings.html", path: "/livetvsettings.html",
autoFocus: false autoFocus: false
@ -432,4 +427,4 @@ define([
isDefaultRoute: true, isDefaultRoute: true,
autoFocus: false, autoFocus: false,
}); });
}); });

View file

@ -703,7 +703,7 @@ var AppInfo = {};
itemHelper: componentsPath + "/itemhelper", itemHelper: componentsPath + "/itemhelper",
itemShortcuts: componentsPath + "/shortcuts", itemShortcuts: componentsPath + "/shortcuts",
playQueueManager: componentsPath + "/playback/playqueuemanager", playQueueManager: componentsPath + "/playback/playqueuemanager",
autoPlayDetect: componentsPath + "/playback/autoPlayDetect", autoPlayDetect: componentsPath + "/playback/autoplaydetect",
nowPlayingHelper: componentsPath + "/playback/nowplayinghelper", nowPlayingHelper: componentsPath + "/playback/nowplayinghelper",
pluginManager: componentsPath + "/pluginmanager", pluginManager: componentsPath + "/pluginmanager",
packageManager: componentsPath + "/packagemanager" packageManager: componentsPath + "/packagemanager"