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

update components

This commit is contained in:
Luke Pulverenti 2016-04-27 21:43:09 -04:00
parent 23b95d0042
commit 6cf11c2151
11 changed files with 87 additions and 47 deletions

View file

@ -16,12 +16,12 @@
},
"devDependencies": {},
"ignore": [],
"version": "1.2.49",
"_release": "1.2.49",
"version": "1.2.50",
"_release": "1.2.50",
"_resolution": {
"type": "version",
"tag": "1.2.49",
"commit": "dced619538d91455d46dcbaf0bc03178cbf5ebd8"
"tag": "1.2.50",
"commit": "b58b3517bb892e0cde54a8a5f5bf318248f0eb13"
},
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.0",

View file

@ -181,6 +181,8 @@
align-items: center;
color: #fff !important;
text-decoration: none;
/* Needed in firefox */
text-align: left;
}
@media all and (min-width: 500px) {
@ -232,7 +234,7 @@
@media all and (max-width: 1280px) {
.guideChannelInfoWithImage .guideChannelName {
.channelHeaderCell.withImage .guideChannelNumber {
display: none;
}
}
@ -366,22 +368,28 @@
margin-left: .25em;
}
.guideChannelInfo {
display: inline-block;
max-width: 110px;
.guideChannelNumber {
padding-left: 1em;
max-width: 30%;
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
padding-left: .7em;
}
.guideChannelName {
margin-left: auto;
margin-right: .3em;
max-width: 6vw;
margin-right: 1em;
max-width: 50%;
text-overflow: ellipsis;
overflow: hidden;
}
@media all and (max-width: 1000px) {
.guideChannelName {
display: none;
}
}
.channelList, .programGrid {
height: auto !important;
}

View file

@ -328,11 +328,18 @@
dataSrc = ' data-src="' + url + '"';
}
html += '<button type="button" class="channelHeaderCell clearButton itemAction lazy"' + dataSrc + ' data-action="link" data-isfolder="' + channel.IsFolder + '" data-id="' + channel.Id + '" data-serverid="' + channel.ServerId + '" data-type="' + channel.Type + '">';
var cssClass = 'channelHeaderCell clearButton itemAction lazy';
if (hasChannelImage) {
cssClass += ' withImage';
}
var cssClass = hasChannelImage ? 'guideChannelInfo guideChannelInfoWithImage' : 'guideChannelInfo';
html += '<button type="button" class="' + cssClass + '"' + dataSrc + ' data-action="link" data-isfolder="' + channel.IsFolder + '" data-id="' + channel.Id + '" data-serverid="' + channel.ServerId + '" data-type="' + channel.Type + '">';
html += '<div class="' + cssClass + '"><div class="guideChannelName">' + channel.Number + '</div></div>';
html += '<div class="guideChannelNumber">' + channel.Number + '</div>';
if (!hasChannelImage) {
html += '<div class="guideChannelName">' + channel.Name + '</div>';
}
html += '</button>';
}

View file

