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;
user-select: none;
outline: 0;
padding: 1em 0;
color: #00a4dc;
-webkit-align-self: center;
-ms-flex-item-align: center;

View file

@ -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'
});
});
});

View file

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

View file

@ -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,
});
});
});

View file

@ -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"