From e7dc58f0019d625d7fcb6d99cbbee43700d51d76 Mon Sep 17 00:00:00 2001 From: taoteh1221 Date: Sun, 13 Feb 2022 01:11:12 -0500 Subject: [PATCH] Fix for upgrade notice system Fix for upgrade notice system --- DOCUMENTATION-ETC/changelog.txt | 8 ++++++ config.js | 6 ++--- js/core/api.js | 46 +++++++++++++++++++++------------ js/core/init.js | 2 +- 4 files changed, 42 insertions(+), 20 deletions(-) diff --git a/DOCUMENTATION-ETC/changelog.txt b/DOCUMENTATION-ETC/changelog.txt index c9e0c25..4252d3b 100644 --- a/DOCUMENTATION-ETC/changelog.txt +++ b/DOCUMENTATION-ETC/changelog.txt @@ -587,6 +587,14 @@ v3.08.0 --------------------------------------------------------- +--------------------------------------------------------- +v3.08.1 + +-Fix for upgrade notice system + +--------------------------------------------------------- + + diff --git a/config.js b/config.js index 0a47c77..2ab98b3 100644 --- a/config.js +++ b/config.js @@ -102,7 +102,7 @@ var orient_screen = 0; // Normal (upright) = 0, Flipped (upside down) = 180, Sid // Vertical position (adjusts the ticker's vertical position up/down) // CAN BE NEGATIVE, TO GO THE OPPOSITE WAY -var vertical_position = 75; // Default = 37 (SMALL SCREEN), 75 (LARGE SCREEN) +var vertical_position = 82; // Default = 41 (SMALL SCREEN), 82 (LARGE SCREEN) // Horizontal position (adjusts the ticker's horizontal position left/right) @@ -120,11 +120,11 @@ var show_empty_volume = 'on'; // 'off' / 'on', Default = 'on' // SECONDS between "slideshowing" multiple tickers (if multiple assets configured) // SET TO 0 FOR AUTO MODE (trys to show all tickers in 1 minute, BUT has a 5 second per-ticker MINIMUM) -var slideshow_speed = 4; // Default = 4 +var slideshow_speed = 6; // Default = 6 // Slideshow transition speed (fade out / fade in) IN SECONDS (can be decimals) -var transition_speed = 0.75; // Default = 0.75 +var transition_speed = 1.65; // Default = 1.65 // ALL font weights (for ALL ticker text) diff --git a/js/core/api.js b/js/core/api.js index 58664ee..ad74d90 100644 --- a/js/core/api.js +++ b/js/core/api.js @@ -122,26 +122,40 @@ function upgrade_check() { var latest_version = data.tag_name; - var latest_version_description = data.body; - - var latest_version_download = data.zipball_url; - - var latest_version_installer = "wget --no-cache -O TICKER-INSTALL.bash https://git.io/Jqzjk;chmod +x TICKER-INSTALL.bash;sudo ./TICKER-INSTALL.bash"; - - // Remove anything AFTER formatting in brackets in the description (including the brackets) - // (removes the auto-added sourceforge download link) - latest_version_description = latest_version_description.split('[')[0]; - - latest_version_description = "Upgrade Description:\n\n" + latest_version_description.trim(); - - latest_version_description = latest_version_description + "\n\nAutomatic install terminal command:\n\n" + latest_version_installer + "\n\n"; - - window.latest_version_description = latest_version_description + "Manual Install File:\n\n" + latest_version_download + "\n\n(select all the text of either install method to auto-copy to clipboard)"; - if ( app_version != latest_version ) { + + var latest_version_description = data.body; + + var latest_version_download = data.zipball_url; + + var latest_version_installer = "wget --no-cache -O TICKER-INSTALL.bash https://git.io/Jqzjk;chmod +x TICKER-INSTALL.bash;sudo ./TICKER-INSTALL.bash"; + + // Remove anything AFTER formatting in brackets in the description (including the brackets) + // (removes the auto-added sourceforge download link) + latest_version_description = latest_version_description.split('[')[0]; + + latest_version_description = "Upgrade Description:\n\n" + latest_version_description.trim(); + + latest_version_description = latest_version_description + + "\n\nAutomatic install terminal command:\n\n" + latest_version_installer + "\n\n"; + + window.latest_version_description = latest_version_description + + "Manual Install File:\n\n" + latest_version_download + + "\n\n(select all the text of either install method to auto-copy to clipboard)"; + $("#upgrade_alert").css({ "display": "block" }); + $("#upgrade_alert").html("Upgrade available: v" + latest_version + "
(running v" + app_version + ")").css("color", "#FFFF00"); + + } + else { + var latest_version_description; + var latest_version_download; + var latest_version_installer; + window.latest_version_description = ''; + $("#upgrade_alert").css({ "display": "none" }); + $("#upgrade_alert").html("").css("color", "#FFFF00"); } diff --git a/js/core/init.js b/js/core/init.js index b77679b..7f3b275 100644 --- a/js/core/init.js +++ b/js/core/init.js @@ -4,7 +4,7 @@ // Application version -var app_version = '3.08.0'; // 2022/FEBUARY/11TH +var app_version = '3.08.1'; // 2022/FEBUARY/13TH // BLANK var inits