From 39c16ec446b30d18a991c94555a48b7d7f3a5bc4 Mon Sep 17 00:00:00 2001 From: Mike Olund Date: Mon, 27 Mar 2017 10:16:57 -0700 Subject: [PATCH] DIV-323 - progress spinner / back button issue --- edivorce/apps/core/static/js/main.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/edivorce/apps/core/static/js/main.js b/edivorce/apps/core/static/js/main.js index 0fb1ff98..450a3ca2 100755 --- a/edivorce/apps/core/static/js/main.js +++ b/edivorce/apps/core/static/js/main.js @@ -95,12 +95,12 @@ $(function () { }); // spinner - $('body').on('click', 'input.spinner, a.spinner', function () { + $('input.spinner, a.spinner').on('click', function () { $('div#progress-overlay').show(); $('div#progress-overlay-spinner').spin('large'); }); - $('body').on('click', 'a.save-spinner', function (e) { + $('a.save-spinner').on('click', function (e) { var href = $('a.save-spinner').attr('href'); e.preventDefault(); $('div#progress-overlay').show(); @@ -110,7 +110,7 @@ $(function () { $('div#progress-overlay').hide(); $('div#progress-overlay-spinner').spin(false); window.location.href = href; - }, 1000); + }, 300); }); @@ -198,4 +198,7 @@ $('.no-collapse').on('click', function (e) { }); // kills the spinner when the back button is pressed -window.onunload = function () { }; +window.onunload = function () { + $('div#progress-overlay').hide(); + $('div#progress-overlay-spinner').spin(false); +};