From 475ba98f1f91b156cbfd75533e350b561837ae14 Mon Sep 17 00:00:00 2001
From: JUNO_OKYO <5250117+J2TEAM@users.noreply.github.com>
Date: Tue, 18 Aug 2020 19:37:29 +0700
Subject: [PATCH] Populate options from javascript instead of hardcoding
 (#9796)

* use single quotes instead of double quotes

* Create object

* Populate options from javascript instead of hardcoding

* Update public/offline.html

Co-authored-by: Ben Halpern <bendhalpern@gmail.com>
---
 public/offline.html | 54 ++++++++++++++++++++++++++++-----------------
 1 file changed, 34 insertions(+), 20 deletions(-)

diff --git a/public/offline.html b/public/offline.html
index 4cfafc244e9ae..a2f307ede91d5 100644
--- a/public/offline.html
+++ b/public/offline.html
@@ -176,13 +176,8 @@ <h4>(pick a color below && start drawing!)</h4>
   <div class="colors">
   </div>
   <div class='paletteSelector'>
-    <!-- TODO: Populate options from javascript instead of hardcoding -->
-    <select>
-      <option value="default">Default Palette</option>
-      <option value="paulTol">Paul Tol Palette</option>
-    </select>
-
-    <button type="button" id="btn-clear">Clear</button>
+    <select id="palettes"></select>
+    <button type="button" id="btn-clear">Clear</button> 
   </div>
   <svg width="75px" height="75px" viewBox="0 0 266 286" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
     class="signature">
@@ -200,19 +195,25 @@ <h4>(pick a color below && start drawing!)</h4>
   <script type="text/javascript">
 
     const palettes = {
-      default: ["#F4908E", "#F2F097", "#88B0DC", "#F7B5D1", "#53C4AF", "#FDE38C"],
+      default: {
+        name: 'Default Palette',
+        colors: ['#F4908E', '#F2F097', '#88B0DC', '#F7B5D1', '#53C4AF', '#FDE38C']
+      },
       // Color-deficient accessible palettes: https://owi.usgs.gov/blog/tolcolors/
-      paulTol: ["#B997C6", "#824D99", "#4E79C4", "#57A2AC", "#7EB875", "#D0B440", "#E67F33"],
+      paulTol: {
+        name: 'Paul Tol Palette',
+        colors: ['#B997C6', '#824D99', '#4E79C4', '#57A2AC', '#7EB875', '#D0B440', '#E67F33']
+      },
       // Add more palette options below and to the "select" dropdown.
     }
     let activePalette = 'default' // match key inside the palettes variable
 
     // Globally DOM nodes + variables
-    const paletteSelector = document.querySelector(".paletteSelector")
-    const colorSelector = document.querySelector(".colors")
+    const paletteSelector = document.querySelector('.paletteSelector')
+    const colorSelector = document.querySelector('.colors')
     const canvas = document.querySelector('canvas')
     const context = canvas.getContext('2d')
-    const colorDiv = document.querySelector(".colors")
+    const colorDiv = document.querySelector('.colors')
     let dx = 1, dy = 1;
 
     // handler for color input buttons
@@ -228,12 +229,12 @@ <h4>(pick a color below && start drawing!)</h4>
         button.removeEventListener('click', handleButtonClick)
       })
       // Then, remove existing buttons
-      colorDiv.innerHTML = ""
+      colorDiv.innerHTML = ''
 
       // Lastly, add new a new button for each color in the passed in palette
       colors.forEach(color => {
-        const button = document.createElement("button")
-        button.classList.add("color")
+        const button = document.createElement('button')
+        button.classList.add('color')
         button.style.backgroundColor = color
         colorDiv.appendChild(button)
         button.addEventListener('click', handleButtonClick)
@@ -243,7 +244,7 @@ <h4>(pick a color below && start drawing!)</h4>
     // Helper for modifying canvas context
     const setContextSettings = (strokeColor) => {
       context.strokeStyle = strokeColor
-      context.lineJoin = "round"
+      context.lineJoin = 'round'
       context.lineWidth = 5
     }
 
@@ -264,7 +265,7 @@ <h4>(pick a color below && start drawing!)</h4>
       setResizeFactors();
     }
 
-    window.addEventListener("resize", handleResize)
+    window.addEventListener('resize', handleResize)
 
     // Main function to render new DOM whenever activePalette changes
     const render = (palette) => {
@@ -279,7 +280,7 @@ <h4>(pick a color below && start drawing!)</h4>
 
     function getCoordinates(event) {
       // check to see if mobile or desktop
-      if (["mousedown", "mousemove"].includes(event.type)) {
+      if (['mousedown', 'mousemove'].includes(event.type)) {
         // click events
         return [event.pageX * dx, event.pageY * dy]
       } else {
@@ -336,9 +337,22 @@ <h4>(pick a color below && start drawing!)</h4>
     canvas.addEventListener('mousemove', endPaint)
     canvas.addEventListener('touchmove', endPaint)
 
+    // generate options for select tag
+    let selectTag = document.getElementById('palettes');
+
+    Object.keys(palettes).forEach((key) => {
+      // create tag
+      let option = document.createElement('option');
+      option.value = key;
+      option.textContent = palettes[key].name;
+      
+      // insert to select
+      selectTag.appendChild(option);
+    });
+
     paletteSelector.onchange = (event) => {
       activePalette = event.target.value
-      render(palettes[activePalette])
+      render(palettes[activePalette].colors)
     }
 
     document.getElementById('btn-clear').addEventListener('click', (e) => {
@@ -347,7 +361,7 @@ <h4>(pick a color below && start drawing!)</h4>
 
     // Initialization when page is ready to load, runs once
     (function() {
-      render(palettes[activePalette])
+      render(palettes[activePalette].colors)
     })()
 
   </script>