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": {}, "devDependencies": {},
"ignore": [], "ignore": [],
"version": "1.4.329", "version": "1.4.330",
"_release": "1.4.329", "_release": "1.4.330",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "1.4.329", "tag": "1.4.330",
"commit": "ccda7e5d3b991feaec966c4ec9433cda4d93a9e7" "commit": "14b8b8dd7303142a641995e0cd31a0972786399f"
}, },
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git", "_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.1", "_target": "^1.2.1",

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

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

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

@ -408,7 +408,7 @@ button {
max-width: 200px; max-width: 200px;
} }
@media all and (min-width: 420px) { @media all and (min-width: 400px) {
.backdropCard-scalable { .backdropCard-scalable {
width: 50%; 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; align-items: center;
justify-content: 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) + '%'; bubble.style.left = (value - 1) + '%';
if (range.getBubbleText) { if (range.getBubbleText) {
value = range.getBubbleText(value); value = range.getBubbleText(value);
} }
bubble.innerHTML = value; bubbleText.innerHTML = value;
} }
EmbySliderPrototype.attachedCallback = function () { 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="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); 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'); var sliderBubble = containerElement.querySelector('.sliderBubble');
var sliderBubbleText = containerElement.querySelector('.sliderBubbleText');
var hasHideClass = sliderBubble.classList.contains('hide'); var hasHideClass = sliderBubble.classList.contains('hide');
dom.addEventListener(this, 'input', function (e) { dom.addEventListener(this, 'input', function (e) {
this.dragging = true; this.dragging = true;
updateBubble(this, this.value, sliderBubble); updateBubble(this, this.value, sliderBubble, sliderBubbleText);
if (hasHideClass) { if (hasHideClass) {
sliderBubble.classList.remove('hide'); sliderBubble.classList.remove('hide');
@ -102,7 +103,7 @@
var clientX = e.clientX; var clientX = e.clientX;
var bubbleValue = (clientX - rect.left) / rect.width; var bubbleValue = (clientX - rect.left) / rect.width;
bubbleValue *= 100; bubbleValue *= 100;
updateBubble(this, Math.round(bubbleValue), sliderBubble); updateBubble(this, Math.round(bubbleValue), sliderBubble, sliderBubbleText);
if (hasHideClass) { if (hasHideClass) {
sliderBubble.classList.remove('hide'); 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({ commands.push({
name: Globalize.translate('sharedcomponents#ViewAlbum'), name: Globalize.translate('sharedcomponents#ViewAlbum'),
id: 'album' id: 'album'

13
dashboard-ui/css/librarybrowser.css
View file

@ -45,6 +45,10 @@
padding-top: 10px; padding-top: 10px;
} }
.pageWithAbsoluteTabs .pageTabContent {
padding-top: 2.2em;
}
/*.pageWithAbsoluteTabs .pageTabContent { /*.pageWithAbsoluteTabs .pageTabContent {
padding-left: .5em !important; padding-left: .5em !important;
padding-right: .5em !important; padding-right: .5em !important;
@ -85,7 +89,7 @@
} }
.homePageSection { .homePageSection {
margin-top: 3em; margin-bottom: 3.6em;
} }
.sectionHeaderButton { .sectionHeaderButton {
@ -132,12 +136,12 @@
} }
.homePageSection h1 { .homePageSection h1 {
padding-left: 3.1vw; padding-left: .55em;
} }
.homePageSection .itemsContainer { .homePageSection .itemsContainer {
padding-left: 2.5vw; padding-left: .7em;
padding-right: 2.5vw; padding-right: .7em;
} }
@media all and (min-width: 1200px) { @media all and (min-width: 1200px) {
@ -166,7 +170,6 @@
.listPaging { .listPaging {
text-align: center; text-align: center;
margin: .5em 0 .5em;
} }
.viewControls + .listTopPaging { .viewControls + .listTopPaging {

2
dashboard-ui/livetv.html
View file

@ -74,7 +74,7 @@
<div class="pageTabContent ehsContent fullWidth flexPageTabContent absolutePageTabContent" id="guideTab" data-index="1" style="width:auto;padding-top:0; padding-bottom: 0;"> <div class="pageTabContent ehsContent fullWidth flexPageTabContent absolutePageTabContent" id="guideTab" data-index="1" style="width:auto;padding-top:0; padding-bottom: 0;">
</div> </div>
<div class="pageTabContent ehsContent" id="channelsTab" data-index="2"> <div class="pageTabContent ehsContent" id="channelsTab" data-index="2">
<div style="text-align: center; display: flex; flex-wrap: wrap; align-items: center; justify-content: center;padding:.7em .5em;"> <div style="text-align: center; display: flex; flex-wrap: wrap; align-items: center; justify-content: center;padding:0 .5em 1em;">
<div class="paging"></div> <div class="paging"></div>
<button is="paper-icon-button-light" class="btnFilter autoSize" title="${ButtonFilter}"><i class="md-icon">filter_list</i></button> <button is="paper-icon-button-light" class="btnFilter autoSize" title="${ButtonFilter}"><i class="md-icon">filter_list</i></button>
</div> </div>

6
dashboard-ui/movies.html
View file

@ -55,7 +55,7 @@
</div> </div>
</div> </div>
<div class="pageTabContent ehsContent" id="moviesTab" data-index="1"> <div class="pageTabContent ehsContent" id="moviesTab" data-index="1">
<div style="text-align: center; display: flex; flex-wrap: wrap; align-items: center; justify-content: center;padding:.7em .5em;"> <div style="text-align: center; display: flex; flex-wrap: wrap; align-items: center; justify-content: center;padding:0 .5em 1em;">
<div class="paging"></div> <div class="paging"></div>
<button is="paper-icon-button-light" class="btnSelectView autoSize" title="${ButtonSelectView}"><i class="md-icon">view_comfy</i></button> <button is="paper-icon-button-light" class="btnSelectView autoSize" title="${ButtonSelectView}"><i class="md-icon">view_comfy</i></button>
<button is="paper-icon-button-light" class="btnSort autoSize" title="${ButtonSort}"><i class="md-icon">sort_by_alpha</i></button> <button is="paper-icon-button-light" class="btnSort autoSize" title="${ButtonSort}"><i class="md-icon">sort_by_alpha</i></button>
@ -72,7 +72,7 @@
</div> </div>
</div> </div>
<div class="pageTabContent ehsContent" id="trailersTab" data-index="2"> <div class="pageTabContent ehsContent" id="trailersTab" data-index="2">
<div style="text-align: center; display: flex; flex-wrap: wrap; align-items: center; justify-content: center;padding:.7em .5em;"> <div style="text-align: center; display: flex; flex-wrap: wrap; align-items: center; justify-content: center;padding:0 .5em 1em;">
<div class="paging"></div> <div class="paging"></div>
<button is="paper-icon-button-light" class="btnSort autoSize" title="${ButtonSort}"><i class="md-icon">sort_by_alpha</i></button> <button is="paper-icon-button-light" class="btnSort autoSize" title="${ButtonSort}"><i class="md-icon">sort_by_alpha</i></button>
<button is="paper-icon-button-light" class="btnFilter autoSize" title="${ButtonFilter}"><i class="md-icon">filter_list</i></button> <button is="paper-icon-button-light" class="btnFilter autoSize" title="${ButtonFilter}"><i class="md-icon">filter_list</i></button>
@ -88,7 +88,7 @@
</div> </div>
</div> </div>
<div class="pageTabContent ehsContent" id="collectionsTab" data-index="3"> <div class="pageTabContent ehsContent" id="collectionsTab" data-index="3">
<div style="text-align: center; display: flex; flex-wrap: wrap; align-items: center; justify-content: center;padding:.7em .5em;"> <div style="text-align: center; display: flex; flex-wrap: wrap; align-items: center; justify-content: center;padding:0 .5em 1em;">
<div class="paging"></div> <div class="paging"></div>
<button is="paper-icon-button-light" class="btnSelectView autoSize" title="${ButtonSelectView}"><i class="md-icon">view_comfy</i></button> <button is="paper-icon-button-light" class="btnSelectView autoSize" title="${ButtonSelectView}"><i class="md-icon">view_comfy</i></button>
<button is="paper-icon-button-light" class="btnSort autoSize" title="${ButtonSort}"><i class="md-icon">sort_by_alpha</i></button> <button is="paper-icon-button-light" class="btnSort autoSize" title="${ButtonSort}"><i class="md-icon">sort_by_alpha</i></button>

10
dashboard-ui/music.html
View file

@ -58,7 +58,7 @@
<div class="favoriteSections homePageSection"></div> <div class="favoriteSections homePageSection"></div>
</div> </div>
<div class="pageTabContent pageTabContent ehsContent" id="albumsTab" data-index="1"> <div class="pageTabContent pageTabContent ehsContent" id="albumsTab" data-index="1">
<div style="text-align: center; display: flex; flex-wrap: wrap; align-items: center; justify-content: center;padding:.7em .5em;"> <div style="text-align: center; display: flex; flex-wrap: wrap; align-items: center; justify-content: center;padding:0 .5em 1em;">
<div class="paging"></div> <div class="paging"></div>
<button is="paper-icon-button-light" class="btnSelectView autoSize" title="${ButtonSelectView}"><i class="md-icon">view_comfy</i></button> <button is="paper-icon-button-light" class="btnSelectView autoSize" title="${ButtonSelectView}"><i class="md-icon">view_comfy</i></button>
<button is="paper-icon-button-light" class="btnSort autoSize" title="${ButtonSort}"><i class="md-icon">sort_by_alpha</i></button> <button is="paper-icon-button-light" class="btnSort autoSize" title="${ButtonSort}"><i class="md-icon">sort_by_alpha</i></button>
@ -75,7 +75,7 @@
</div> </div>
</div> </div>
<div class="pageTabContent pageTabContent ehsContent" id="albumArtistsTab" data-index="2"> <div class="pageTabContent pageTabContent ehsContent" id="albumArtistsTab" data-index="2">
<div style="text-align: center; display: flex; flex-wrap: wrap; align-items: center; justify-content: center;padding:.7em .5em;"> <div style="text-align: center; display: flex; flex-wrap: wrap; align-items: center; justify-content: center;padding:0 .5em 1em;">
<div class="paging"></div> <div class="paging"></div>
<button is="paper-icon-button-light" class="btnSelectView autoSize" title="${ButtonSelectView}"><i class="md-icon">view_comfy</i></button> <button is="paper-icon-button-light" class="btnSelectView autoSize" title="${ButtonSelectView}"><i class="md-icon">view_comfy</i></button>
<button is="paper-icon-button-light" class="btnFilter autoSize" title="${ButtonFilter}"><i class="md-icon">filter_list</i></button> <button is="paper-icon-button-light" class="btnFilter autoSize" title="${ButtonFilter}"><i class="md-icon">filter_list</i></button>
@ -91,7 +91,7 @@
</div> </div>
</div> </div>
<div class="pageTabContent pageTabContent ehsContent" id="artistsTab" data-index="3"> <div class="pageTabContent pageTabContent ehsContent" id="artistsTab" data-index="3">
<div style="text-align: center; display: flex; flex-wrap: wrap; align-items: center; justify-content: center;padding:.7em .5em;"> <div style="text-align: center; display: flex; flex-wrap: wrap; align-items: center; justify-content: center;padding:0 .5em 1em;">
<div class="paging"></div> <div class="paging"></div>
<button is="paper-icon-button-light" class="btnSelectView autoSize" title="${ButtonSelectView}"><i class="md-icon">view_comfy</i></button> <button is="paper-icon-button-light" class="btnSelectView autoSize" title="${ButtonSelectView}"><i class="md-icon">view_comfy</i></button>
<button is="paper-icon-button-light" class="btnFilter autoSize" title="${ButtonFilter}"><i class="md-icon">filter_list</i></button> <button is="paper-icon-button-light" class="btnFilter autoSize" title="${ButtonFilter}"><i class="md-icon">filter_list</i></button>
@ -107,7 +107,7 @@
</div> </div>
</div> </div>
<div class="pageTabContent pageTabContent ehsContent" id="songsTab" data-index="4"> <div class="pageTabContent pageTabContent ehsContent" id="songsTab" data-index="4">
<div style="text-align: center; display: flex; flex-wrap: wrap; align-items: center; justify-content: center;padding:.7em .5em;"> <div style="text-align: center; display: flex; flex-wrap: wrap; align-items: center; justify-content: center;padding:0 .5em 1em;">
<div class="paging"></div> <div class="paging"></div>
<button is="paper-icon-button-light" class="btnSort autoSize" title="${ButtonSort}"><i class="md-icon">sort_by_alpha</i></button> <button is="paper-icon-button-light" class="btnSort autoSize" title="${ButtonSort}"><i class="md-icon">sort_by_alpha</i></button>
<button is="paper-icon-button-light" class="btnFilter autoSize" title="${ButtonFilter}"><i class="md-icon">filter_list</i></button> <button is="paper-icon-button-light" class="btnFilter autoSize" title="${ButtonFilter}"><i class="md-icon">filter_list</i></button>
@ -126,7 +126,7 @@
<div is="emby-itemscontainer" id="items" class="itemsContainer paddedItemsContainer vertical-wrap"></div> <div is="emby-itemscontainer" id="items" class="itemsContainer paddedItemsContainer vertical-wrap"></div>
</div> </div>
<div class="pageTabContent pageTabContent ehsContent" id="foldersTab" data-index="6"> <div class="pageTabContent pageTabContent ehsContent" id="foldersTab" data-index="6">
<div style="text-align: center; display: flex; flex-wrap: wrap; align-items: center; justify-content: center;padding:.7em .5em;"> <div style="text-align: center; display: flex; flex-wrap: wrap; align-items: center; justify-content: center;padding:0 .5em 1em;">
<div class="paging"></div> <div class="paging"></div>
</div> </div>

12
dashboard-ui/scripts/mypreferenceshome.js
View file

@ -36,8 +36,20 @@
var folderHtml = ''; var folderHtml = '';
folderHtml += '<div class="checkboxList">'; folderHtml += '<div class="checkboxList">';
var excludeViewTypes = ['playlists', 'livetv', 'boxsets', 'channels'];
var excludeItemTypes = ['Channel'];
folderHtml += result.Items.map(function (i) { folderHtml += result.Items.map(function (i) {
if (excludeViewTypes.indexOf(i.CollectionType || []) !== -1) {
return '';
}
// not implemented yet
if (excludeItemTypes.indexOf(i.Type) !== -1) {
return '';
}
var currentHtml = ''; var currentHtml = '';
var id = 'chkIncludeInLatest' + i.Id; var id = 'chkIncludeInLatest' + i.Id;

4
dashboard-ui/scripts/site.js
View file

@ -1627,7 +1627,11 @@ var AppInfo = {};
var embyWebComponentsBowerPath = bowerPath + '/emby-webcomponents'; var embyWebComponentsBowerPath = bowerPath + '/emby-webcomponents';
if (Dashboard.isRunningInCordova()) { if (Dashboard.isRunningInCordova()) {
if (window.MainActivity && window.MainActivity.getAndroidBuildVersion() >= 24) {
define("actionsheet", ["webActionSheet"], returnFirstDependency);
} else {
define("actionsheet", ["cordova/actionsheet"], returnFirstDependency); define("actionsheet", ["cordova/actionsheet"], returnFirstDependency);
}
} else { } else {
define("actionsheet", ["webActionSheet"], returnFirstDependency); define("actionsheet", ["webActionSheet"], returnFirstDependency);
} }

4
dashboard-ui/tv.html
View file

@ -74,7 +74,7 @@
</div> </div>
</div> </div>
<div class="pageTabContent ehsContent" id="seriesTab" data-index="3"> <div class="pageTabContent ehsContent" id="seriesTab" data-index="3">
<div style="text-align: center; display: flex; flex-wrap: wrap; align-items: center; justify-content: center;padding:.7em .5em;"> <div style="text-align: center; display: flex; flex-wrap: wrap; align-items: center; justify-content: center;padding:0 .5em 1em;">
<div class="paging"></div> <div class="paging"></div>
<button is="paper-icon-button-light" class="btnSelectView autoSize" title="${ButtonSelectView}"><i class="md-icon">view_comfy</i></button> <button is="paper-icon-button-light" class="btnSelectView autoSize" title="${ButtonSelectView}"><i class="md-icon">view_comfy</i></button>
<button is="paper-icon-button-light" class="btnSort autoSize" title="${ButtonSort}"><i class="md-icon">sort_by_alpha</i></button> <button is="paper-icon-button-light" class="btnSort autoSize" title="${ButtonSort}"><i class="md-icon">sort_by_alpha</i></button>
@ -91,7 +91,7 @@
</div> </div>
</div> </div>
<div class="pageTabContent ehsContent" id="episodesTab" data-index="4"> <div class="pageTabContent ehsContent" id="episodesTab" data-index="4">
<div style="text-align: center; display: flex; flex-wrap: wrap; align-items: center; justify-content: center;padding:.7em .5em;"> <div style="text-align: center; display: flex; flex-wrap: wrap; align-items: center; justify-content: center;padding:0 .5em 1em;">
<div class="paging"></div> <div class="paging"></div>
<button is="paper-icon-button-light" class="btnSelectView autoSize" title="${ButtonSelectView}"><i class="md-icon">view_comfy</i></button> <button is="paper-icon-button-light" class="btnSelectView autoSize" title="${ButtonSelectView}"><i class="md-icon">view_comfy</i></button>
<button is="paper-icon-button-light" class="btnSort autoSize" title="${ButtonSort}"><i class="md-icon">sort_by_alpha</i></button> <button is="paper-icon-button-light" class="btnSort autoSize" title="${ButtonSort}"><i class="md-icon">sort_by_alpha</i></button>