milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

update video osd

Browse source
This commit is contained in:
Luke Pulverenti 2017-01-11 03:00:03 -05:00
parent e9b1b4ad5f
commit 0444d44461
6 changed files with 128 additions and 222 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.461",
"_release": "1.4.461",
"version": "1.4.462",
"_release": "1.4.462",
"_resolution": {
"type": "version",
"tag": "1.4.461",
"commit": "4f817f597ac06d80fe41e3d7d096f4fd5d9b7be2"
"tag": "1.4.462",
"commit": "1beaad6a5a112a404e518ad16acfbdc6ca0c57cb"
},
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.1",

7
dashboard-ui/bower_components/emby-webcomponents/cardbuilder/cardbuilder.js vendored
View file

@ -294,9 +294,10 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
for (var i = 0, length = items.length; i < length; i++) {
var item = items[i];
var serverId = item.ServerId || options.serverId;
if (item.ServerId !== lastServerId) {
lastServerId = item.ServerId;
if (serverId !== lastServerId) {
lastServerId = serverId;
apiClient = connectionManager.getApiClient(lastServerId);
}
@ -440,7 +441,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
}
var cardClass = className;
currentItemHtml += buildCard(i, renderItem, connectionManager.getApiClient(renderItem.ServerId), options, cardClass);
currentItemHtml += buildCard(i, renderItem, connectionManager.getApiClient(renderItem.ServerId || options.serverId), options, cardClass);
itemsInRow++;

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

@ -220,9 +220,9 @@ _:-ms-input-placeholder, :root .mdl-slider {
.sliderBubble {
position: absolute;
top: -3.7em;
top: 0;
left: 0;
padding: .5em 1em;
transform: translate3d(-48%, -115%, 0);
background: #282828;
color: #fff;
display: flex;
@ -232,4 +232,5 @@ _:-ms-input-placeholder, :root .mdl-slider {
.sliderBubbleText {
margin: 0;
padding: .5em .75em;
}

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

@ -38,15 +38,20 @@
function updateBubble(range, value, bubble, bubbleText) {
bubble.style.left = (value - 1) + '%';
bubble.style.left = value + '%';
if (range.getBubbleText) {
value = range.getBubbleText(value);
if (range.getBubbleHtml) {
value = range.getBubbleHtml(value);
} else {
value = Math.round(value);
if (range.getBubbleText) {
value = range.getBubbleText(value);
} else {
value = Math.round(value);
}
value = '<h1 class="sliderBubbleText">' + value + '</h1>';
}
bubbleText.innerHTML = value;
bubble.innerHTML = value;
}
EmbySliderPrototype.attachedCallback = function () {
@ -73,21 +78,20 @@
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"><h1 class="sliderBubbleText"></h1></div>';
htmlToInsert += '<div class="sliderBubble hide"></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, sliderBubbleText);
updateBubble(this, this.value, sliderBubble);
if (hasHideClass) {
sliderBubble.classList.remove('hide');
@ -117,7 +121,7 @@
var clientX = e.clientX;
var bubbleValue = (clientX - rect.left) / rect.width;
bubbleValue *= 100;
updateBubble(this, bubbleValue, sliderBubble, sliderBubbleText);
updateBubble(this, bubbleValue, sliderBubble);
if (hasHideClass) {
sliderBubble.classList.remove('hide');