mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
don't auto-restart during recordings
This commit is contained in:
parent
fd87c2de1d
commit
cabe68c3e2
7 changed files with 50 additions and 18 deletions
|
@ -15,12 +15,12 @@
|
||||||
},
|
},
|
||||||
"devDependencies": {},
|
"devDependencies": {},
|
||||||
"ignore": [],
|
"ignore": [],
|
||||||
"version": "1.4.46",
|
"version": "1.4.47",
|
||||||
"_release": "1.4.46",
|
"_release": "1.4.47",
|
||||||
"_resolution": {
|
"_resolution": {
|
||||||
"type": "version",
|
"type": "version",
|
||||||
"tag": "1.4.46",
|
"tag": "1.4.47",
|
||||||
"commit": "3dcd07a1386cef6bbb6267851b90f950ca18f5ad"
|
"commit": "b57164cb8d8222bd7fc039bed2cfa01132ee2862"
|
||||||
},
|
},
|
||||||
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
|
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
|
||||||
"_target": "^1.2.0",
|
"_target": "^1.2.0",
|
||||||
|
|
|
@ -26,6 +26,7 @@ _:-ms-input-placeholder, :root .mdl-slider.mdl-slider {
|
||||||
align-self: center;
|
align-self: center;
|
||||||
z-index: 1;
|
z-index: 1;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
|
margin: 0;
|
||||||
/**************************** Tracks ****************************/
|
/**************************** Tracks ****************************/
|
||||||
/**************************** Thumbs ****************************/
|
/**************************** Thumbs ****************************/
|
||||||
/**************************** 0-value ****************************/
|
/**************************** 0-value ****************************/
|
||||||
|
@ -321,3 +322,14 @@ _:-ms-input-placeholder, :root .mdl-slider.mdl-slider {
|
||||||
padding: 0;
|
padding: 0;
|
||||||
transition: left 0.18s cubic-bezier(0.4, 0, 0.2, 1);
|
transition: left 0.18s cubic-bezier(0.4, 0, 0.2, 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.sliderBubble {
|
||||||
|
position: absolute;
|
||||||
|
top: -3.7em;
|
||||||
|
left: 0;
|
||||||
|
padding: .75em;
|
||||||
|
background: #3367d6;
|
||||||
|
color: #fff;
|
||||||
|
border-radius: 1000px;
|
||||||
|
font-size: 90%;
|
||||||
|
}
|
||||||
|
|
|
@ -32,6 +32,17 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function updateBubble(range, bubble) {
|
||||||
|
|
||||||
|
var value = range.value;
|
||||||
|
bubble.style.left = (value - 1) + '%';
|
||||||
|
|
||||||
|
if (range.getBubbleText) {
|
||||||
|
value = range.getBubbleText(value);
|
||||||
|
}
|
||||||
|
bubble.innerHTML = value;
|
||||||
|
}
|
||||||
|
|
||||||
EmbySliderPrototype.attachedCallback = function () {
|
EmbySliderPrototype.attachedCallback = function () {
|
||||||
|
|
||||||
if (this.getAttribute('data-embycheckbox') == 'true') {
|
if (this.getAttribute('data-embycheckbox') == 'true') {
|
||||||
|
@ -46,19 +57,30 @@
|
||||||
var containerElement = this.parentNode;
|
var containerElement = this.parentNode;
|
||||||
containerElement.classList.add('mdl-slider__container');
|
containerElement.classList.add('mdl-slider__container');
|
||||||
|
|
||||||
|
var htmlToInsert = '';
|
||||||
|
|
||||||
if (!supportsNativeProgressStyle) {
|
if (!supportsNativeProgressStyle) {
|
||||||
containerElement.insertAdjacentHTML('beforeend', '<div class="mdl-slider__background-flex"><div class="mdl-slider__background-lower"></div><div class="mdl-slider__background-upper"></div></div>');
|
htmlToInsert += '<div class="mdl-slider__background-flex"><div class="mdl-slider__background-lower"></div><div class="mdl-slider__background-upper"></div></div>';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
htmlToInsert += '<div class="sliderBubble hide"></div>';
|
||||||
|
|
||||||
|
containerElement.insertAdjacentHTML('beforeend', htmlToInsert);
|
||||||
|
|
||||||
var backgroundLower = containerElement.querySelector('.mdl-slider__background-lower');
|
var backgroundLower = containerElement.querySelector('.mdl-slider__background-lower');
|
||||||
var backgroundUpper = containerElement.querySelector('.mdl-slider__background-upper');
|
var backgroundUpper = containerElement.querySelector('.mdl-slider__background-upper');
|
||||||
|
var sliderBubble = containerElement.querySelector('.sliderBubble');
|
||||||
|
|
||||||
this.addEventListener('input', function () {
|
this.addEventListener('input', function (e) {
|
||||||
this.dragging = true;
|
this.dragging = true;
|
||||||
|
updateBubble(this, sliderBubble);
|
||||||
|
sliderBubble.classList.remove('hide');
|
||||||
});
|
});
|
||||||
this.addEventListener('change', function () {
|
this.addEventListener('change', function () {
|
||||||
this.dragging = false;
|
this.dragging = false;
|
||||||
updateValues(this, backgroundLower, backgroundUpper);
|
updateValues(this, backgroundLower, backgroundUpper);
|
||||||
|
updateBubble(this, sliderBubble);
|
||||||
|
sliderBubble.classList.add('hide');
|
||||||
});
|
});
|
||||||
|
|
||||||
if (!supportsNativeProgressStyle) {
|
if (!supportsNativeProgressStyle) {
|
||||||
|
|
|
@ -696,20 +696,19 @@
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
context.querySelector('.nowPlayingPositionSlider', context)._setPinValue = function (value) {
|
context.querySelector('.nowPlayingPositionSlider', context).getBubbleText = function (value) {
|
||||||
|
|
||||||
var state = lastPlayerState;
|
var state = lastPlayerState;
|
||||||
|
|
||||||
if (!state || !state.NowPlayingItem || !state.NowPlayingItem.RunTimeTicks) {
|
if (!state || !state.NowPlayingItem || !state.NowPlayingItem.RunTimeTicks) {
|
||||||
this.pinValue = '--:--';
|
return '--:--';
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
var ticks = state.NowPlayingItem.RunTimeTicks;
|
var ticks = state.NowPlayingItem.RunTimeTicks;
|
||||||
ticks /= 100;
|
ticks /= 100;
|
||||||
ticks *= value;
|
ticks *= value;
|
||||||
|
|
||||||
this.pinValue = datetime.getDisplayRunningTime(ticks);
|
return datetime.getDisplayRunningTime(ticks);
|
||||||
};
|
};
|
||||||
|
|
||||||
context.addEventListener('click', onContextClick);
|
context.addEventListener('click', onContextClick);
|
||||||
|
|
|
@ -2284,10 +2284,10 @@
|
||||||
html += '</a>';
|
html += '</a>';
|
||||||
|
|
||||||
if (options.overlayPlayButton && !item.IsPlaceHolder && (item.LocationType != 'Virtual' || !item.MediaType || item.Type == 'Program') && item.Type != 'Person') {
|
if (options.overlayPlayButton && !item.IsPlaceHolder && (item.LocationType != 'Virtual' || !item.MediaType || item.Type == 'Program') && item.Type != 'Person') {
|
||||||
html += '<div class="cardOverlayButtonContainer"><button is="paper-icon-button-light" class="cardOverlayPlayButton" onclick="return false;"><iron-icon icon="play-arrow"></iron-icon></button></div>';
|
html += '<div class="cardOverlayButtonContainer"><button is="paper-icon-button-light" class="cardOverlayPlayButton autoSize" onclick="return false;"><i class="md-icon">play_arrow</i></button></div>';
|
||||||
}
|
}
|
||||||
if (options.overlayMoreButton) {
|
if (options.overlayMoreButton) {
|
||||||
html += '<div class="cardOverlayButtonContainer"><button is="paper-icon-button-light" class="cardOverlayMoreButton" onclick="return false;"><iron-icon icon="' + AppInfo.moreIcon + '"></iron-icon></button></div>';
|
html += '<div class="cardOverlayButtonContainer"><button is="paper-icon-button-light" class="cardOverlayMoreButton autoSize" onclick="return false;"><i class="md-icon">' + AppInfo.moreIcon.replace('-', '_') + '</i></button></div>';
|
||||||
}
|
}
|
||||||
|
|
||||||
// cardScalable
|
// cardScalable
|
||||||
|
@ -2312,7 +2312,7 @@
|
||||||
|
|
||||||
if (options.cardLayout) {
|
if (options.cardLayout) {
|
||||||
html += '<div class="cardButtonContainer">';
|
html += '<div class="cardButtonContainer">';
|
||||||
html += '<button is="paper-icon-button-light" class="listviewMenuButton btnCardOptions"><iron-icon icon="' + AppInfo.moreIcon + '"></iron-icon></button>';
|
html += '<button is="paper-icon-button-light" class="listviewMenuButton btnCardOptions autoSize"><i class="md-icon">' + AppInfo.moreIcon.replace('-','_') + '</i></button>';
|
||||||
html += "</div>";
|
html += "</div>";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -88,7 +88,7 @@
|
||||||
return {
|
return {
|
||||||
name: name,
|
name: name,
|
||||||
id: t.id,
|
id: t.id,
|
||||||
ironIcon: playerInfo.id == t.id ? 'check' : null
|
selected: playerInfo.id == t.id
|
||||||
};
|
};
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
|
@ -805,19 +805,18 @@
|
||||||
positionSlider = parent.querySelector(".videoPositionSlider", parent);
|
positionSlider = parent.querySelector(".videoPositionSlider", parent);
|
||||||
positionSlider.addEventListener('change', onPositionSliderChange);
|
positionSlider.addEventListener('change', onPositionSliderChange);
|
||||||
|
|
||||||
positionSlider._setPinValue = function (value) {
|
positionSlider.getBubbleText = function (value) {
|
||||||
|
|
||||||
var seekableDuration = getSeekableDuration();
|
var seekableDuration = getSeekableDuration();
|
||||||
if (!self.currentMediaSource || !seekableDuration) {
|
if (!self.currentMediaSource || !seekableDuration) {
|
||||||
this.pinValue = '--:--';
|
return '--:--';
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
var ticks = seekableDuration;
|
var ticks = seekableDuration;
|
||||||
ticks /= 100;
|
ticks /= 100;
|
||||||
ticks *= value;
|
ticks *= value;
|
||||||
|
|
||||||
this.pinValue = datetime.getDisplayRunningTime(ticks);
|
return datetime.getDisplayRunningTime(ticks);
|
||||||
};
|
};
|
||||||
|
|
||||||
volumeSlider = parent.querySelector('.videoVolumeSlider');
|
volumeSlider = parent.querySelector('.videoVolumeSlider');
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue