From 907ba3960ae0f93675ce0aa7ce467be23d93613c Mon Sep 17 00:00:00 2001
From: Bobby Wibowo <bobbywibowo98@gmail.com>
Date: Mon, 14 Jan 2019 19:44:09 +0700
Subject: [PATCH] Updated render.js

Version string for random renders will now use globals.v4 (new variable)
instead of globals.v1, since globals.v1 changes a lot more often.
Hence to allow this to happen, data-version attribute will now be added
to <script> tag of render.js in home.njk.
---
 public/js/render.js | 7 +++----
 views/_globals.njk  | 4 +++-
 views/home.njk      | 4 ++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/public/js/render.js b/public/js/render.js
index cf05022..ddf0861 100644
--- a/public/js/render.js
+++ b/public/js/render.js
@@ -60,10 +60,9 @@ page.doRenderSwal = function () {
 
 page.getRenderVersion = function () {
   const renderScript = document.getElementById('renderScript')
-  if (!renderScript) return ''
-  const match = renderScript.src.match(/\?v=\w*$/)
-  if (!match) return ''
-  return match[0]
+  if (renderScript && renderScript.dataset.version)
+    return `?v=${renderScript.dataset.version}`
+  return ''
 }
 
 page.doRender = function () {
diff --git a/views/_globals.njk b/views/_globals.njk
index 5c30f82..b775d98 100644
--- a/views/_globals.njk
+++ b/views/_globals.njk
@@ -14,10 +14,12 @@
   v1: CSS and JS files (lolisafe).
   v2: Images and config files (manifest.json, browserconfig.xml, etc).
   v3: CSS and JS files (libs such as bulma, lazyload, etc).
+  v4: Renders in /public/render/* directories (to be used by render.js).
 #}
-{% set v1 = "kz2IMxLx9c" %}
+{% set v1 = "dLp5zKKIkN" %}
 {% set v2 = "hiboQUzAzp" %}
 {% set v3 = "hiboQUzAzp" %}
+{% set v4 = "dLp5zKKIkN" %}
 
 {#
   These will be the links in the homepage and the No-JS uploader.
diff --git a/views/home.njk b/views/home.njk
index 7cbde05..0128a1d 100644
--- a/views/home.njk
+++ b/views/home.njk
@@ -23,8 +23,8 @@
 <script src="libs/lazyload/lazyload.min.js?v={{ globals.v3 }}"></script>
 <script src="js/home.js?v={{ globals.v1 }}"></script>
 <script src="js/sharex.js?v={{ globals.v1 }}"></script>
-<!-- We assign an ID for this so that the script can find out its own version string -->
-<script id="renderScript" src="js/render.js?v={{ globals.v1 }}"></script>
+<!-- We assign an ID for this so that the script can find out version string for render images -->
+<script id="renderScript" data-version="{{ globals.v4 }}" src="js/render.js?v={{ globals.v1 }}"></script>
 {% endblock %}
 
 {% block content %}