Merge pull request #2643 from OmgImAlexis/fix-config_backuprestorejs

Fixes https://github.com/SiCKRAGETV/sickrage-issues/issues/3010

gui/slick/js/config.js

-$(document).ready(function(){
-    $(".enabler").each(function(){
-        if (!$(this).prop('checked')) $('#content_'+$(this).attr('id')).hide();
-    });
-
-    $(".enabler").click(function() {
-        if ($(this).prop('checked')){
-            $('#content_'+$(this).attr('id')).fadeIn("fast", "linear");
-        } else {
-            $('#content_'+$(this).attr('id')).fadeOut("fast", "linear");
-        }
-    });
-
-    $(".viewIf").click(function() {
-        if ($(this).prop('checked')) {
-            $('.hide_if_'+$(this).attr('id')).css('display','none');
-            $('.show_if_'+$(this).attr('id')).fadeIn("fast", "linear");
-        } else {
-            $('.show_if_'+$(this).attr('id')).css('display','none');
-            $('.hide_if_'+$(this).attr('id')).fadeIn("fast", "linear");
-        }
-    });
-
-    $(".datePresets").click(function() {
-        var def = $('#date_presets').val();
-        if ($(this).prop('checked') && '%x' == def) {
-            def = '%a, %b %d, %Y';
-            $('#date_use_system_default').html('1');
-        } else if (!$(this).prop('checked') && '1' == $('#date_use_system_default').html()){
-            def = '%x';
-        }
-
-        $('#date_presets').attr('name', 'date_preset_old');
-        $('#date_presets').attr('id', 'date_presets_old');
-
-        $('#date_presets_na').attr('name', 'date_preset');
-        $('#date_presets_na').attr('id', 'date_presets');
-
-        $('#date_presets_old').attr('name', 'date_preset_na');
-        $('#date_presets_old').attr('id', 'date_presets_na');
-
-        if (def) $('#date_presets').val(def);
-    });
-
-    // bind 'myForm' and provide a simple callback function
-    $('#configForm').ajaxForm({
-        beforeSubmit: function(){
-            $('.config_submitter .config_submitter_refresh').each(function(){
-                $(this).attr("disabled", "disabled");
-                $(this).after('<span><img src="' + srRoot + '/images/loading16' + themeSpinner + '.gif"> Saving...</span>');
-                $(this).hide();
-            });
-        },
-        success: function(){
-            setTimeout(function () {
-                "use strict";
-                config_success();
-            }, 2000);
-        }
-    });
-
-    $('#api_key').click(function(){
-        $('#api_key').select();
-    });
-
-    $("#generate_new_apikey").click(function(){
-        $.get(srRoot + '/config/general/generateApiKey',
-            function(data){
-                if (data.error !== undefined) {
-                    alert(data.error);
-                    return;
-                }
-                $('#api_key').val(data);
-        });
-    });
-
-    $('#branchCheckout').click(function() {
-        var url = srRoot+'/home/branchCheckout?branch='+$("#branchVersion").val();
-        var  checkDBversion = srRoot + "/home/getDBcompare";
-        $.getJSON(checkDBversion, function(data){
-            if (data.status == "success") {
-                if (data.message == "equal") {
-                    //Checkout Branch
-                    window.location.href = url;
-                }
-                if (data.message == "upgrade") {
-                    if ( confirm("Changing branch will upgrade your database.\nYou won't be able to downgrade afterward.\nDo you want to continue?") ) {
-                        //Checkout Branch
-                        window.location.href = url;
-                    }
-                }
-                if (data.message == "downgrade") {
-                    alert("Can't switch branch as this will result in a database downgrade.");
-                }
-            }
-        });
-    });
-
-});
-
-function config_success(){
-    $('.config_submitter').each(function(){
-        $(this).removeAttr("disabled");
-        $(this).next().remove();
-        $(this).show();
-    });
-    $('.config_submitter_refresh').each(function(){
-        $(this).removeAttr("disabled");
-        $(this).next().remove();
-        $(this).show();
-        url = srRoot+'/config/providers/';
-        window.location.href = url;
-    });
-    $('#email_show').trigger('notify');
-}

gui/slick/js/new/config_backuprestore.js