@ -120,14 +120,24 @@ define(['dialogHelper', 'inputManager', 'connectionManager', 'layoutManager', 'f
if (options.interactive) {
var actionButtonsOnTop = layoutManager.mobile;
html += '<div>';
html += '<div class="slideshowSwiperContainer"><div class="swiper-wrapper"></div></div>';
html += '<paper-icon-button icon="slideshow:keyboard-arrow-left" class="btnSlideshowPrevious slideshowButton" tabindex="-1"></paper-icon-button>';
html += '<paper-icon-button icon="slideshow:keyboard-arrow-right" class="btnSlideshowNext slideshowButton" tabindex="-1"></paper-icon-button>';
html += '<div class="topActionButtons">';
if (actionButtonsOnTop) {
if (appHost.supports('filedownload')) {
html += '<paper-icon-button icon="slideshow:file-download" class="btnDownload slideshowButton"></paper-icon-button>';
}
}
html += '<paper-icon-button icon="slideshow:close" class="btnSlideshowExit" tabindex="-1"></paper-icon-button>';
html += '</div>';
if (!actionButtonsOnTop) {
html += '<div class="slideshowBottomBar hide">';
//html += '<paper-icon-button icon="slideshow:share" class="btnShare slideshowButton"></paper-icon-button>';
@ -137,6 +147,7 @@ define(['dialogHelper', 'inputManager', 'connectionManager', 'layoutManager', 'f
}
html += '</div>';
}
html += '</div>';
@ -329,7 +340,7 @@ define(['dialogHelper', 'inputManager', 'connectionManager', 'layoutManager', 'f
var url = getCurrentImageUrl();
var itemId = getCurrentItemId();
alert(itemId);
require(['fileDownloader'], function (fileDownloader) {
fileDownloader.download([
{
@ -345,13 +356,21 @@ define(['dialogHelper', 'inputManager', 'connectionManager', 'layoutManager', 'f
function play() {
dlg.querySelector('.btnSlideshowPause').icon = "slideshow:pause";
var btnSlideshowPause = dlg.querySelector('.btnSlideshowPause');
if (btnSlideshowPause) {
btnSlideshowPause.icon = "slideshow:pause";
}
swiperInstance.startAutoplay();
}
function pause() {
dlg.querySelector('.btnSlideshowPause').icon = "slideshow:play-arrow";
var btnSlideshowPause = dlg.querySelector('.btnSlideshowPause');
if (btnSlideshowPause) {
btnSlideshowPause.icon = "slideshow:play-arrow";
}
swiperInstance.stopAutoplay();
}
@ -403,13 +422,19 @@ define(['dialogHelper', 'inputManager', 'connectionManager', 'layoutManager', 'f
function showOsd() {
slideUpToShow(getOsdBottom());
var bottom = getOsdBottom();
if (bottom) {
slideUpToShow(bottom);
startHideTimer();
}
}
function hideOsd() {
slideDownToHide(getOsdBottom());
var bottom = getOsdBottom();
if (bottom) {
slideDownToHide(bottom);
}
}
var hideTimeout;

View file

@ -80,7 +80,7 @@
position: absolute;
}
.btnSlideshowExit {
.topActionButtons {
right: .5vh;
top: .5vh;
z-index: 1002;

View file

@ -30,14 +30,14 @@
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
},
"ignore": [],
"homepage": "https://github.com/polymerelements/iron-a11y-keys-behavior",
"homepage": "https://github.com/PolymerElements/iron-a11y-keys-behavior",
"_release": "1.1.2",
"_resolution": {
"type": "version",
"tag": "v1.1.2",
"commit": "0c2330c229a6fd3d200e2b84147ec6f94f17c22d"
},
"_source": "git://github.com/polymerelements/iron-a11y-keys-behavior.git",
"_source": "git://github.com/PolymerElements/iron-a11y-keys-behavior.git",
"_target": "^1.0.0",
"_originalSource": "polymerelements/iron-a11y-keys-behavior"
"_originalSource": "PolymerElements/iron-a11y-keys-behavior"
}

View file

@ -32,14 +32,14 @@
"web-component-tester": "^4.0.0",
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
},
"homepage": "https://github.com/polymerelements/iron-icon",
"homepage": "https://github.com/PolymerElements/iron-icon",
"_release": "1.0.8",
"_resolution": {
"type": "version",
"tag": "v1.0.8",
"commit": "f36b38928849ef3853db727faa8c9ef104d611eb"
},
"_source": "git://github.com/polymerelements/iron-icon.git",
"_source": "git://github.com/PolymerElements/iron-icon.git",
"_target": "^1.0.0",
"_originalSource": "polymerelements/iron-icon"
"_originalSource": "PolymerElements/iron-icon"
}

View file

@ -26,14 +26,14 @@
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
},
"main": "iron-meta.html",
"homepage": "https://github.com/PolymerElements/iron-meta",
"homepage": "https://github.com/polymerelements/iron-meta",
"_release": "1.1.1",
"_resolution": {
"type": "version",
"tag": "v1.1.1",
"commit": "e171ee234b482219c9514e6f9551df48ef48bd9f"
},
"_source": "git://github.com/PolymerElements/iron-meta.git",
"_source": "git://github.com/polymerelements/iron-meta.git",
"_target": "^1.0.0",
"_originalSource": "PolymerElements/iron-meta"
"_originalSource": "polymerelements/iron-meta"
}

View file

@ -36,7 +36,7 @@
"tag": "v1.4.0",
"commit": "554f7418fdbd97688eb21518b5f8172167d53a95"
},
"_source": "git://github.com/polymerelements/iron-selector.git",
"_source": "git://github.com/PolymerElements/iron-selector.git",
"_target": "^1.0.0",
"_originalSource": "polymerelements/iron-selector"
"_originalSource": "PolymerElements/iron-selector"
}

View file

@ -45,7 +45,7 @@
"tag": "v1.0.11",
"commit": "e3c1ab0c72905b58fb4d9adc2921ea73b5c085a5"
},
"_source": "git://github.com/PolymerElements/paper-behaviors.git",
"_source": "git://github.com/polymerelements/paper-behaviors.git",
"_target": "^1.0.0",
"_originalSource": "PolymerElements/paper-behaviors"
"_originalSource": "polymerelements/paper-behaviors"
}

View file

@ -32,14 +32,14 @@
"iron-test-helpers": "PolymerElements/iron-test-helpers#^1.0.0"
},
"ignore": [],
"homepage": "https://github.com/PolymerElements/paper-ripple",
"homepage": "https://github.com/polymerelements/paper-ripple",
"_release": "1.0.5",
"_resolution": {
"type": "version",
"tag": "v1.0.5",
"commit": "d72e7a9a8ab518b901ed18dde492df3b87a93be5"
},
"_source": "git://github.com/PolymerElements/paper-ripple.git",
"_source": "git://github.com/polymerelements/paper-ripple.git",
"_target": "^1.0.0",
"_originalSource": "PolymerElements/paper-ripple"
"_originalSource": "polymerelements/paper-ripple"
}