From 3bb5d0a70fd149d2edfbf45233b03fed80ec748a Mon Sep 17 00:00:00 2001
From: Michiel Pater <mpater@tradosoft.com>
Date: Tue, 17 Aug 2021 00:30:22 +0200
Subject: [PATCH 1/5] Feature: Cache busting website data (JavaScript and SVG
 files) by adding '?version' to these filenames

---
 docs/assets/js/script.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/assets/js/script.js b/docs/assets/js/script.js
index f12c4ca15..a684dd59b 100644
--- a/docs/assets/js/script.js
+++ b/docs/assets/js/script.js
@@ -28,7 +28,7 @@ devicon.controller('IconListCtrl', function($scope, $http, $compile) {
   var baseUrl = `https://cdn.jsdelivr.net/gh/${gitHubPath}/`
 
   // Get devicon.json
-  $http.get(baseUrl + '/devicon.json').success(function(data) {
+  $http.get(baseUrl + '/devicon.json?' + $scope.latestReleaseTagging).success(function(data) {
 
     /*
     | Re-format devicon.json
@@ -126,7 +126,7 @@ devicon.controller('IconListCtrl', function($scope, $http, $compile) {
   */
   $scope.selectSvg = function(svgVersion, index) {
 
-    $http.get(baseUrl + '/icons/' + $scope.selectedIcon.name + '/' + $scope.selectedIcon.name + '-' + svgVersion + '.svg').success(function(data){
+    $http.get(baseUrl + '/icons/' + $scope.selectedIcon.name + '/' + $scope.selectedIcon.name + '-' + svgVersion + '.svg?' + $scope.latestReleaseTagging).success(function(data){
 
       var svgElement = angular.element(data);
       var innerSvgElement = null;

From 0a1d2c586362d9a65196ab428b66dec63a88d27b Mon Sep 17 00:00:00 2001
From: Michiel Pater <mpater@tradosoft.com>
Date: Tue, 17 Aug 2021 01:05:48 +0200
Subject: [PATCH 2/5] Updated script.js to use CDN versioning style

---
 docs/assets/js/script.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/docs/assets/js/script.js b/docs/assets/js/script.js
index a684dd59b..8625a098b 100644
--- a/docs/assets/js/script.js
+++ b/docs/assets/js/script.js
@@ -13,7 +13,8 @@ devicon.controller('IconListCtrl', function($scope, $http, $compile) {
   // which is used for showing in the header of the page
   // as well as for CDN links
   var gitHubPath = 'devicons/devicon';
-  var url = 'https://api.github.com/repos/' + gitHubPath + '/tags';
+  var versionStr = '@' + $scope.latestReleaseTagging;
+  var url = 'https://api.github.com/repos/' + gitHubPath + versionStr + '/tags';
 
   $scope.latestReleaseTagging = 'master';
   $http.get(url).success(function (data) {
@@ -25,10 +26,10 @@ devicon.controller('IconListCtrl', function($scope, $http, $compile) {
   });
 
 
-  var baseUrl = `https://cdn.jsdelivr.net/gh/${gitHubPath}/`
+  var baseUrl = `https://cdn.jsdelivr.net/gh/${gitHubPath}${versionStr}/`
 
   // Get devicon.json
-  $http.get(baseUrl + '/devicon.json?' + $scope.latestReleaseTagging).success(function(data) {
+  $http.get(baseUrl + '/devicon.json').success(function(data) {
 
     /*
     | Re-format devicon.json
@@ -126,7 +127,7 @@ devicon.controller('IconListCtrl', function($scope, $http, $compile) {
   */
   $scope.selectSvg = function(svgVersion, index) {
 
-    $http.get(baseUrl + '/icons/' + $scope.selectedIcon.name + '/' + $scope.selectedIcon.name + '-' + svgVersion + '.svg?' + $scope.latestReleaseTagging).success(function(data){
+    $http.get(baseUrl + '/icons/' + $scope.selectedIcon.name + '/' + $scope.selectedIcon.name + '-' + svgVersion + '.svg').success(function(data){
 
       var svgElement = angular.element(data);
       var innerSvgElement = null;

From cf47cd66e586aee39279d3e418a8ee4d323349b0 Mon Sep 17 00:00:00 2001
From: Michiel Pater <mpater@tradosoft.com>
Date: Tue, 17 Aug 2021 01:11:46 +0200
Subject: [PATCH 3/5] Cache busting script.js as well, to load cache busting
 changes

---
 docs/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/index.html b/docs/index.html
index ab77f7bab..e96b63e91 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -135,7 +135,7 @@ <h3 class="cbp-ig-title">{{icon.name}}</h3>
   <script src="//ajax.googleapis.com/ajax/libs/angularjs/1.2.19/angular.min.js"></script>
   <script src="//ajax.googleapis.com/ajax/libs/angularjs/1.2.19/angular-sanitize.min.js"></script>
   <script src="//ajax.googleapis.com/ajax/libs/angularjs/1.2.19/angular-animate.min.js"></script>
-  <script src="assets/js/script.js"></script>
+  <script src="assets/js/script.js?2.13.0"></script>
 
   <script>
     (function(i, s, o, g, r, a, m) {

From f4421672f3db410e6cc1987c14215b703c4aa367 Mon Sep 17 00:00:00 2001
From: Michiel Pater <mpater@tradosoft.com>
Date: Tue, 17 Aug 2021 01:43:44 +0200
Subject: [PATCH 4/5] Website cache busting fix

---
 docs/assets/js/script.js | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/docs/assets/js/script.js b/docs/assets/js/script.js
index 8625a098b..c60bc23f4 100644
--- a/docs/assets/js/script.js
+++ b/docs/assets/js/script.js
@@ -13,8 +13,7 @@ devicon.controller('IconListCtrl', function($scope, $http, $compile) {
   // which is used for showing in the header of the page
   // as well as for CDN links
   var gitHubPath = 'devicons/devicon';
-  var versionStr = '@' + $scope.latestReleaseTagging;
-  var url = 'https://api.github.com/repos/' + gitHubPath + versionStr + '/tags';
+  var url = 'https://api.github.com/repos/' + gitHubPath + '/tags';
 
   $scope.latestReleaseTagging = 'master';
   $http.get(url).success(function (data) {
@@ -25,11 +24,11 @@ devicon.controller('IconListCtrl', function($scope, $http, $compile) {
     console.log('Unable to determine latest release version, fallback to master.')
   });
 
-
+  var versionStr = '@' + $scope.latestReleaseTagging;
   var baseUrl = `https://cdn.jsdelivr.net/gh/${gitHubPath}${versionStr}/`
 
   // Get devicon.json
-  $http.get(baseUrl + '/devicon.json').success(function(data) {
+  $http.get(baseUrl + 'devicon.json').success(function(data) {
 
     /*
     | Re-format devicon.json
@@ -127,7 +126,7 @@ devicon.controller('IconListCtrl', function($scope, $http, $compile) {
   */
   $scope.selectSvg = function(svgVersion, index) {
 
-    $http.get(baseUrl + '/icons/' + $scope.selectedIcon.name + '/' + $scope.selectedIcon.name + '-' + svgVersion + '.svg').success(function(data){
+    $http.get(baseUrl + 'icons/' + $scope.selectedIcon.name + '/' + $scope.selectedIcon.name + '-' + svgVersion + '.svg').success(function(data){
 
       var svgElement = angular.element(data);
       var innerSvgElement = null;

From 57649486fcb9fc0bd2fa98121708507891a967c0 Mon Sep 17 00:00:00 2001
From: Michiel Pater <mpater@tradosoft.com>
Date: Mon, 23 Aug 2021 20:13:55 +0200
Subject: [PATCH 5/5] Cache busting script.js using Date.now()

---
 docs/index.html | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/index.html b/docs/index.html
index e96b63e91..eaacb2b5b 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -135,7 +135,10 @@ <h3 class="cbp-ig-title">{{icon.name}}</h3>
   <script src="//ajax.googleapis.com/ajax/libs/angularjs/1.2.19/angular.min.js"></script>
   <script src="//ajax.googleapis.com/ajax/libs/angularjs/1.2.19/angular-sanitize.min.js"></script>
   <script src="//ajax.googleapis.com/ajax/libs/angularjs/1.2.19/angular-animate.min.js"></script>
-  <script src="assets/js/script.js?2.13.0"></script>
+  
+  <script>
+    document.write("<script src='assets/js/script.js?" + Date.now() + "'><\/script>");
+  </script>
 
   <script>
     (function(i, s, o, g, r, a, m) {