mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

don't auto-restart during recordings

Browse source
This commit is contained in:
Luke Pulverenti 2016-06-14 02:40:21 -04:00
parent fd87c2de1d
commit cabe68c3e2
7 changed files with 50 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

6
dashboard-ui/scripts/librarybrowser.js
View file

@ -2284,10 +2284,10 @@
html += '</a>';
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) {
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
@ -2312,7 +2312,7 @@
if (options.cardLayout) {
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>";
}

2
dashboard-ui/scripts/mediacontroller.js
View file

@ -88,7 +88,7 @@
return {
name: name,
id: t.id,
ironIcon: playerInfo.id == t.id ? 'check' : null
selected: playerInfo.id == t.id
};
});

7
dashboard-ui/scripts/mediaplayer-video.js
View file

@ -805,19 +805,18 @@
positionSlider = parent.querySelector(".videoPositionSlider", parent);
positionSlider.addEventListener('change', onPositionSliderChange);
positionSlider._setPinValue = function (value) {
positionSlider.getBubbleText = function (value) {
var seekableDuration = getSeekableDuration();
if (!self.currentMediaSource || !seekableDuration) {
this.pinValue = '--:--';
return;
return '--:--';
}
var ticks = seekableDuration;
ticks /= 100;
ticks *= value;
this.pinValue = datetime.getDisplayRunningTime(ticks);
return datetime.getDisplayRunningTime(ticks);
};
volumeSlider = parent.querySelector('.videoVolumeSlider');