Change javascript urls in templates to allow proper caching

10 years ago · a019e13a75
24 changed files with 57 additions and 55 deletions
--- a/CHANGES.md
+++ b/CHANGES.md
@ -30,7 +30,9 @@
 * Add SceneTime torrent provider
 * Change TtN provider to parse new layout
 * Improve recognition of SD quality
-* Fix halting in mid flow of Add Existing Show which resulted in failure to scan statuses and filesizes 
+* Fix halting in mid flow of Add Existing Show which resulted in failure to scan statuses and filesizes
+* Change default de-referrer url to blank
+* Change javascript urls in templates to allow proper caching


 ### 0.10.0 (2015-08-06 11:05:00 UTC)
--- a/gui/slick/interfaces/default/apiBuilder.tmpl
+++ b/gui/slick/interfaces/default/apiBuilder.tmpl
@ -8,8 +8,8 @@
 sbRoot = "$sbRoot";
 //-->
 </script>
-<script type="text/javascript" src="$sbRoot/js/lib/jquery-1.8.3.min.js?$sbPID"></script>
-<script type="text/javascript" src="$sbRoot/js/apibuilder.js?$sbPID"></script>
+<script type="text/javascript" src="$sbRoot/js/lib/jquery-1.8.3.min.js?v=$sbPID"></script>
+<script type="text/javascript" src="$sbRoot/js/apibuilder.js?v=$sbPID"></script>

 <style type="text/css">
 <!--
--- a/gui/slick/interfaces/default/config_anime.tmpl
+++ b/gui/slick/interfaces/default/config_anime.tmpl
@ -8,7 +8,7 @@
 ##
 #include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_top.tmpl')

-<script type="text/javascript" src="$sbRoot/js/config.js?$sbPID"></script>
+<script type="text/javascript" src="$sbRoot/js/config.js?v=$sbPID"></script>

 #if $varExists('header')
 	<h1 class="header">$header</h1>
--- a/gui/slick/interfaces/default/config_general.tmpl
+++ b/gui/slick/interfaces/default/config_general.tmpl
@ -32,8 +32,8 @@
    #set $indexer = $sickbeard.INDEXER_DEFAULT
 #end if

-<script type="text/javascript" src="$sbRoot/js/config.js?$sbPID"></script>
-<script type="text/javascript" src="$sbRoot/js/rootDirs.js?$sbPID"></script>
+<script type="text/javascript" src="$sbRoot/js/config.js?v=$sbPID"></script>
+<script type="text/javascript" src="$sbRoot/js/rootDirs.js?v=$sbPID"></script>

 <div id="config">
 	<div id="config-content">
--- a/gui/slick/interfaces/default/config_notifications.tmpl
+++ b/gui/slick/interfaces/default/config_notifications.tmpl
@ -9,8 +9,8 @@
 ##
 #include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_top.tmpl')

-<script type="text/javascript" src="$sbRoot/js/configNotifications.js?$sbPID"></script>
-<script type="text/javascript" src="$sbRoot/js/config.js?$sbPID"></script>
+<script type="text/javascript" src="$sbRoot/js/configNotifications.js?v=$sbPID"></script>
+<script type="text/javascript" src="$sbRoot/js/config.js?v=$sbPID"></script>

 #if $varExists('header') 
 	<h1 class="header">$header</h1>
--- a/gui/slick/interfaces/default/config_postProcessing.tmpl
+++ b/gui/slick/interfaces/default/config_postProcessing.tmpl
@ -14,8 +14,8 @@
 #import os.path
 #include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_top.tmpl')

-<script type="text/javascript" src="$sbRoot/js/configPostProcessing.js?$sbPID"></script>
-<script type="text/javascript" src="$sbRoot/js/config.js?$sbPID"></script>
+<script type="text/javascript" src="$sbRoot/js/configPostProcessing.js?v=$sbPID"></script>
+<script type="text/javascript" src="$sbRoot/js/config.js?v=$sbPID"></script>

 #if $varExists('header') 
 	<h1 class="header">$header</h1>
--- a/gui/slick/interfaces/default/config_providers.tmpl
+++ b/gui/slick/interfaces/default/config_providers.tmpl
@ -17,8 +17,8 @@
 	<h1 class="title">$title</h1>
 #end if

