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

update slider

Browse source
This commit is contained in:
Luke Pulverenti 2016-11-05 13:39:12 -04:00
parent fab42af1a5
commit 69b1b7e164
13 changed files with 58 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

8
dashboard-ui/bower_components/emby-webcomponents/.bower.json vendored
View file

@ -14,12 +14,12 @@
},
"devDependencies": {},
"ignore": [],
"version": "1.4.329",
"_release": "1.4.329",
"version": "1.4.330",
"_release": "1.4.330",
"_resolution": {
"type": "version",
"tag": "1.4.329",
"commit": "ccda7e5d3b991feaec966c4ec9433cda4d93a9e7"
"tag": "1.4.330",
"commit": "14b8b8dd7303142a641995e0cd31a0972786399f"
},
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.1",

8
dashboard-ui/bower_components/emby-webcomponents/browserdeviceprofile.js vendored
View file

@ -170,7 +170,7 @@ define(['browser'], function (browser) {
supported = browser.tizen;
break;
case 'mov':
supported = browser.chrome || browser.edgeUwp;
supported = browser.tizen || browser.chrome || browser.edgeUwp;
videoCodecs.push('h264');
break;
case 'm2ts':
@ -329,7 +329,11 @@ define(['browser'], function (browser) {
AudioCodec: videoAudioCodecs.join(',')
});
}
if (browser.tizen) {
mp4VideoCodecs.push('mpeg2video')
}
if (canPlayMkv && mp4VideoCodecs.length) {
profile.DirectPlayProfiles.push({
Container: 'mkv',

2
dashboard-ui/bower_components/emby-webcomponents/cardbuilder/card.css vendored
View file

@ -408,7 +408,7 @@ button {
max-width: 200px;
}
@media all and (min-width: 420px) {
@media all and (min-width: 400px) {
.backdropCard-scalable {
width: 50%;

3
dashboard-ui/bower_components/emby-webcomponents/emby-slider/emby-slider.css vendored
View file

@ -224,3 +224,6 @@ _:-ms-input-placeholder, :root .mdl-slider {
align-items: center;
justify-content: center;
}
.sliderBubbleText {
margin: 0;
}

11
dashboard-ui/bower_components/emby-webcomponents/emby-slider/emby-slider.js vendored
View file

@ -29,14 +29,14 @@
});
}
function updateBubble(range, value, bubble) {
function updateBubble(range, value, bubble, bubbleText) {
bubble.style.left = (value - 1) + '%';
if (range.getBubbleText) {
value = range.getBubbleText(value);
}
bubble.innerHTML = value;
bubbleText.innerHTML = value;
}
EmbySliderPrototype.attachedCallback = function () {
@ -59,20 +59,21 @@
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>';
htmlToInsert += '<div class="sliderBubble hide"><h1 class="sliderBubbleText"></h1></div>';
containerElement.insertAdjacentHTML('beforeend', htmlToInsert);
var backgroundLower = containerElement.querySelector('.mdl-slider__background-lower');
var backgroundUpper = containerElement.querySelector('.mdl-slider__background-upper');
var sliderBubble = containerElement.querySelector('.sliderBubble');
var sliderBubbleText = containerElement.querySelector('.sliderBubbleText');
var hasHideClass = sliderBubble.classList.contains('hide');
dom.addEventListener(this, 'input', function (e) {
this.dragging = true;
updateBubble(this, this.value, sliderBubble);
updateBubble(this, this.value, sliderBubble, sliderBubbleText);
if (hasHideClass) {
sliderBubble.classList.remove('hide');
@ -102,7 +103,7 @@
var clientX = e.clientX;
var bubbleValue = (clientX - rect.left) / rect.width;
bubbleValue *= 100;
updateBubble(this, Math.round(bubbleValue), sliderBubble);
updateBubble(this, Math.round(bubbleValue), sliderBubble, sliderBubbleText);
if (hasHideClass) {
sliderBubble.classList.remove('hide');

2
dashboard-ui/bower_components/emby-webcomponents/itemcontextmenu.js vendored
View file

@ -233,7 +233,7 @@ define(['apphost', 'globalize', 'connectionManager', 'itemHelper', 'embyRouter',
}
}
if (options.openAlbum !== false && item.AlbumId) {
if (options.openAlbum !== false && item.AlbumId && item.MediaType !== 'Photo') {
commands.push({
name: Globalize.translate('sharedcomponents#ViewAlbum'),
id: 'album'