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

sync updates

Browse source
This commit is contained in:
Luke Pulverenti 2015-03-29 23:04:55 -04:00
parent f2365aec0e
commit 74d6e3aaad
7 changed files with 4 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dashboard-ui/autoorganizelog.html
View file

@ -18,8 +18,8 @@
<div class="listTopPaging" style="float: left; position: relative; top: 15px;"> <div class="listTopPaging" style="float: left; position: relative; top: 15px;">
</div> </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"> <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> <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> <progress max="100" min="0" style="width:100px;display:none;" class="organizeProgress"></progress>
</div> </div>

1
dashboard-ui/mypreferenceswebclient.html
View file

@ -121,6 +121,7 @@
<option value="420000">420kbps</option> <option value="420000">420kbps</option>
<option value="400000">400kbps</option> <option value="400000">400kbps</option>
<option value="320000">320kbps</option> <option value="320000">320kbps</option>
<option value="192000">192kbps</option>
</select> </select>
</div> </div>
<br /> <br />

1
dashboard-ui/scripts/indexpage.js
View file

@ -125,7 +125,6 @@
Limit: 24, Limit: 24,
Fields: "PrimaryImageAspectRatio,SyncInfo", Fields: "PrimaryImageAspectRatio,SyncInfo",
IsPlayed: false,
ImageTypeLimit: 1, ImageTypeLimit: 1,
EnableImageTypes: "Primary,Backdrop,Banner,Thumb" EnableImageTypes: "Primary,Backdrop,Banner,Thumb"
}; };

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

@ -1257,10 +1257,6 @@
if (options.showChildCountIndicator && item.ChildCount) { if (options.showChildCountIndicator && item.ChildCount) {
cssClass += ' groupedCard'; cssClass += ' groupedCard';
if (item.Type == 'Series') {
cssClass += ' unplayedGroupings';
}
} }
if (options.showTitle && !options.overlayText) { if (options.showTitle && !options.overlayText) {

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

@ -512,10 +512,6 @@
GroupItems: false GroupItems: false
}; };
if ($(card).hasClass('unplayedGroupings')) {
options.IsPlayed = false;
}
var promise2 = ApiClient.getJSON(ApiClient.getUrl('Users/' + userId + '/Items/Latest', options)); var promise2 = ApiClient.getJSON(ApiClient.getUrl('Users/' + userId + '/Items/Latest', options));
$.when(promise1, promise2).done(function (response1, response2) { $.when(promise1, promise2).done(function (response1, response2) {

1
dashboard-ui/scripts/mediaplayer.js
View file

@ -84,6 +84,7 @@
options.push({ name: '480p - 420kbps', maxWidth: 720, bitrate: 420000 }); options.push({ name: '480p - 420kbps', maxWidth: 720, bitrate: 420000 });
options.push({ name: '360p', maxWidth: 640, bitrate: 400000 }); options.push({ name: '360p', maxWidth: 640, bitrate: 400000 });
options.push({ name: '240p', maxWidth: 426, bitrate: 320000 }); options.push({ name: '240p', maxWidth: 426, bitrate: 320000 });
options.push({ name: '144p', maxWidth: 256, bitrate: 192000 });
var i, length, option; var i, length, option;
var selectedIndex = -1; var selectedIndex = -1;

2
dashboard-ui/scripts/taskbutton.js
View file

@ -113,7 +113,7 @@ $.fn.taskButton = function (options) {
ApiClient.sendWebSocketMessage("ScheduledTasksInfoStop"); ApiClient.sendWebSocketMessage("ScheduledTasksInfoStop");
} }
} else { } else if (this.length) {
this.on('click.taskbutton', function () { this.on('click.taskbutton', function () {