Private GIT

Skip to content
Snippets Groups Projects
Commit ccf37306 authored by Dustyn Gibson's avatar Dustyn Gibson
Browse files

Merge branch 'develop'

parents 011e9e79 101f5c3a
Branches
Tags V4.2.0.01
No related merge requests found
Showing
with 276 additions and 1546 deletions
......@@ -17,6 +17,13 @@ module.exports = function(grunt) {
],
'bootstrap-formhelpers': [
'dist/js/bootstrap-formhelpers.min.js'
],
'isotope': [
"dist/isotope.pkgd.min.js"
],
"outlayer": [
"item.js",
"outlayer.js"
]
},
bowerOptions: {
......
......@@ -14,7 +14,6 @@
"bootstrap": "~3.3.5",
"bootstrap-hover-dropdown": "~2.1.3",
"jquery-ui": "~1.11.4",
"jquery-form": "~3.46.0",
"jquery-timeago": "~1.4.3",
"jquery-tokeninput": "~1.7.0",
"bootstrap3-typeahead": "~3.1.1",
......@@ -24,6 +23,7 @@
"qtip2": "~2.2.1",
"tablesorter": "jquery.tablesorter#~2.24.5",
"jquery-confirm": "~2.5.2",
"bootstrap-formhelpers": "~2.3.0"
"bootstrap-formhelpers": "~2.3.0",
"isotope": "~2.2.2"
}
}
......@@ -28,6 +28,7 @@
"_": true,
"bootbox": true,
"PNotify": true,
"anonURL": true
"anonURL": true,
"window": true
}
}
This diff is collapsed.
File suppressed by a .gitattributes entry, the file's encoding is unsupported, or the file size exceeds the limit.
......@@ -37,8 +37,7 @@ $(document).ready(function(){
$(name+':visible').each(function() {
switch (found) {
case 2: return false;
case 1:
this.checked = lastCheck.checked;
case 1: this.checked = lastCheck.checked;
}
if (this === check || this === lastCheck) { found++; }
......
File suppressed by a .gitattributes entry, the file's encoding is unsupported, or the file size exceeds the limit.
File suppressed by a .gitattributes entry, the file's encoding is unsupported, or the file size exceeds the limit.
This diff is collapsed.
$(document).ready(function() {
});
$(document).ready(function() {
function makeRow(indexerId, season, episode, name, subtitles, checked) {
checked = checked ? ' checked' : '';
var row = '';
row += ' <tr class="good show-' + indexerId + '">';
row += ' <td align="center"><input type="checkbox" class="'+indexerId+'-epcheck" name="'+indexerId+'-'+season+'x'+episode+'"'+checked+'></td>';
row += ' <td style="width: 1%;">'+season+'x'+episode+'</td>';
row += ' <td>'+name+'</td>';
row += ' </tr>';
return row;
}
$('.allCheck').click(function(){
var indexerId = $(this).attr('id').split('-')[1];
$('.'+indexerId+'-epcheck').prop('checked', $(this).prop('checked'));
});
$('.get_more_eps').click(function(){
var indexerId = $(this).attr('id');
var checked = $('#allCheck-'+indexerId).prop('checked');
var lastRow = $('tr#'+indexerId);
var clicked = $(this).attr('data-clicked');
var action = $(this).attr('value');
if (!clicked) {
$.getJSON(srRoot + '/manage/showSubtitleMissed', {
indexer_id: indexerId, // jshint ignore:line
whichSubs: $('#selectSubLang').val()
}, function(data) {
$.each(data, function(season, eps) {
$.each(eps, function(episode, data) {
//alert(season+'x'+episode+': '+name);
lastRow.after(makeRow(indexerId, season, episode, data.name, data.subtitles, checked));
});
});
});
$(this).attr('data-clicked', 1);
$(this).prop('value', 'Collapse');
} else {
if (action === 'Collapse') {
$('table tr').filter('.show-' + indexerId).hide();
$(this).prop('value', 'Expand');
} else if (action === 'Expand') {
$('table tr').filter('.show-' + indexerId).show();
$(this).prop('value', 'Collapse');
}
}
});
// selects all visible episode checkboxes.
$('.selectAllShows').click(function(){
$('.allCheck').each(function(){
this.checked = true;
});
$('input[class*="-epcheck"]').each(function(){
this.checked = true;
});
});
// clears all visible episode checkboxes and the season selectors
$('.unselectAllShows').click(function(){
$('.allCheck').each(function(){
this.checked = false;
});
$('input[class*="-epcheck"]').each(function(){
this.checked = false;
});
});
});
......@@ -89,8 +89,7 @@ $(document).ready(function(){
$(name).each(function() {
switch (found) {
case 2: return false;
case 1:
if(!this.disabled) { this.checked = lastCheck.checked; }
case 1: if(!this.disabled) { this.checked = lastCheck.checked; }
}
if(this === check || this === lastCheck) { found++; }
});
......
......@@ -7,8 +7,8 @@ $(document).ready(function() {
$('#customQuality').hide();
}
$('#anyQualities option').each(function(i) {
var result = preset & $(this).val(); // I have no clue what the & does here
$('#anyQualities option').each(function() {
var result = preset & $(this).val(); // @TODO Find out what this does
if (result > 0) {
$(this).attr('selected', 'selected');
} else {
......@@ -16,8 +16,8 @@ $(document).ready(function() {
}
});
$('#bestQualities option').each(function(i) {
var result = preset & ($(this).val() << 16); // I have no clue what the & does here
$('#bestQualities option').each(function() {
var result = preset & ($(this).val() << 16); // @TODO Find out what this does
if (result > 0) {
$(this).attr('selected', 'selected');
} else {
......
......@@ -49,13 +49,13 @@ $(document).ready(function() {
});
}
function ajaxError(x, e) {
function ajaxError(x) {
if (console_debug) { // jshint ignore:line
if (x.status === 0) {
console.log(console_prefix + 'isAlive: Sickrage is not responding.');
} else if (x.status == 404) {
} else if (x.status === 404) {
console.log(console_prefix + 'isAlive: Requested URL not found.');
} else if (x.status == 500) {
} else if (x.status === 500) {
console.log(console_prefix + 'isAlive: Internel Server Error.');
} else {
console.log(console_prefix + 'isAlive: Unknow Error.\n' + x.responseText);
......
File suppressed by a .gitattributes entry, the file's encoding is unsupported, or the file size exceeds the limit.
......@@ -185,9 +185,9 @@
var commands = ${sorted(commands)};
var episodes = ${episodes};
</script>
<script type="text/javascript" src="${srRoot}/js/_bower.min.js?${sbPID}"></script>
<script type="text/javascript" src="${srRoot}/js/vender.min.js?${sbPID}"></script>
<script type="text/javascript" src="${srRoot}/js/new/meta.js?${sbPID}"></script>
<script type="text/javascript" src="${srRoot}/js/new/core.js?${sbPID}"></script>
<script type="text/javascript" src="${srRoot}/js/core.min.js?${sbPID}"></script>
<script type="text/javascript" src="${srRoot}/js/apibuilder.js?${sbPID}"></script>
</body>
</html>
......
......@@ -10,10 +10,6 @@
from sickbeard import metadata
from sickbeard.metadata.generic import GenericMetadata
%>
<%block name="scripts">
<script type="text/javascript" src="${srRoot}/js/configBackupRestore.js?${sbPID}"></script>
<script type="text/javascript" src="${srRoot}/js/new/config_backuprestore.js"></script>
</%block>
<%block name="content">
% if not header is UNDEFINED:
<h1 class="header">${header}</h1>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment