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-05-24 12:58:12 -04:00
parent 9e44f71761
commit bbe5c49524
10 changed files with 69 additions and 49 deletions

View file

@ -16,12 +16,12 @@
}, },
"devDependencies": {}, "devDependencies": {},
"ignore": [], "ignore": [],
"version": "1.1.56", "version": "1.1.57",
"_release": "1.1.56", "_release": "1.1.57",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "1.1.56", "tag": "1.1.57",
"commit": "f0c16b99c8523abcbd5f514d938e520448d6349d" "commit": "80da1038922e66fc43774cb9e5a1df999f303295"
}, },
"_source": "https://github.com/MediaBrowser/Emby.ApiClient.Javascript.git", "_source": "https://github.com/MediaBrowser/Emby.ApiClient.Javascript.git",
"_target": "^1.1.51", "_target": "^1.1.51",

View file

@ -2980,6 +2980,19 @@
return self.getJSON(url); return self.getJSON(url);
}; };
self.getGameSystems = function () {
var options = {};
if (userId) {
options.userId = userId;
}
var url = self.getUrl("Games/SystemSummaries", options);
return self.getJSON(url);
};
self.getAdditionalVideoParts = function (userId, itemId) { self.getAdditionalVideoParts = function (userId, itemId) {
if (!itemId) { if (!itemId) {

View file

@ -16,12 +16,12 @@
}, },
"devDependencies": {}, "devDependencies": {},
"ignore": [], "ignore": [],
"version": "1.3.74", "version": "1.3.79",
"_release": "1.3.74", "_release": "1.3.79",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "1.3.74", "tag": "1.3.79",
"commit": "cb08b23d4989aaab3ee4b4ba5069eee6a96e04ad" "commit": "0365f630017335cdce79e783cffcac271846a32d"
}, },
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git", "_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.0", "_target": "^1.2.0",

View file