-$(document).load(function(){
+$(document).ready(function(){
     $('#backupDir').fileBrowser({ title: 'Select backup folder to save to', key: 'backupPath' });
     $('#backupFile').fileBrowser({ title: 'Select backup files to restore', key: 'backupFile', includeFiles: 1 });
     $('#config-components').tabs();
+    
+    $(".enabler").each(function(){
+        if (!$(this).prop('checked')) $('#content_'+$(this).attr('id')).hide();
     });
+
+    $(".enabler").click(function() {
+        if ($(this).prop('checked')){
+            $('#content_'+$(this).attr('id')).fadeIn("fast", "linear");
+        } else {
+            $('#content_'+$(this).attr('id')).fadeOut("fast", "linear");
+        }
+    });
+
+    $(".viewIf").click(function() {
+        if ($(this).prop('checked')) {
+            $('.hide_if_'+$(this).attr('id')).css('display','none');
+            $('.show_if_'+$(this).attr('id')).fadeIn("fast", "linear");
+        } else {
+            $('.show_if_'+$(this).attr('id')).css('display','none');
+            $('.hide_if_'+$(this).attr('id')).fadeIn("fast", "linear");
+        }
+    });
+
+    $(".datePresets").click(function() {
+        var def = $('#date_presets').val();
+        if ($(this).prop('checked') && '%x' == def) {
+            def = '%a, %b %d, %Y';
+            $('#date_use_system_default').html('1');
+        } else if (!$(this).prop('checked') && '1' == $('#date_use_system_default').html()){
+            def = '%x';
+        }
+
+        $('#date_presets').attr('name', 'date_preset_old');
+        $('#date_presets').attr('id', 'date_presets_old');
+
+        $('#date_presets_na').attr('name', 'date_preset');
+        $('#date_presets_na').attr('id', 'date_presets');
+
+        $('#date_presets_old').attr('name', 'date_preset_na');
+        $('#date_presets_old').attr('id', 'date_presets_na');
+
+        if (def) $('#date_presets').val(def);
+    });
+
+    // bind 'myForm' and provide a simple callback function
+    $('#configForm').ajaxForm({
+        beforeSubmit: function(){
+            $('.config_submitter .config_submitter_refresh').each(function(){
+                $(this).attr("disabled", "disabled");
+                $(this).after('<span><img src="' + srRoot + '/images/loading16' + themeSpinner + '.gif"> Saving...</span>');
+                $(this).hide();
+            });
+        },
+        success: function(){
+            setTimeout(function () {
+                "use strict";
+                config_success();
+            }, 2000);
+        }
+    });
+
+    $('#api_key').click(function(){
+        $('#api_key').select();
+    });
+
+    $("#generate_new_apikey").click(function(){
+        $.get(srRoot + '/config/general/generateApiKey',
+            function(data){
+                if (data.error !== undefined) {
+                    alert(data.error);
+                    return;
+                }
+                $('#api_key').val(data);
+        });
+    });
+
+    $('#branchCheckout').click(function() {
+        var url = srRoot+'/home/branchCheckout?branch='+$("#branchVersion").val();
+        var  checkDBversion = srRoot + "/home/getDBcompare";
+        $.getJSON(checkDBversion, function(data){
+            if (data.status == "success") {
+                if (data.message == "equal") {
+                    //Checkout Branch
+                    window.location.href = url;
+                }
+                if (data.message == "upgrade") {
+                    if ( confirm("Changing branch will upgrade your database.\nYou won't be able to downgrade afterward.\nDo you want to continue?") ) {
+                        //Checkout Branch
+                        window.location.href = url;
+                    }
+                }
+                if (data.message == "downgrade") {
+                    alert("Can't switch branch as this will result in a database downgrade.");
+                }
+            }
+        });
+    });
+
+});
+
+function config_success(){
+    $('.config_submitter').each(function(){
+        $(this).removeAttr("disabled");
+        $(this).next().remove();
+        $(this).show();
+    });
+    $('.config_submitter_refresh').each(function(){
+        $(this).removeAttr("disabled");
+        $(this).next().remove();
+        $(this).show();
+        url = srRoot+'/config/providers/';
+        window.location.href = url;
+    });
+    $('#email_show').trigger('notify');
+}

gui/slick/views/config_backuprestore.mako

@@ -25,9 +25,6 @@
 % if sickbeard.INDEXER_DEFAULT:
     <% indexer = sickbeard.INDEXER_DEFAULT %>
 % endif
-
-<script type="text/javascript" src="${srRoot}/js/config.js?${sbPID}"></script>
-
 <div id="config">
     <div id="config-content">