-<script type="text/javascript" src="$sbRoot/js/configProviders.js?$sbPID"></script>
-<script type="text/javascript" src="$sbRoot/js/config.js?$sbPID"></script>
+<script type="text/javascript" src="$sbRoot/js/configProviders.js?v=$sbPID"></script>
+<script type="text/javascript" src="$sbRoot/js/config.js?v=$sbPID"></script>

 #set $methods_notused = []
 #if not $sickbeard.USE_NZBS
--- a/gui/slick/interfaces/default/config_search.tmpl
+++ b/gui/slick/interfaces/default/config_search.tmpl
@ -10,8 +10,8 @@
 #import os.path
 #include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_top.tmpl')

-<script type="text/javascript" src="$sbRoot/js/configSearch.js?$sbPID"></script>
-<script type="text/javascript" src="$sbRoot/js/config.js?$sbPID"></script>
+<script type="text/javascript" src="$sbRoot/js/configSearch.js?v=$sbPID"></script>
+<script type="text/javascript" src="$sbRoot/js/config.js?v=$sbPID"></script>

 #if $varExists('header')
 	<h1 class="header">$header</h1>
--- a/gui/slick/interfaces/default/config_subtitles.tmpl
+++ b/gui/slick/interfaces/default/config_subtitles.tmpl
@ -10,7 +10,7 @@
 #import os.path
 #include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_top.tmpl')

-<script type="text/javascript" src="$sbRoot/js/configSubtitles.js?$sbPID"></script>
+<script type="text/javascript" src="$sbRoot/js/configSubtitles.js?v=$sbPID"></script>
 <script type="text/javascript" src="$sbRoot/js/config.js"></script>
 <script type="text/javascript" src="$sbRoot/js/lib/jquery.tokeninput.js"></script>

--- a/gui/slick/interfaces/default/displayShow.tmpl
+++ b/gui/slick/interfaces/default/displayShow.tmpl
@ -15,19 +15,19 @@
 #import os.path, os
 #include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_top.tmpl')

-<script type="text/javascript" src="$sbRoot/js/lib/jquery.bookmarkscroll.js?$sbPID"></script>
+<script type="text/javascript" src="$sbRoot/js/lib/jquery.bookmarkscroll.js?v=$sbPID"></script>

 <input type="hidden" id="sbRoot" value="$sbRoot">

-<script type="text/javascript" src="$sbRoot/js/displayShow.js?$sbPID"></script>
-<script type="text/javascript" src="$sbRoot/js/plotTooltip.js?$sbPID"></script>
-<script type="text/javascript" src="$sbRoot/js/sceneExceptionsTooltip.js?$sbPID"></script>
+<script type="text/javascript" src="$sbRoot/js/displayShow.js?v=$sbPID"></script>
+<script type="text/javascript" src="$sbRoot/js/plotTooltip.js?v=$sbPID"></script>
+<script type="text/javascript" src="$sbRoot/js/sceneExceptionsTooltip.js?v=$sbPID"></script>
 #if $sickbeard.USE_IMDB_INFO
-<script type="text/javascript" src="$sbRoot/js/ratingTooltip.js?$sbPID"></script>
+<script type="text/javascript" src="$sbRoot/js/ratingTooltip.js?v=$sbPID"></script>
 #end if