@ -4,6 +4,10 @@
function enableNativeMenu() { function enableNativeMenu() {
if (browser.xboxOne) {
return false;
}
// Take advantage of the native input methods // Take advantage of the native input methods
if (browser.tv) { if (browser.tv) {
return true; return true;
@ -122,6 +126,7 @@
var label = this.ownerDocument.createElement('label'); var label = this.ownerDocument.createElement('label');
label.innerHTML = this.getAttribute('label') || ''; label.innerHTML = this.getAttribute('label') || '';
label.classList.add('selectLabel'); label.classList.add('selectLabel');
label.classList.add('selectLabelUnfocused');
label.htmlFor = this.id; label.htmlFor = this.id;
this.parentNode.insertBefore(label, this); this.parentNode.insertBefore(label, this);

View file

@ -46,13 +46,6 @@
} }
} }
@media all and (max-height: 1400px) {
.itemOverview {
display: none;
}
}
.layout-tv .formDialog .dialogHeader { .layout-tv .formDialog .dialogHeader {
padding-top: 1.5em; padding-top: 1.5em;
padding-bottom: 1.5em; padding-bottom: 1.5em;

View file

@ -5,3 +5,10 @@
.layout-tv .btnHeaderSave { .layout-tv .btnHeaderSave {
display: none; display: none;
} }
@media all and (max-height: 1400px) {
.layout-tv .recordingDialog .itemOverview {
display: none;
}
}

View file

@ -1,16 +1,13 @@
define(['browser'], function (browser) { define(['browser'], function (browser) {
var allPages = document.querySelectorAll('.mainAnimatedPage'); var mainAnimatedPages = document.querySelector('.mainAnimatedPages');
var allPages = [];
var currentUrls = []; var currentUrls = [];
var pageContainerCount = allPages.length; var pageContainerCount = 3;
var allowAnimation = true;
var selectedPageIndex = -1; var selectedPageIndex = -1;
function enableAnimation() { function enableAnimation() {
if (!allowAnimation) {
return false;
}
if (browser.tv) { if (browser.tv) {
return false; return false;
} }
@ -26,7 +23,7 @@ define(['browser'], function (browser) {
cancelActiveAnimations(); cancelActiveAnimations();
var selected = getSelectedIndex(allPages); var selected = selectedPageIndex;
var previousAnimatable = selected == -1 ? null : allPages[selected]; var previousAnimatable = selected == -1 ? null : allPages[selected];
var pageIndex = selected + 1; var pageIndex = selected + 1;
@ -35,23 +32,26 @@ define(['browser'], function (browser) {
} }
var view = document.createElement('div'); var view = document.createElement('div');
view.classList.add('page-view');
if (options.type) { if (options.type) {
view.setAttribute('data-type', options.type); view.setAttribute('data-type', options.type);
} }
view.innerHTML = options.view; view.innerHTML = options.view;
var animatable = allPages[pageIndex]; var currentPage = allPages[pageIndex];
var animatable = view;
var currentPage = animatable.querySelector('.page-view'); view.classList.add('mainAnimatedPage');
if (currentPage) { if (currentPage) {
triggerDestroy(currentPage); triggerDestroy(currentPage);
animatable.replaceChild(view, currentPage); mainAnimatedPages.replaceChild(view, currentPage);
} else { } else {
animatable.appendChild(view); mainAnimatedPages.appendChild(view);
} }
allPages[pageIndex] = view;
if (onBeforeChange) { if (onBeforeChange) {
onBeforeChange(view, false, options); onBeforeChange(view, false, options);
} }
@ -101,12 +101,6 @@ define(['browser'], function (browser) {
} }
} }
return nullAnimation(newAnimatedPage, oldAnimatedPage, transition, isBack);
}
function nullAnimation(newAnimatedPage, oldAnimatedPage, transition, isBack) {
newAnimatedPage.classList.remove('hide');
return Promise.resolve(); return Promise.resolve();
} }
@ -133,8 +127,6 @@ define(['browser'], function (browser) {
], timings)); ], timings));
} }
newAnimatedPage.classList.remove('hide');
var start = isBack ? '-100%' : '100%'; var start = isBack ? '-100%' : '100%';
animations.push(newAnimatedPage.animate([ animations.push(newAnimatedPage.animate([
@ -171,8 +163,6 @@ define(['browser'], function (browser) {
], timings)); ], timings));
} }
newAnimatedPage.classList.remove('hide');
animations.push(newAnimatedPage.animate([ animations.push(newAnimatedPage.animate([
{ opacity: 0, offset: 0 }, { opacity: 0, offset: 0 },
@ -209,19 +199,15 @@ define(['browser'], function (browser) {
onBeforeChange = fn; onBeforeChange = fn;
} }
function getSelectedIndex(allPages) {
return selectedPageIndex;
}
function tryRestoreView(options) { function tryRestoreView(options) {
var url = options.url; var url = options.url;
var index = currentUrls.indexOf(url); var index = currentUrls.indexOf(url);
if (index != -1) { if (index != -1) {
var page = allPages[index];
var view = page.querySelector(".page-view"); var animatable = allPages[index];
var view = animatable;
if (view) { if (view) {
@ -231,8 +217,7 @@ define(['browser'], function (browser) {
cancelActiveAnimations(); cancelActiveAnimations();
var animatable = allPages[index]; var selected = selectedPageIndex;
var selected = getSelectedIndex(allPages);
var previousAnimatable = selected == -1 ? null : allPages[selected]; var previousAnimatable = selected == -1 ? null : allPages[selected];
if (onBeforeChange) { if (onBeforeChange) {
@ -241,6 +226,8 @@ define(['browser'], function (browser) {
beforeAnimate(allPages, index, selected); beforeAnimate(allPages, index, selected);
animatable.classList.remove('hide');
return animate(animatable, previousAnimatable, options.transition, options.isBack).then(function () { return animate(animatable, previousAnimatable, options.transition, options.isBack).then(function () {
selectedPageIndex = index; selectedPageIndex = index;
@ -261,7 +248,10 @@ define(['browser'], function (browser) {
function reset() { function reset() {
allPages = [];
currentUrls = []; currentUrls = [];
mainAnimatedPages.innerHTML = '';
selectedPageIndex = -1;
} }
if (enableAnimation() && !document.documentElement.animate) { if (enableAnimation() && !document.documentElement.animate) {

View file

@ -120,8 +120,8 @@ define(['viewcontainer', 'focusManager', 'queryString', 'connectionManager', 'ev
document.addEventListener('skinunload', resetCachedViews); document.addEventListener('skinunload', resetCachedViews);
events.on(connectionManager, 'localusersignedin', resetCachedViews); //events.on(connectionManager, 'localusersignedin', resetCachedViews);
events.on(connectionManager, 'localusersignedout', resetCachedViews); //events.on(connectionManager, 'localusersignedout', resetCachedViews);
function tryRestoreInternal(viewcontainer, options, resolve, reject) { function tryRestoreInternal(viewcontainer, options, resolve, reject) {

View file

@ -34,6 +34,6 @@
"commit": "11c987b2eb3c73b388a79fc8aaea8ca01624f514" "commit": "11c987b2eb3c73b388a79fc8aaea8ca01624f514"
}, },
"_source": "git://github.com/Polymer/polymer.git", "_source": "git://github.com/Polymer/polymer.git",
"_target": "^1.0.0", "_target": "^1.1.0",
"_originalSource": "Polymer/polymer" "_originalSource": "Polymer/polymer"
} }

View file

@ -1280,6 +1280,18 @@ var Dashboard = {
Method: 'Embed' Method: 'Embed'
}); });
profile.CodecProfiles.push({
Type: 'Video',
Container: 'avi',
Conditions: [
{
Condition: 'NotEqual',
Property: 'CodecTag',
Value: 'xvid'
}
]
});
profile.CodecProfiles.push({ profile.CodecProfiles.push({
Type: 'VideoAudio', Type: 'VideoAudio',
Codec: 'aac,mp3', Codec: 'aac,mp3',