From ea9ab01f01cec37e185ab692de974500c5116f92 Mon Sep 17 00:00:00 2001 From: Matt Love Date: Tue, 9 Jul 2019 16:13:04 -0700 Subject: [PATCH] :art: Make JS code suck slightly less --- hyperglass/static/js/hyperglass.js | 314 ++++++++++++++++------------- 1 file changed, 174 insertions(+), 140 deletions(-) diff --git a/hyperglass/static/js/hyperglass.js b/hyperglass/static/js/hyperglass.js index a5a9abe..3e3bc27 100644 --- a/hyperglass/static/js/hyperglass.js +++ b/hyperglass/static/js/hyperglass.js @@ -8,25 +8,25 @@ adjustDropdowns(); clearPage(); // Bulma Toggable Dropdown - help text -let dropdown = document.querySelector('#help-dropdown'); -dropdown.addEventListener('click', function(event) { - event.stopPropagation(); - dropdown.classList.toggle('is-active'); +$('#help-dropdown').click(function(event) { + event.stopPropagation(); + $(this).addClass('is-active'); }); +// ClipboardJS Elements var btn_copy = document.getElementById('btn-copy'); var clipboard = new ClipboardJS(btn_copy); clipboard.on('success', function(e) { - console.log(e); - $('#btn-copy').addClass('is-success').addClass('is-outlined'); - $('#copy-icon').removeClass('icofont-ui-copy').addClass('icofont-check'); - setTimeout(function() { - $('#btn-copy').removeClass('is-success').removeClass('is-outlined'); - $('#copy-icon').removeClass('icofont-check').addClass('icofont-ui-copy'); - }, 1000) + console.log(e); + $('#btn-copy').addClass('is-success').addClass('is-outlined'); + $('#copy-icon').removeClass('icofont-ui-copy').addClass('icofont-check'); + setTimeout(function() { + $('#btn-copy').removeClass('is-success').removeClass('is-outlined'); + $('#copy-icon').removeClass('icofont-check').addClass('icofont-ui-copy'); + }, 1000); }); clipboard.on('error', function(e) { - console.log(e); + console.log(e); }); function bgpHelpASPath() { @@ -60,26 +60,26 @@ function adjustDropdowns() { } function clearErrors() { - progress.hide(); - target_error.hide(); - if (target_input.hasClass("is-warning")) { - target_input.removeClass("is-warning"); - }; - if (target_input.hasClass("is-danger")) { - target_input.removeClass("is-danger"); - }; + progress.hide(); + target_error.hide(); + if (target_input.hasClass("is-warning")) { + target_input.removeClass("is-warning"); + } + if (target_input.hasClass("is-danger")) { + target_input.removeClass("is-danger"); + } } function clearPage() { - progress.hide(); - resultsbox.hide(); - target_error.hide(); - if (target_input.hasClass("is-warning")) { - target_input.removeClass("is-warning"); - }; - if (target_input.hasClass("is-danger")) { - target_input.removeClass("is-danger"); - }; + progress.hide(); + resultsbox.hide(); + target_error.hide(); + if (target_input.hasClass("is-warning")) { + target_input.removeClass("is-warning"); + } + if (target_input.hasClass("is-danger")) { + target_input.removeClass("is-danger"); + } } function prepResults() { @@ -88,44 +88,52 @@ function prepResults() { } $(document).ready(function() { - var defaultasn = $("#network").val(); - $.ajax({ - url: `/locations/${defaultasn}`, - context: document.body, - type: 'get', - success: function(data) { - selectedRouters = JSON.parse(data) - console.log(selectedRouters) - updateRouters(selectedRouters); - }, - error: function(err) { - console.log(err) - } - }) -}) + var defaultasn = $("#network").val(); + $.ajax({ + url: '/locations/'+defaultasn, + context: document.body, + type: 'get', + success: function(data) { + selectedRouters = JSON.parse(data); + console.log(selectedRouters); + updateRouters(selectedRouters); + }, + error: function(err) { + console.log(err); + } + }); +}); -$('#network').on('change', () => { - var asn = $("select[id=network").val() +$('#network').on('change', (function(event) { + var asn = $("select[id=network").val(); $('#location').children(":not(#text_location)").remove(); $.ajax({ - url: `/locations/${asn}`, - type: 'get', - success: function(data) { - clearPage(); - updateRouters(JSON.parse(data)); - }, - error: function(err) { - console.log(err) - } - }) -}) + url: '/locations/'+asn, + type: 'get', + success: function(data) { + clearPage(); + updateRouters(JSON.parse(data)); + }, + error: function(err) { + console.log(err); + } + }); +})); function updateRouters(locations) { - locations.forEach(function(r) { - $('#location').append($("