Merge pull request #1399 from MediaBrowser/master

merge from master
This commit is contained in:
Luke 2016-01-11 21:53:21 -05:00
commit 2c7213d5a3
3 changed files with 77 additions and 7 deletions

View File

@ -66,7 +66,7 @@
<option value="200">200</option>
<option value="300">300</option>
<option value="500">500</option>
<option value="400">400</option>
<option value="10000">10000</option>
</select>
<br />
</div>
@ -103,14 +103,21 @@
<input class="chkStandardFilter" type="checkbox" name="chkResumable" id="chkResumable" data-filter="IsResumable">
<label for="chkResumable">${OptionResumable}</label>
<input class="chkStandardFilter" type="checkbox" name="chkIsFavorite" id="chkIsFavorite" data-filter="IsFavorite">
<label for="chkIsFavorite">${OptionFavorite}</label>
<input class="chkStandardFilter" type="checkbox" name="chkLikes" id="chkLikes" data-filter="Likes">
<label for="chkLikes">${OptionLikes}</label>
<input class="chkStandardFilter" type="checkbox" name="chkDislikes" id="chkDislikes" data-filter="Dislikes">
<label for="chkDislikes">${OptionDislikes}</label>
<div id="isFavoriteDiv">
<label for="isFavorite"></label>
<select id="isFavorite" class="isFavorite">
<option value="-">${OptionFavorite}: All</option>
<option value="true">${OptionFavorite}: True</option>
<option value="false">${OptionFavorite}: False</option>
</select>
</div>
</fieldset>
<br />
@ -128,6 +135,15 @@
<input class="chkYearMismatch" type="checkbox" name="chkYearMismatch" id="chkYearMismatch">
<label for="chkYearMismatch">${OptionFileMetadataYearMismatch}</label>
<input class="chkMissingImdbId" type="checkbox" name="chkMissingImdbId" id="chkMissingImdbId">
<label for="chkMissingImdbId">${OptionMissingImdbId}</label>
<input class="chkMissingTmdbId" type="checkbox" name="chkMissingTmdbId" id="chkMissingTmdbId">
<label for="chkMissingTmdbId">${OptionMissingTmdbId}</label>
<input class="chkMissingTvdbId" type="checkbox" name="chkMissingTvdbId" id="chkMissingTvdbId">
<label for="chkMissingTvdbId">${OptionMissingTvdbId}</label>
</div>
</div>
<fieldset data-role="collapsible" data-collapsed="true" data-mini="true" id="GroupStatus">

View File

@ -6,8 +6,8 @@
require(['paper-fab', 'paper-item-body', 'paper-icon-item'], function () {
var html = '';
var index = '';
var imgUrl;
for (var i = 0, length = timers.length; i < length; i++) {
@ -31,8 +31,8 @@
html += '<paper-icon-item>';
var program = timer.ProgramInfo || {};
var imgUrl;
imgUrl = null;
if (program.ImageTags && program.ImageTags.Primary) {
imgUrl = ApiClient.getScaledImageUrl(program.Id, {

View File

@ -502,8 +502,10 @@
$('#chkMissingRating', page).checked(query.HasOfficialRating == false).checkboxradio('refresh');
$('#chkMissingOverview', page).checked(query.HasOverview == false).checkboxradio('refresh');
$('#chkYearMismatch', page).checked(query.IsYearMismatched == true).checkboxradio('refresh');
$('#chkIsLocked', page).checked(query.IsLocked == true).checkboxradio('refresh');
$('#chkMissingImdbId', page).checked(query.HasImdbId == false).checkboxradio('refresh');
$('#chkMissingTmdbId', page).checked(query.HasTmdbId == false).checkboxradio('refresh');
$('#chkMissingTvdbId', page).checked(query.HasTvdbId == false).checkboxradio('refresh');
//Episodes
$('#chkSpecialEpisode', page).checked(query.ParentIndexNumber == 0).checkboxradio('refresh');
@ -511,6 +513,19 @@
$('#chkFutureEpisode', page).checked(query.IsUnaired == true).checkboxradio('refresh');
$('#selectIncludeItemTypes').val(query.IncludeItemTypes);
// isfavorite
if (query.IsFavorite == true) {
$('#isFavorite').val("true");
}
else if (query.IsFavorite == false) {
$('#isFavorite').val("false");
}
else {
$('#isFavorite').val("-");
}
}
var filtersLoaded;
@ -599,6 +614,21 @@
reloadItems(page);
});
$('#isFavorite', page).on('change', function () {
if (this.value == "true") {
query.IsFavorite = true;
}
else if (this.value == "false") {
query.IsFavorite = false;
}
else {
query.IsFavorite = null;
}
query.StartIndex = 0;
reloadItems(page);
});
$('.chkStandardFilter', this).on('change', function () {
var filterName = this.getAttribute('data-filter');
@ -758,6 +788,30 @@
reloadItems(page);
});
$('#chkMissingImdbId', page).on('change', function () {
query.StartIndex = 0;
query.HasImdbId = this.checked ? false : null;
reloadItems(page);
});
$('#chkMissingTmdbId', page).on('change', function () {
query.StartIndex = 0;
query.HasTmdbId = this.checked ? false : null;
reloadItems(page);
});
$('#chkMissingTvdbId', page).on('change', function () {
query.StartIndex = 0;
query.HasTvdbId = this.checked ? false : null;
reloadItems(page);
});
$('#chkYearMismatch', page).on('change', function () {
query.StartIndex = 0;