Browse Source

DIV-323 - progress spinner / back button issue

pull/160/head
Mike Olund 8 years ago
parent
commit
39c16ec446
1 changed files with 7 additions and 4 deletions
  1. +7
    -4
      edivorce/apps/core/static/js/main.js

+ 7
- 4
edivorce/apps/core/static/js/main.js View File

@ -95,12 +95,12 @@ $(function () {
}); });
// spinner // spinner
$('body').on('click', 'input.spinner, a.spinner', function () {
$('input.spinner, a.spinner').on('click', function () {
$('div#progress-overlay').show(); $('div#progress-overlay').show();
$('div#progress-overlay-spinner').spin('large'); $('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'); var href = $('a.save-spinner').attr('href');
e.preventDefault(); e.preventDefault();
$('div#progress-overlay').show(); $('div#progress-overlay').show();
@ -110,7 +110,7 @@ $(function () {
$('div#progress-overlay').hide(); $('div#progress-overlay').hide();
$('div#progress-overlay-spinner').spin(false); $('div#progress-overlay-spinner').spin(false);
window.location.href = href; 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 // 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);
};

Loading…
Cancel
Save