mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
sync updates
This commit is contained in:
parent
f2365aec0e
commit
74d6e3aaad
7 changed files with 4 additions and 11 deletions
|
@ -18,8 +18,8 @@
|
|||
<div class="listTopPaging" style="float: left; position: relative; top: 15px;">
|
||||
</div>
|
||||
|
||||
<!--<button style="display: none;" class="btnClearLog" type="button" data-inline="true" data-icon="forbidden" data-mini="true">Clear</button>-->
|
||||
<div style="float: right; position: relative; top: 15px;margin-top: -5px;display:none;" class="organizeTaskPanel">
|
||||
<button style="display: none;" class="btnClearLog" type="button" data-inline="true" data-icon="forbidden" data-mini="true">Clear</button>
|
||||
<button type="button" class="btnOrganize" data-icon="action" data-mini="true" data-inline="true">${ButtonOrganize}</button>
|
||||
<progress max="100" min="0" style="width:100px;display:none;" class="organizeProgress"></progress>
|
||||
</div>
|
||||
|
|
|
@ -121,6 +121,7 @@
|
|||
<option value="420000">420kbps</option>
|
||||
<option value="400000">400kbps</option>
|
||||
<option value="320000">320kbps</option>
|
||||
<option value="192000">192kbps</option>
|
||||
</select>
|
||||
</div>
|
||||
<br />
|
||||
|
|
|
@ -125,7 +125,6 @@
|
|||
|
||||
Limit: 24,
|
||||
Fields: "PrimaryImageAspectRatio,SyncInfo",
|
||||
IsPlayed: false,
|
||||
ImageTypeLimit: 1,
|
||||
EnableImageTypes: "Primary,Backdrop,Banner,Thumb"
|
||||
};
|
||||
|
|
|
@ -1257,10 +1257,6 @@
|
|||
|
||||
if (options.showChildCountIndicator && item.ChildCount) {
|
||||
cssClass += ' groupedCard';
|
||||
|
||||
if (item.Type == 'Series') {
|
||||
cssClass += ' unplayedGroupings';
|
||||
}
|
||||
}
|
||||
|
||||
if (options.showTitle && !options.overlayText) {
|
||||
|
|
|
@ -512,10 +512,6 @@
|
|||
GroupItems: false
|
||||
};
|
||||
|
||||
if ($(card).hasClass('unplayedGroupings')) {
|
||||
options.IsPlayed = false;
|
||||
}
|
||||
|
||||
var promise2 = ApiClient.getJSON(ApiClient.getUrl('Users/' + userId + '/Items/Latest', options));
|
||||
|
||||
$.when(promise1, promise2).done(function (response1, response2) {
|
||||
|
|
|
@ -84,6 +84,7 @@
|
|||
options.push({ name: '480p - 420kbps', maxWidth: 720, bitrate: 420000 });
|
||||
options.push({ name: '360p', maxWidth: 640, bitrate: 400000 });
|
||||
options.push({ name: '240p', maxWidth: 426, bitrate: 320000 });
|
||||
options.push({ name: '144p', maxWidth: 256, bitrate: 192000 });
|
||||
|
||||
var i, length, option;
|
||||
var selectedIndex = -1;
|
||||
|
|
|
@ -113,7 +113,7 @@ $.fn.taskButton = function (options) {
|
|||
ApiClient.sendWebSocketMessage("ScheduledTasksInfoStop");
|
||||
}
|
||||
|
||||
} else {
|
||||
} else if (this.length) {
|
||||
|
||||
this.on('click.taskbutton', function () {
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue