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

add additional ignores from librarymonitor

This commit is contained in:
Luke Pulverenti 2016-09-06 23:38:01 -04:00
parent 1efcc067f0
commit 411bc43282
12 changed files with 40 additions and 81 deletions

View file

@ -14,12 +14,12 @@
},
"devDependencies": {},
"ignore": [],
"version": "1.4.219",
"_release": "1.4.219",
"version": "1.4.222",
"_release": "1.4.222",
"_resolution": {
"type": "version",
"tag": "1.4.219",
"commit": "01b409b14bf53cb71f5af887266d0dec0645f7fe"
"tag": "1.4.222",
"commit": "29a8d9be1a6c3bb59bddb54c721c64a8664f9724"
},
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.1",

View file

@ -161,6 +161,7 @@
browser.animate = document.documentElement.animate != null;
browser.tizen = userAgent.toLowerCase().indexOf('tizen') != -1 || userAgent.toLowerCase().indexOf('smarthub') != -1;
browser.web0s = userAgent.toLowerCase().indexOf('Web0S'.toLowerCase()) != -1;
browser.edgeUwp = browser.edge && userAgent.toLowerCase().indexOf('msapphost') != -1;
browser.tv = isTv();
browser.operaTv = browser.tv && userAgent.toLowerCase().indexOf('opr/') != -1;

View file

