From 32ab502be56197b9dbc0d7f0966d2363ced0475d Mon Sep 17 00:00:00 2001 From: Fernando Date: Sat, 21 Feb 2015 00:20:33 -0200 Subject: [PATCH] Revert "Fix color in displayShow when manually searching." --- gui/slick/js/ajaxEpSearch.js | 47 ++++++++++++++++++------------------ sickbeard/webserve.py | 7 ++---- 2 files changed, 25 insertions(+), 29 deletions(-) diff --git a/gui/slick/js/ajaxEpSearch.js b/gui/slick/js/ajaxEpSearch.js index da29fbdb..5cb697d6 100644 --- a/gui/slick/js/ajaxEpSearch.js +++ b/gui/slick/js/ajaxEpSearch.js @@ -45,9 +45,9 @@ function updateImages(data) { if (el) { if (ep.searchstatus == 'searching') { //el=$('td#' + ep.season + 'x' + ep.episode + '.search img'); - img.prop('title','Searching'); - img.prop('alt','Searching'); - img.prop('src',sbRoot+'/images/' + loadingImage); + img.attr('title','Searching'); + img.attr('alt','earching'); + img.attr('src',sbRoot+'/images/' + loadingImage); disableLink(el); // Update Status and Quality var rSearchTerm = /(\w+)\s\((.+?)\)/; @@ -56,24 +56,23 @@ function updateImages(data) { } else if (ep.searchstatus == 'queued') { //el=$('td#' + ep.season + 'x' + ep.episode + '.search img'); - img.prop('title','Queued'); - img.prop('alt','queued'); - img.prop('src',sbRoot+'/images/' + queuedImage ); + img.attr('title','Queued'); + img.attr('alt','queued'); + img.attr('src',sbRoot+'/images/' + queuedImage ); disableLink(el); HtmlContent = ep.searchstatus; } else if (ep.searchstatus == 'finished') { //el=$('td#' + ep.season + 'x' + ep.episode + '.search img'); - img.prop('title','Searching'); - img.prop('alt','searching'); - img.parent().prop('class','epRetry'); - img.prop('src',sbRoot+'/images/' + searchImage); + img.attr('title','Searching'); + img.attr('alt','searching'); + img.parent().attr('class','epRetry'); + img.attr('src',sbRoot+'/images/' + searchImage); enableLink(el); // Update Status and Quality var rSearchTerm = /(\w+)\s\((.+?)\)/; HtmlContent = ep.status.replace(rSearchTerm,"$1"+' '+"$2"+''); - parent.closest('tr').prop("class", ep.overview + " season-" + ep.season + " seasonstyle") } // update the status column if it exists @@ -92,13 +91,13 @@ $(document).ready(function () { function enableLink(el) { el.on('click.disabled', false); - el.prop('enableClick', '1'); + el.attr('enableClick', '1'); el.fadeTo("fast", 1) } function disableLink(el) { el.off('click.disabled'); - el.prop('enableClick', '0'); + el.attr('enableClick', '0'); el.fadeTo("fast", .5) } @@ -122,11 +121,11 @@ function disableLink(el) { event.preventDefault(); // Check if we have disabled the click - if ( $(this).prop('enableClick') == '0' ) { + if ( $(this).attr('enableClick') == '0' ) { return false; } - if ( $(this).prop('class') == "epRetry" ) { + if ( $(this).attr('class') == "epRetry" ) { if ( !confirm("Mark download as bad and retry?") ) return false; }; @@ -138,12 +137,12 @@ function disableLink(el) { // Create var for img under anchor and set options for the loading gif img=$(this).children('img'); - img.prop('title','loading'); - img.prop('alt',''); - img.prop('src',sbRoot+'/images/' + options.loadingImage); + img.attr('title','loading'); + img.attr('alt',''); + img.attr('src',sbRoot+'/images/' + options.loadingImage); - $.getJSON($(this).prop('href'), function(data){ + $.getJSON($(this).attr('href'), function(data){ // if they failed then just put the red X if (data.result == 'failure') { @@ -162,15 +161,15 @@ function disableLink(el) { HtmlContent = data.result.replace(rSearchTerm,"$1"+' '+"$2"+''); // update the status column if it exists parent.siblings('.col-status').html(HtmlContent) - // Only if the queuing was successful, disable the onClick event of the loading image + // Only if the queing was succesfull, disable the onClick event of the loading image disableLink(link); } // put the corresponding image as the result of queuing of the manual search - img.prop('title',img_result); - img.prop('alt',img_result); - img.prop('height', options.size); - img.prop('src',sbRoot+"/images/"+img_name); + img.attr('title',img_result); + img.attr('alt',img_result); + img.attr('height', options.size); + img.attr('src',sbRoot+"/images/"+img_name); }); // diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py index 96fcd098..bfdd4a55 100644 --- a/sickbeard/webserve.py +++ b/sickbeard/webserve.py @@ -1824,7 +1824,6 @@ class Home(WebRoot): def getManualSearchStatus(self, show=None, season=None): def getEpisodes(searchThread, searchstatus): results = [] - showObj = sickbeard.helpers.findCertainShow(sickbeard.showList, int(show)) if isinstance(searchThread, sickbeard.search_queue.ManualSearchQueueItem): results.append({'episode': searchThread.segment.episode, @@ -1832,8 +1831,7 @@ class Home(WebRoot): 'season': searchThread.segment.season, 'searchstatus': searchstatus, 'status': statusStrings[searchThread.segment.status], - 'quality': self.getQualityClass(searchThread.segment), - 'overview': Overview.overviewStrings[showObj.getOverview(int(searchThread.segment.status or -1))]}) + 'quality': self.getQualityClass(searchThread.segment)}) else: for epObj in searchThread.segment: results.append({'episode': epObj.episode, @@ -1841,8 +1839,7 @@ class Home(WebRoot): 'season': epObj.season, 'searchstatus': searchstatus, 'status': statusStrings[epObj.status], - 'quality': self.getQualityClass(epObj), - 'overview': Overview.overviewStrings[showObj.getOverview(int(epObj.status or -1))]}) + 'quality': self.getQualityClass(epObj)}) return results