Replace pages' use of the options call with directly building the HTML components using templates, as the syntax is much nicer. Use a common set of data provided to all modules via pagetemplate.py instead of passing things like web_ui_options around. Closes #153

static/js/add-spot.js

@@ -26,45 +26,8 @@ const PROVIDER_CREDENTIAL_SCHEMAS = {
     ]
 };
 
-// Load server options. Once a successful callback is made from this, we can populate the choice boxes in the form and load
-// any saved values from local storage.
-function loadOptions() {
-    $.getJSON('/api/v3/options', function (jsonData) {
-        // Store options
-        options = jsonData;
-
-        // Populate modes drop-down
-        $.each(options["modes"], function (i, m) {
-            $('#mode').append($('<option>', {
-                value: m,
-                text: m
-            }));
-        });
-
-        // Populate activity drop-down
-        $.each(options["activities"], function (i, activity) {
-            $('#activity').append($('<option>', {
-                value: activity.name,
-                text: activity.name
-            }));
-        });
-
-        // Load reCAPTCHA if a site key is configured (key is inlined into page by server)
-        if (window._recaptchaSiteKey) {
-            loadRecaptcha(window._recaptchaSiteKey);
-        }
-
-        // Load settings from settings storage now all the controls are available
-        loadSettings();
-
-        // Update the upstream area for any pre-selected activity
-        updateUpstreamArea();
-    });
-}
-
 // Load and inject the reCAPTCHA script
-function loadRecaptcha(siteKey) {
-    window._recaptchaSiteKey = siteKey;
+function loadRecaptcha() {
     if (!document.getElementById('recaptcha-script')) {
         const script = document.createElement('script');
         script.id = 'recaptcha-script';
@@ -79,20 +42,19 @@ function loadRecaptcha(siteKey) {
 // Called by reCAPTCHA after its script loads
 function renderRecaptcha() {
     window._recaptchaWidgetId = grecaptcha.render('recaptcha-widget', {
-        sitekey: window._recaptchaSiteKey,
+        sitekey: RECAPTCHA_SITE_KEY,
         size: 'normal'
     });
 }
 
 // Update the "Send spot to..." area based on the currently selected activity
 function updateUpstreamArea() {
-    if (!window._allowUpstreamSpotting || !options || !options["spot_submit_providers"]) {
+    if (!ALLOW_UPSTREAM_SPOTTING) {
         $("#upstream-area").hide();
         return;
     }
 
-    const activity = $("#activity").val();
-    const providers = (activity && options["spot_submit_providers"][activity]) ? options["spot_submit_providers"][activity] : [];
+    const providers = SPOT_SUBMIT_PROVIDERS[$("#activity").val()] || [];
 
     if (providers.length === 0) {
         $("#upstream-area").hide();
@@ -131,9 +93,7 @@ function updateCredentialsButton() {
 
 // Get the currently selected upstream provider name
 function getSelectedUpstreamProvider() {
-    const providers = (options && options["spot_submit_providers"] && $("#activity").val())
-        ? (options["spot_submit_providers"][$("#activity").val()] || [])
-        : [];
+    const providers = SPOT_SUBMIT_PROVIDERS[$("#activity").val()] || [];
     if (providers.length === 0) return null;
     if (providers.length === 1) return providers[0];
     return $("#upstream-provider-select").val();
@@ -302,6 +262,13 @@ $("#upstream-provider-select").change(function () {
 
 // Startup
 $(document).ready(function () {
-    // Load options
-    loadOptions();
+    // Load reCAPTCHA if a site key is configured
+    if (RECAPTCHA_SITE_KEY) {
+        loadRecaptcha();
+    }
+
+    loadSettings();
+
+    // Update the upstream area for any pre-selected activity
+    updateUpstreamArea();
 });