@ -57,7 +57,7 @@ define(['browser'], function (browser) {
if (browser.tizen) {
return true;
}
if (isEdgeUniversal()) {
if (browser.edgeUwp) {
return true;
}
}
@ -66,7 +66,7 @@ define(['browser'], function (browser) {
if (browser.tizen) {
return true;
}
if (isEdgeUniversal()) {
if (browser.edgeUwp) {
return true;
}
}
@ -94,19 +94,6 @@ define(['browser'], function (browser) {
return false;
}
function isEdgeUniversal() {
if (browser.edge) {
var userAgent = navigator.userAgent.toLowerCase();
if (userAgent.indexOf('msapphost') != -1) {
return true;
}
}
return false;
}
function testCanPlayMkv(videoTestElement) {
if (videoTestElement.canPlayType('video/x-matroska') ||
@ -136,7 +123,7 @@ define(['browser'], function (browser) {
return true;
}
if (isEdgeUniversal()) {
if (browser.edgeUwp) {
return true;
}
@ -157,15 +144,15 @@ define(['browser'], function (browser) {
switch (container) {
case 'asf':
supported = browser.tizen || isEdgeUniversal();
supported = browser.tizen || browser.edgeUwp;
videoAudioCodecs = [];
break;
case 'avi':
supported = isEdgeUniversal();
supported = browser.edgeUwp;
break;
case 'mpg':
case 'mpeg':
supported = isEdgeUniversal();
supported = browser.edgeUwp;
break;
case '3gp':
case 'flv':
@ -176,17 +163,17 @@ define(['browser'], function (browser) {
supported = browser.tizen;
break;
case 'mov':
supported = browser.chrome || isEdgeUniversal();
supported = browser.chrome || browser.edgeUwp;
break;
case 'm2ts':
supported = browser.tizen || browser.web0s || isEdgeUniversal();
supported = browser.tizen || browser.web0s || browser.edgeUwp;
break;
case 'wmv':
supported = browser.tizen || browser.web0s || isEdgeUniversal();
supported = browser.tizen || browser.web0s || browser.edgeUwp;
videoAudioCodecs = [];
break;
case 'ts':
supported = browser.tizen || browser.web0s || isEdgeUniversal();
supported = browser.tizen || browser.web0s || browser.edgeUwp;
profileContainer = 'ts,mpegts';
break;
default:
@ -207,7 +194,7 @@ define(['browser'], function (browser) {
function getMaxBitrate() {
// 10mbps
if (browser.xboxOne) {
if (browser.xboxOne || browser.edgeUwp) {
return 10000000;
}
@ -262,7 +249,7 @@ define(['browser'], function (browser) {
// Only put mp3 first if mkv support is there
// Otherwise with HLS and mp3 audio we're seeing some browsers
// safari is lying
if ((videoTestElement.canPlayType('audio/mp4; codecs="ac-3"').replace(/no/, '') && !browser.safari) || isEdgeUniversal() || browser.tizen) {
if ((videoTestElement.canPlayType('audio/mp4; codecs="ac-3"').replace(/no/, '') && !browser.safari) || browser.edgeUwp || browser.tizen) {
videoAudioCodecs.push('ac3');
// This works in edge desktop, but not mobile
@ -289,7 +276,7 @@ define(['browser'], function (browser) {
hlsVideoAudioCodecs.push('mp3');
}
if (isEdgeUniversal()) {
if (browser.edgeUwp) {
//videoAudioCodecs.push('dca');
//videoAudioCodecs.push('dts');
//videoAudioCodecs.push('truehd');
@ -321,7 +308,7 @@ define(['browser'], function (browser) {
AudioCodec: videoAudioCodecs.join(',')
});
if (isEdgeUniversal()) {
if (browser.edgeUwp) {
profile.DirectPlayProfiles.push({
Container: 'mkv',
Type: 'Video',

View file

@ -4,8 +4,8 @@
function enableNativeMenu() {
if (browser.xboxOne) {
return false;
if (browser.edgeUwp || browser.xboxOne) {
return true;
}
// Doesn't seem to work at all
@ -36,7 +36,7 @@
select.value = value;
}
function showActionSheeet(select) {
function showActionSheet(select) {
var labelElem = getLabel(select);
var title = labelElem ? (labelElem.textContent || labelElem.innerText) : null;
@ -81,7 +81,7 @@
// e.button=0 for primary (left) mouse button click
if (!e.button && !enableNativeMenu()) {
e.preventDefault();
showActionSheeet(this);
showActionSheet(this);
}
}
@ -92,7 +92,7 @@
case 13:
if (!enableNativeMenu()) {
e.preventDefault();
showActionSheeet(this);
showActionSheet(this);
}
return;
case 37:
@ -125,12 +125,6 @@
inputId++;
}
this.removeEventListener('focus', onFocus);
this.removeEventListener('blur', onBlur);
this.removeEventListener('mousedown', onMouseDown);
this.removeEventListener('keydown', onKeyDown);
this.addEventListener('mousedown', onMouseDown);
this.addEventListener('keydown', onKeyDown);

View file

@ -251,7 +251,7 @@ define(['loading', 'dom', 'viewManager', 'skinManager', 'pluginManager', 'backdr
function enableHistory() {
if (browser.xboxOne) {
if (browser.xboxOne || browser.edgeUwp) {
return false;
}

View file

@ -46,7 +46,8 @@ define(['playbackManager', 'inputManager', 'connectionManager', 'embyRouter', 'g
MediaTypes: 'Photo',
Filters: 'IsNotFolder',
ParentId: item.ParentId
ParentId: item.ParentId,
SortBy: 'SortName'
}).then(function (result) {

View file

@ -23,9 +23,17 @@ define(['appSettings', 'events'], function (appsettings, events) {
});
};
function saveServerPreferences() {
var saveTimeout;
function onSaveTimeout() {
saveTimeout = null;
currentApiClient.updateDisplayPreferences('usersettings', displayPrefs, currentUserId, 'emby');
}
function saveServerPreferences() {
if (saveTimeout) {
clearTimeout(saveTimeout);
}
saveTimeout = setTimeout(onSaveTimeout, 50);
}
self.set = function (name, value, enableOnServer) {

View file

@ -40,6 +40,6 @@
"commit": "1f197d9d7874b1e5808b2a5c26f34446a7d912fc"
},
"_source": "git://github.com/Polymer/polymer.git",
"_target": "^1.2.0",
"_target": "^1.1.0",
"_originalSource": "Polymer/polymer"
}

View file

@ -135,9 +135,7 @@ define(['appStorage', 'browser'], function (appStorage, browser) {
features.push('voiceinput');
}
var userAgent = navigator.userAgent.toLowerCase();
if (!browser.mobile || userAgent.indexOf('msapphost') != -1) {
if (!browser.mobile || browser.edgeUwp) {
features.push('htmlaudioautoplay');
features.push('htmlvideoautoplay');
}

View file

@ -1,4 +1,4 @@
<div id="itemDetailPage" data-role="page" class="page libraryPage itemDetailPage noSecondaryNavPage selfBackdropPage" data-theme="b">
<div id="itemDetailPage" data-role="page" class="page libraryPage itemDetailPage noSecondaryNavPage selfBackdropPage" data-theme="b" data-backbutton="true">
<div id="itemBackdrop" class="itemBackdrop noBackdrop">
<div class="itemBackdropContent">

View file

@ -241,36 +241,6 @@
valueChangeEvent: 'click'
});
function parentWithClass(elem, className) {
while (!elem.classList || !elem.classList.contains(className)) {
elem = elem.parentNode;
if (!elem) {
return null;
}
}
return elem;
}
view.addEventListener('click', function (e) {
var mediaItem = parentWithClass(e.target, 'mediaItem');
if (mediaItem) {
var query = getQuery();
var info = libraryBrowser.getListItemInfo(mediaItem);
if (info.mediaType == 'Photo') {
require(['scripts/photos'], function () {
Photos.startSlideshow(view, query, info.id);
});
e.preventDefault();
return false;
}
}
});
function updateFilterControls() {
var query = getQuery();

View file

@ -908,7 +908,7 @@
var backButton = document.querySelector('.headerBackButton');
if (backButton) {
if (Emby.Page.canGoBack()) {
if (page.getAttribute('data-backbutton') == 'true' && Emby.Page.canGoBack()) {
backButton.classList.remove('hide');
} else {
backButton.classList.add('hide');