-<script type="text/javascript" src="$sbRoot/js/ajaxEpSearch.js?$sbPID"></script>
-<script type="text/javascript" src="$sbRoot/js/ajaxEpSubtitles.js?$sbPID"></script>
-<script type="text/javascript" src="$sbRoot/js/lib/jquery.collapser.min.js?$sbPID"></script>
+<script type="text/javascript" src="$sbRoot/js/ajaxEpSearch.js?v=$sbPID"></script>
+<script type="text/javascript" src="$sbRoot/js/ajaxEpSubtitles.js?v=$sbPID"></script>
+<script type="text/javascript" src="$sbRoot/js/lib/jquery.collapser.min.js?v=$sbPID"></script>
 <script type="text/javascript" charset="utf-8">
 <!--
 \$(document).ready(function(){
--- a/gui/slick/interfaces/default/editShow.tmpl
+++ b/gui/slick/interfaces/default/editShow.tmpl
@ -13,7 +13,7 @@
 #import os.path
 #include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_top.tmpl')

-<script type="text/javascript" src="$sbRoot/js/qualityChooser.js?$sbPID"></script>
+<script type="text/javascript" src="$sbRoot/js/qualityChooser.js?v=$sbPID"></script>
 <script type="text/javascript" charset="utf-8">
 <!--
 \$(document).ready(function(){
@ -248,7 +248,7 @@
 #if $show.is_anime:
    #import sickbeard.blackandwhitelist
    #include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_blackwhitelist.tmpl')
-		<script type="text/javascript" src="$sbRoot/js/blackwhite.js?$sbPID"></script>
+		<script type="text/javascript" src="$sbRoot/js/blackwhite.js?v=$sbPID"></script>
 #end if
 		<input type="submit" id="submit" value="Submit" class="btn btn-primary" />
 	</form>
--- a/gui/slick/interfaces/default/episodeView.tmpl
+++ b/gui/slick/interfaces/default/episodeView.tmpl
@ -20,7 +20,7 @@
 #end if

 #if 'daybyday' != $layout:
-<script type="text/javascript" src="$sbRoot/js/ajaxEpSearch.js?$sbPID"></script>
+<script type="text/javascript" src="$sbRoot/js/ajaxEpSearch.js?v=$sbPID"></script>
 #end if

 #if $varExists('header')
@ -30,7 +30,7 @@
 #end if

 #if 'daybyday' == $layout:
-<script type="text/javascript" src="$sbRoot/js/plotTooltip.js?$sbPID"></script>
+<script type="text/javascript" src="$sbRoot/js/plotTooltip.js?v=$sbPID"></script>
 <script type="text/javascript" charset="utf-8">
 <!--
    \$(document).ready(function(){
@ -201,7 +201,7 @@
 #if 'list' == $layout:
 <!-- start list view //-->

-<script type="text/javascript" src="$sbRoot/js/plotTooltip.js?$sbPID"></script>
+<script type="text/javascript" src="$sbRoot/js/plotTooltip.js?v=$sbPID"></script>
 <script type="text/javascript" charset="utf-8">
 <!--
 	\$.tablesorter.addParser({
--- a/gui/slick/interfaces/default/home_addExistingShow.tmpl
+++ b/gui/slick/interfaces/default/home_addExistingShow.tmpl
@ -10,10 +10,10 @@
 #import os.path
 #include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_top.tmpl')

-<script type="text/javascript" src="$sbRoot/js/qualityChooser.js?$sbPID"></script>
-<script type="text/javascript" src="$sbRoot/js/addExistingShow.js?$sbPID"></script>
-<script type="text/javascript" src="$sbRoot/js/rootDirs.js?$sbPID"></script>
-<script type="text/javascript" src="$sbRoot/js/addShowOptions.js?$sbPID"></script> 
+<script type="text/javascript" src="$sbRoot/js/qualityChooser.js?v=$sbPID"></script>
+<script type="text/javascript" src="$sbRoot/js/addExistingShow.js?v=$sbPID"></script>
+<script type="text/javascript" src="$sbRoot/js/rootDirs.js?v=$sbPID"></script>
+<script type="text/javascript" src="$sbRoot/js/addShowOptions.js?v=$sbPID"></script>

 <script type="text/javascript" charset="utf-8">
 <!--
--- a/gui/slick/interfaces/default/home_newShow.tmpl
+++ b/gui/slick/interfaces/default/home_newShow.tmpl
@ -14,10 +14,10 @@
 	var show_scene_maps = ${show_scene_maps}
 </script>

-<script type="text/javascript" src="$sbRoot/js/formwizard.js?$sbPID"></script>
-<script type="text/javascript" src="$sbRoot/js/qualityChooser.js?$sbPID"></script>
-<script type="text/javascript" src="$sbRoot/js/newShow.js?$sbPID"></script>
-<script type="text/javascript" src="$sbRoot/js/addShowOptions.js?$sbPID"></script>
+<script type="text/javascript" src="$sbRoot/js/formwizard.js?v=$sbPID"></script>
+<script type="text/javascript" src="$sbRoot/js/qualityChooser.js?v=$sbPID"></script>
+<script type="text/javascript" src="$sbRoot/js/newShow.js?v=$sbPID"></script>
+<script type="text/javascript" src="$sbRoot/js/addShowOptions.js?v=$sbPID"></script>

 #if $varExists('header')
 	<h1 class="header">$header</h1>
@ -111,8 +111,8 @@
 #end if
 	</div>

-<script type="text/javascript" src="$sbRoot/js/rootDirs.js?$sbPID"></script>
-<script type="text/javascript" src="$sbRoot/js/blackwhite.js?$sbPID"></script>
+<script type="text/javascript" src="$sbRoot/js/rootDirs.js?v=$sbPID"></script>
+<script type="text/javascript" src="$sbRoot/js/blackwhite.js?v=$sbPID"></script>

 </div></div>

--- a/gui/slick/interfaces/default/home_recommendedShows.tmpl
+++ b/gui/slick/interfaces/default/home_recommendedShows.tmpl
@ -11,10 +11,10 @@
 #import os.path
 #include $os.path.join($sickbeard.PROG_DIR, "gui/slick/interfaces/default/inc_top.tmpl")

-<script type="text/javascript" src="$sbRoot/js/formwizard.js?$sbPID"></script>
-<script type="text/javascript" src="$sbRoot/js/qualityChooser.js?$sbPID"></script>
-<script type="text/javascript" src="$sbRoot/js/recommendedShows.js?$sbPID"></script>
-<script type="text/javascript" src="$sbRoot/js/addShowOptions.js?$sbPID"></script>
+<script type="text/javascript" src="$sbRoot/js/formwizard.js?v=$sbPID"></script>
+<script type="text/javascript" src="$sbRoot/js/qualityChooser.js?v=$sbPID"></script>
+<script type="text/javascript" src="$sbRoot/js/recommendedShows.js?v=$sbPID"></script>
+<script type="text/javascript" src="$sbRoot/js/addShowOptions.js?v=$sbPID"></script>

 #if $varExists('header')
 <h1 class="header">$header</h1>
@ -65,7 +65,7 @@
 <input class="btn" type="button" id="addShowButton" value="Add Show" disabled="disabled" />
 </div>

-<script type="text/javascript" src="$sbRoot/js/rootDirs.js?$sbPID"></script>
+<script type="text/javascript" src="$sbRoot/js/rootDirs.js?v=$sbPID"></script>

 </div>

--- a/gui/slick/interfaces/default/home_trendingShows.tmpl
+++ b/gui/slick/interfaces/default/home_trendingShows.tmpl
@ -14,7 +14,7 @@
 #import os.path
 #include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_top.tmpl')

-<script type="text/javascript" src="$sbRoot/js/plotTooltip.js?$sbPID"></script>
+<script type="text/javascript" src="$sbRoot/js/plotTooltip.js?v=$sbPID"></script>

 <script type="text/javascript" charset="utf-8">
 <!--
--- a/gui/slick/interfaces/default/manage.tmpl
+++ b/gui/slick/interfaces/default/manage.tmpl
@ -84,7 +84,7 @@ $myShowList.sort(lambda x, y: cmp(x.name, y.name))
 });
 //-->
 </script>
-<script type="text/javascript" src="$sbRoot/js/massUpdate.js?$sbPID"></script>
+<script type="text/javascript" src="$sbRoot/js/massUpdate.js?v=$sbPID"></script>
 #if $varExists('header')
 	<h1 class="header">$header</h1>
 #else
--- a/gui/slick/interfaces/default/manage_episodeStatuses.tmpl
+++ b/gui/slick/interfaces/default/manage_episodeStatuses.tmpl
@ -51,7 +51,7 @@
        $statusList.append($common.FAILED)
    #end if

-<script type="text/javascript" src="$sbRoot/js/manageEpisodeStatuses.js?$sbPID"></script>
+<script type="text/javascript" src="$sbRoot/js/manageEpisodeStatuses.js?v=$sbPID"></script>

 	<form action="$sbRoot/manage/changeEpisodeStatuses" method="post">
 		<input type="hidden" id="oldStatus" name="oldStatus" value="$whichStatus">
--- a/gui/slick/interfaces/default/manage_failedDownloads.tmpl
+++ b/gui/slick/interfaces/default/manage_failedDownloads.tmpl
@ -30,7 +30,7 @@
 });
 //-->
 </script>
-<script type="text/javascript" src="$sbRoot/js/failedDownloads.js?$sbPID"></script>
+<script type="text/javascript" src="$sbRoot/js/failedDownloads.js?v=$sbPID"></script>

 #if $varExists('header') 
 	<h1 class="header">$header</h1>
--- a/gui/slick/interfaces/default/manage_manageSearches.tmpl
+++ b/gui/slick/interfaces/default/manage_manageSearches.tmpl
@ -8,8 +8,8 @@
 #import os.path
 #include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_top.tmpl')

-<script type="text/javascript" src="$sbRoot/js/plotTooltip.js?$sbPID"></script>
-<script type="text/javascript" src="$sbRoot/js/manageSearches.js?$sbPID"></script>
+<script type="text/javascript" src="$sbRoot/js/plotTooltip.js?v=$sbPID"></script>
+<script type="text/javascript" src="$sbRoot/js/manageSearches.js?v=$sbPID"></script>
 <div id="content800">
 #if $varExists('header')
 	<h1 class="header">$header</h1>
--- a/gui/slick/interfaces/default/manage_massEdit.tmpl
+++ b/gui/slick/interfaces/default/manage_massEdit.tmpl
@ -16,8 +16,8 @@
    #set $initial_quality = $common.SD
 #end if
 #set $anyQualities, $bestQualities = $common.Quality.splitQuality($initial_quality)
-<script type="text/javascript" src="$sbRoot/js/qualityChooser.js?$sbPID"></script>
-<script type="text/javascript" src="$sbRoot/js/massEdit.js?$sbPID"></script>
+<script type="text/javascript" src="$sbRoot/js/qualityChooser.js?v=$sbPID"></script>
+<script type="text/javascript" src="$sbRoot/js/massEdit.js?v=$sbPID"></script>

 <form action="massEditSubmit" method="post">
 	<input type="hidden" name="toEdit" value="$showList">
--- a/gui/slick/interfaces/default/manage_showQueueOverview.tmpl
+++ b/gui/slick/interfaces/default/manage_showQueueOverview.tmpl
@ -9,7 +9,7 @@
 #import os.path
 #include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_top.tmpl')

-<script type="text/javascript" src="$sbRoot/js/manageShowQueueOverview.js?$sbPID" xmlns="http://www.w3.org/1999/html"></script>
+<script type="text/javascript" src="$sbRoot/js/manageShowQueueOverview.js?v=$sbPID" xmlns="http://www.w3.org/1999/html"></script>
 <div id="content800">
 #if $varExists('header')
 	<h1 class="header">$header</h1>
--- a/gui/slick/interfaces/default/manage_subtitleMissed.tmpl
+++ b/gui/slick/interfaces/default/manage_subtitleMissed.tmpl
@ -41,7 +41,7 @@
 	</form>
 #else

-<script type="text/javascript" src="$sbRoot/js/manageSubtitleMissed.js?$sbPID"></script>
+<script type="text/javascript" src="$sbRoot/js/manageSubtitleMissed.js?v=$sbPID"></script>
 	<input type="hidden" id="selectSubLang" name="selectSubLang" value="$whichSubs">

 	<form action="$sbRoot/manage/downloadSubtitleMissed" method="post">
--- a/gui/slick/interfaces/default/restart_bare.tmpl
+++ b/gui/slick/interfaces/default/restart_bare.tmpl
@ -21,8 +21,8 @@ sbHost = "$curSBHost";
 //-->
 </script>

-<script type="text/javascript" src="$sbRoot/js/lib/jquery-1.8.3.min.js?$sbPID"></script>
-<script type="text/javascript" src="$sbRoot/js/restart.js?$sbPID"></script>
+<script type="text/javascript" src="$sbRoot/js/lib/jquery-1.8.3.min.js?v=$sbPID"></script>
+<script type="text/javascript" src="$sbRoot/js/restart.js?v=$sbPID"></script>

 #set themeSpinner = '-dark' if 'dark' == themeSpinner else ''
 <h2>Performing Restart</h2>