mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
denormalize seasonid
This commit is contained in:
parent
1fd0fd981a
commit
5ba13ab5a0
14 changed files with 91 additions and 55 deletions
|
@ -15,12 +15,12 @@
|
||||||
},
|
},
|
||||||
"devDependencies": {},
|
"devDependencies": {},
|
||||||
"ignore": [],
|
"ignore": [],
|
||||||
"version": "1.4.63",
|
"version": "1.4.64",
|
||||||
"_release": "1.4.63",
|
"_release": "1.4.64",
|
||||||
"_resolution": {
|
"_resolution": {
|
||||||
"type": "version",
|
"type": "version",
|
||||||
"tag": "1.4.63",
|
"tag": "1.4.64",
|
||||||
"commit": "c557118405664924ccb91634f8dcf9aa2667bcb1"
|
"commit": "171ff7d10d89cb335d98fcfddd34d7d1bf4ebd19"
|
||||||
},
|
},
|
||||||
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
|
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
|
||||||
"_target": "^1.2.0",
|
"_target": "^1.2.0",
|
||||||
|
|
|
@ -28,6 +28,40 @@
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function isStyleSupported(prop, value) {
|
||||||
|
// If no value is supplied, use "inherit"
|
||||||
|
value = arguments.length === 2 ? value : 'inherit';
|
||||||
|
// Try the native standard method first
|
||||||
|
if ('CSS' in window && 'supports' in window.CSS) {
|
||||||
|
return window.CSS.supports(prop, value);
|
||||||
|
}
|
||||||
|
// Check Opera's native method
|
||||||
|
if ('supportsCSS' in window) {
|
||||||
|
return window.supportsCSS(prop, value);
|
||||||
|
}
|
||||||
|
|
||||||
|
// need try/catch because it's failing on tizen
|
||||||
|
|
||||||
|
try {
|
||||||
|
// Convert to camel-case for DOM interactions
|
||||||
|
var camel = prop.replace(/-([a-z]|[0-9])/ig, function (all, letter) {
|
||||||
|
return (letter + '').toUpperCase();
|
||||||
|
});
|
||||||
|
// Check if the property is supported
|
||||||
|
var support = (camel in el.style);
|
||||||
|
// Create test element
|
||||||
|
var el = document.createElement('div');
|
||||||
|
// Assign the property and value to invoke
|
||||||
|
// the CSS interpreter
|
||||||
|
el.style.cssText = prop + ':' + value;
|
||||||
|
// Ensure both the property and value are
|
||||||
|
// supported and return
|
||||||
|
return support && (el.style[camel] !== '');
|
||||||
|
} catch (err) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
var uaMatch = function (ua) {
|
var uaMatch = function (ua) {
|
||||||
ua = ua.toLowerCase();
|
ua = ua.toLowerCase();
|
||||||
|
|
||||||
|
@ -106,7 +140,11 @@
|
||||||
browser.tv = isTv();
|
browser.tv = isTv();
|
||||||
browser.operaTv = browser.tv && userAgent.toLowerCase().indexOf('opr/') != -1;
|
browser.operaTv = browser.tv && userAgent.toLowerCase().indexOf('opr/') != -1;
|
||||||
|
|
||||||
browser.noFlex = (browser.tv && !browser.chrome && !browser.operaTv) || browser.ps4;
|
if (!isStyleSupported('display', 'flex')) {
|
||||||
|
browser.noFlex = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
//browser.noFlex = (browser.tv && !browser.chrome && !browser.operaTv) || browser.ps4;
|
||||||
|
|
||||||
return browser;
|
return browser;
|
||||||
});
|
});
|
|
@ -32,14 +32,14 @@
|
||||||
"web-component-tester": "^4.0.0",
|
"web-component-tester": "^4.0.0",
|
||||||
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.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",
|
"_release": "1.0.8",
|
||||||
"_resolution": {
|
"_resolution": {
|
||||||
"type": "version",
|
"type": "version",
|
||||||
"tag": "v1.0.8",
|
"tag": "v1.0.8",
|
||||||
"commit": "f36b38928849ef3853db727faa8c9ef104d611eb"
|
"commit": "f36b38928849ef3853db727faa8c9ef104d611eb"
|
||||||
},
|
},
|
||||||
"_source": "git://github.com/polymerelements/iron-icon.git",
|
"_source": "git://github.com/PolymerElements/iron-icon.git",
|
||||||
"_target": "^1.0.0",
|
"_target": "^1.0.0",
|
||||||
"_originalSource": "polymerelements/iron-icon"
|
"_originalSource": "PolymerElements/iron-icon"
|
||||||
}
|
}
|
|
@ -36,7 +36,7 @@
|
||||||
"tag": "v1.5.2",
|
"tag": "v1.5.2",
|
||||||
"commit": "18e8e12dcd9a4560de480562f65935feed334b86"
|
"commit": "18e8e12dcd9a4560de480562f65935feed334b86"
|
||||||
},
|
},
|
||||||
"_source": "git://github.com/polymerelements/iron-selector.git",
|
"_source": "git://github.com/PolymerElements/iron-selector.git",
|
||||||
"_target": "^1.0.0",
|
"_target": "^1.0.0",
|
||||||
"_originalSource": "polymerelements/iron-selector"
|
"_originalSource": "PolymerElements/iron-selector"
|
||||||
}
|
}
|
|
@ -22,7 +22,7 @@
|
||||||
IsMissing: false,
|
IsMissing: false,
|
||||||
IsVirtualUnaired: false,
|
IsVirtualUnaired: false,
|
||||||
ImageTypeLimit: 1,
|
ImageTypeLimit: 1,
|
||||||
EnableImageTypes: "Primary,Backdrop,Banner,Thumb",
|
EnableImageTypes: "Primary,Backdrop,Thumb",
|
||||||
StartIndex: 0,
|
StartIndex: 0,
|
||||||
Limit: pageSize
|
Limit: pageSize
|
||||||
},
|
},
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
Fields: "PrimaryImageAspectRatio,SeriesInfo,DateCreated,SyncInfo",
|
Fields: "PrimaryImageAspectRatio,SeriesInfo,DateCreated,SyncInfo",
|
||||||
UserId: Dashboard.getCurrentUserId(),
|
UserId: Dashboard.getCurrentUserId(),
|
||||||
ImageTypeLimit: 1,
|
ImageTypeLimit: 1,
|
||||||
EnableImageTypes: "Primary,Backdrop,Banner,Thumb"
|
EnableImageTypes: "Primary,Backdrop,Thumb"
|
||||||
};
|
};
|
||||||
|
|
||||||
return ApiClient.getNextUpEpisodes(query);
|
return ApiClient.getNextUpEpisodes(query);
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
var query = {
|
var query = {
|
||||||
|
|
||||||
Limit: 40,
|
Limit: 40,
|
||||||
Fields: "AirTime,UserData,SeriesStudio,SyncInfo",
|
Fields: "AirTime,UserData,SyncInfo",
|
||||||
UserId: Dashboard.getCurrentUserId(),
|
UserId: Dashboard.getCurrentUserId(),
|
||||||
ImageTypeLimit: 1,
|
ImageTypeLimit: 1,
|
||||||
EnableImageTypes: "Primary,Backdrop,Banner,Thumb",
|
EnableImageTypes: "Primary,Backdrop,Banner,Thumb",
|
||||||
|
@ -110,7 +110,6 @@
|
||||||
showLocationTypeIndicator: false,
|
showLocationTypeIndicator: false,
|
||||||
shape: getThumbShape(),
|
shape: getThumbShape(),
|
||||||
showTitle: true,
|
showTitle: true,
|
||||||
showPremiereDate: true,
|
|
||||||
preferThumb: true,
|
preferThumb: true,
|
||||||
lazy: true,
|
lazy: true,
|
||||||
showDetailsMenu: true,
|
showDetailsMenu: true,
|
||||||
|
|
|
@ -1330,7 +1330,7 @@
|
||||||
});
|
});
|
||||||
|
|
||||||
}
|
}
|
||||||
else if (item.AlbumId && item.SeriesPrimaryImageTag) {
|
else if (item.SeriesId && item.SeriesPrimaryImageTag) {
|
||||||
|
|
||||||
imgUrl = ApiClient.getScaledImageUrl(item.SeriesId, {
|
imgUrl = ApiClient.getScaledImageUrl(item.SeriesId, {
|
||||||
type: "Primary",
|
type: "Primary",
|
||||||
|
@ -1993,18 +1993,9 @@
|
||||||
enableImageEnhancers: enableImageEnhancers
|
enableImageEnhancers: enableImageEnhancers
|
||||||
});
|
});
|
||||||
|
|
||||||
} else if (options.preferThumb && imageItem.SeriesThumbImageTag && options.inheritThumb !== false) {
|
|
||||||
|
|
||||||
imgUrl = ApiClient.getScaledImageUrl(imageItem.SeriesId, {
|
|
||||||
type: "Thumb",
|
|
||||||
maxWidth: thumbWidth,
|
|
||||||
tag: imageItem.SeriesThumbImageTag,
|
|
||||||
enableImageEnhancers: enableImageEnhancers
|
|
||||||
});
|
|
||||||
|
|
||||||
} else if (options.preferThumb && imageItem.ParentThumbItemId && options.inheritThumb !== false) {
|
} else if (options.preferThumb && imageItem.ParentThumbItemId && options.inheritThumb !== false) {
|
||||||
|
|
||||||
imgUrl = ApiClient.getThumbImageUrl(imageItem.ParentThumbItemId, {
|
imgUrl = ApiClient.getScaledImageUrl(imageItem.ParentThumbItemId, {
|
||||||
type: "Thumb",
|
type: "Thumb",
|
||||||
maxWidth: thumbWidth,
|
maxWidth: thumbWidth,
|
||||||
enableImageEnhancers: enableImageEnhancers
|
enableImageEnhancers: enableImageEnhancers
|
||||||
|
@ -2100,15 +2091,6 @@
|
||||||
enableImageEnhancers: enableImageEnhancers
|
enableImageEnhancers: enableImageEnhancers
|
||||||
});
|
});
|
||||||
|
|
||||||
} else if (imageItem.SeriesThumbImageTag) {
|
|
||||||
|
|
||||||
imgUrl = ApiClient.getScaledImageUrl(imageItem.SeriesId, {
|
|
||||||
type: "Thumb",
|
|
||||||
maxWidth: thumbWidth,
|
|
||||||
tag: imageItem.SeriesThumbImageTag,
|
|
||||||
enableImageEnhancers: enableImageEnhancers
|
|
||||||
});
|
|
||||||
|
|
||||||
} else if (imageItem.ParentThumbItemId) {
|
} else if (imageItem.ParentThumbItemId) {
|
||||||
|
|
||||||
imgUrl = ApiClient.getThumbImageUrl(imageItem, {
|
imgUrl = ApiClient.getThumbImageUrl(imageItem, {
|
||||||
|
@ -2539,6 +2521,8 @@
|
||||||
|
|
||||||
getPremiereDateText: function (item, date) {
|
getPremiereDateText: function (item, date) {
|
||||||
|
|
||||||
|
var studio = (item.Studios || [])[0];
|
||||||
|
|
||||||
if (!date) {
|
if (!date) {
|
||||||
|
|
||||||
var text = '';
|
var text = '';
|
||||||
|
@ -2547,12 +2531,12 @@
|
||||||
text += item.AirTime;
|
text += item.AirTime;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (item.SeriesStudio) {
|
if (studio) {
|
||||||
|
|
||||||
if (text) {
|
if (text) {
|
||||||
text += " on " + item.SeriesStudio;
|
text += " on " + studio;
|
||||||
} else {
|
} else {
|
||||||
text += item.SeriesStudio;
|
text += studio;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2565,8 +2549,8 @@
|
||||||
day += " at " + item.AirTime;
|
day += " at " + item.AirTime;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (item.SeriesStudio) {
|
if (studio) {
|
||||||
day += " on " + item.SeriesStudio;
|
day += " on " + studio;
|
||||||
}
|
}
|
||||||
|
|
||||||
return day;
|
return day;
|
||||||
|
|
|
@ -187,10 +187,15 @@
|
||||||
});
|
});
|
||||||
|
|
||||||
view.addEventListener('viewbeforeshow', function (e) {
|
view.addEventListener('viewbeforeshow', function (e) {
|
||||||
|
document.body.classList.add('hiddenViewMenuBar');
|
||||||
|
document.body.classList.add('hiddenNowPlayingBar');
|
||||||
LibraryMenu.setMenuButtonVisible(false);
|
LibraryMenu.setMenuButtonVisible(false);
|
||||||
});
|
});
|
||||||
|
|
||||||
view.addEventListener('viewbeforehide', function (e) {
|
view.addEventListener('viewbeforehide', function (e) {
|
||||||
|
|
||||||
|
document.body.classList.remove('hiddenViewMenuBar');
|
||||||
|
document.body.classList.remove('hiddenNowPlayingBar');
|
||||||
LibraryMenu.setMenuButtonVisible(true);
|
LibraryMenu.setMenuButtonVisible(true);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
Limit: 100,
|
Limit: 100,
|
||||||
StartIndex: 0,
|
StartIndex: 0,
|
||||||
ImageTypeLimit: 1,
|
ImageTypeLimit: 1,
|
||||||
EnableImageTypes: "Primary,Backdrop,Banner,Thumb"
|
EnableImageTypes: "Primary"
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
Fields: "PrimaryImageAspectRatio,SyncInfo",
|
Fields: "PrimaryImageAspectRatio,SyncInfo",
|
||||||
ParentId: parentId,
|
ParentId: parentId,
|
||||||
ImageTypeLimit: 1,
|
ImageTypeLimit: 1,
|
||||||
EnableImageTypes: "Primary,Backdrop,Banner,Thumb"
|
EnableImageTypes: "Primary,Backdrop,Thumb"
|
||||||
};
|
};
|
||||||
|
|
||||||
return ApiClient.getJSON(ApiClient.getUrl('Users/' + userId + '/Items/Latest', options));
|
return ApiClient.getJSON(ApiClient.getUrl('Users/' + userId + '/Items/Latest', options));
|
||||||
|
|
|
@ -30,7 +30,7 @@
|
||||||
Fields: "PrimaryImageAspectRatio,SeriesInfo,DateCreated,SyncInfo",
|
Fields: "PrimaryImageAspectRatio,SeriesInfo,DateCreated,SyncInfo",
|
||||||
UserId: Dashboard.getCurrentUserId(),
|
UserId: Dashboard.getCurrentUserId(),
|
||||||
ImageTypeLimit: 1,
|
ImageTypeLimit: 1,
|
||||||
EnableImageTypes: "Primary,Backdrop,Banner,Thumb"
|
EnableImageTypes: "Primary,Backdrop,Thumb"
|
||||||
};
|
};
|
||||||
|
|
||||||
query.ParentId = LibraryMenu.getTopParentId();
|
query.ParentId = LibraryMenu.getTopParentId();
|
||||||
|
@ -108,7 +108,7 @@
|
||||||
ExcludeLocationTypes: "Virtual",
|
ExcludeLocationTypes: "Virtual",
|
||||||
ParentId: parentId,
|
ParentId: parentId,
|
||||||
ImageTypeLimit: 1,
|
ImageTypeLimit: 1,
|
||||||
EnableImageTypes: "Primary,Backdrop,Banner,Thumb",
|
EnableImageTypes: "Primary,Backdrop,Thumb",
|
||||||
EnableTotalRecordCount: false
|
EnableTotalRecordCount: false
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
var query = {
|
var query = {
|
||||||
|
|
||||||
Limit: 40,
|
Limit: 40,
|
||||||
Fields: "AirTime,UserData,SeriesStudio,SyncInfo",
|
Fields: "AirTime,UserData,SyncInfo",
|
||||||
UserId: Dashboard.getCurrentUserId(),
|
UserId: Dashboard.getCurrentUserId(),
|
||||||
ImageTypeLimit: 1,
|
ImageTypeLimit: 1,
|
||||||
EnableImageTypes: "Primary,Backdrop,Banner,Thumb",
|
EnableImageTypes: "Primary,Backdrop,Banner,Thumb",
|
||||||
|
@ -112,7 +112,6 @@
|
||||||
showLocationTypeIndicator: false,
|
showLocationTypeIndicator: false,
|
||||||
shape: getThumbShape(),
|
shape: getThumbShape(),
|
||||||
showTitle: true,
|
showTitle: true,
|
||||||
showPremiereDate: true,
|
|
||||||
preferThumb: true,
|
preferThumb: true,
|
||||||
lazy: true,
|
lazy: true,
|
||||||
showDetailsMenu: true,
|
showDetailsMenu: true,
|
||||||
|
|
|
@ -1,19 +1,30 @@
|
||||||
<div id="searchPage" data-role="page" class="page libraryPage allLibraryPage noSecondaryNavPage" data-title="${ButtonSearch}" data-backbutton="true">
|
<div id="searchPage" data-role="page" class="page libraryPage allLibraryPage noSecondaryNavPage" data-title="${ButtonSearch}" data-backbutton="true" style="padding-top:0!important;">
|
||||||
|
|
||||||
<button is="paper-icon-button-light" style="position: absolute; top: .5em; left: .5em; z-index: 1;" tabindex="-1" class="btnBack autoSize">
|
<style>
|
||||||
|
@media all and (max-width: 800px) {
|
||||||
|
|
||||||
|
.txtSearch {
|
||||||
|
text-indent: 7.5%;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@media all and (max-width: 500px) {
|
||||||
|
|
||||||
|
.txtSearch {
|
||||||
|
text-indent: 10%;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<button is="paper-icon-button-light" style="position: absolute; top: .6em; left: 0; z-index: 1;" tabindex="-1" class="btnBack autoSize">
|
||||||
<i class="md-icon">arrow_back</i>
|
<i class="md-icon">arrow_back</i>
|
||||||
</button>
|
</button>
|
||||||
|
|
||||||
<div data-role="content">
|
<div data-role="content" style="padding-top:0!important;padding-left:0!important;padding-right:0!important;">
|
||||||
<div class="readOnlyContent" style="text-align: center;margin: 0 auto;">
|
<div class="readOnlyContent" style="text-align: center;margin: 0 auto;">
|
||||||
|
|
||||||
<div class="inputContainer" style="margin-bottom:1em;">
|
<div class="inputContainer searchInputContainer" style="margin-bottom:1em;">
|
||||||
<div style="display: flex; align-items: center;">
|
<input is="emby-input" class="txtSearch" autocomplete="off" placeholder="${ButtonSearch}" autofocus />
|
||||||
<i class="md-icon" style="width:28px;height:28px;font-size:28px;color:#aaa;">search</i>
|
|
||||||
<div style="flex-grow:1;">
|
|
||||||
<input is="emby-input" class="txtSearch" autocomplete="off" autofocus />
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="textSuggestions hide">
|
<div class="textSuggestions hide">
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue