Skip to content
Snippets Groups Projects
Commit 076e871f authored by Chris Hallberg's avatar Chris Hallberg
Browse files

Merge branch 'release-2.3'

parents 72480355 e66bb264
Branches
Tags
No related merge requests found
...@@ -171,7 +171,7 @@ function cartSubmit($form) { ...@@ -171,7 +171,7 @@ function cartSubmit($form) {
} }
document.location.href = url; document.location.href = url;
} else if ((submit != 'empty' || confirm(vufindString['confirmEmpty'])) } else if ((submit != 'empty' || confirm(vufindString['confirmEmpty']))
&& (submit != 'delete' || confirm(vufindString['confirmDelete']))) { && (submit != 'delete' || confirm(vufindString['confirmDelete']))) {
Lightbox.submit($form, Lightbox.changeContent); Lightbox.submit($form, Lightbox.changeContent);
} else { } else {
$('#modal').find('.icon-spinner').remove(); $('#modal').find('.icon-spinner').remove();
......
...@@ -124,6 +124,8 @@ function registerLightboxEvents() { ...@@ -124,6 +124,8 @@ function registerLightboxEvents() {
$(modal).find("form input[type=submit]").click(function() { $(modal).find("form input[type=submit]").click(function() {
// Abort requests triggered by the lightbox // Abort requests triggered by the lightbox
$('#modal .icon-spinner').remove(); $('#modal .icon-spinner').remove();
// Remove other clicks
$(modal).find('input[type="submit"][clicked=true]').attr('clicked', false);
// Add useful information // Add useful information
$(this).attr("clicked", "true"); $(this).attr("clicked", "true");
// Add prettiness // Add prettiness
...@@ -350,7 +352,6 @@ $(document).ready(function() { ...@@ -350,7 +352,6 @@ $(document).ready(function() {
}, 500); // Delay request submission }, 500); // Delay request submission
}, },
updater : function(item) { // Submit on update updater : function(item) { // Submit on update
// console.log(this.$element[0].form.submit);
this.$element[0].value = item; this.$element[0].value = item;
this.$element[0].form.submit(); this.$element[0].form.submit();
return item; return item;
......
...@@ -171,7 +171,7 @@ function cartSubmit($form) { ...@@ -171,7 +171,7 @@ function cartSubmit($form) {
} }
document.location.href = url; document.location.href = url;
} else if ((submit != 'empty' || confirm(vufindString['confirmEmpty'])) } else if ((submit != 'empty' || confirm(vufindString['confirmEmpty']))
&& (submit != 'delete' || confirm(vufindString['confirmDelete']))) { && (submit != 'delete' || confirm(vufindString['confirmDelete']))) {
Lightbox.submit($form, Lightbox.changeContent); Lightbox.submit($form, Lightbox.changeContent);
} else { } else {
$('#modal').find('.fa.fa-spinner').remove(); $('#modal').find('.fa.fa-spinner').remove();
......
...@@ -126,6 +126,8 @@ function registerLightboxEvents() { ...@@ -126,6 +126,8 @@ function registerLightboxEvents() {
$(modal).find("form input[type=submit]").click(function() { $(modal).find("form input[type=submit]").click(function() {
// Abort requests triggered by the lightbox // Abort requests triggered by the lightbox
$('#modal .fa-spinner').remove(); $('#modal .fa-spinner').remove();
// Remove other clicks
$(modal).find('input[type="submit"][clicked=true]').attr('clicked', false);
// Add useful information // Add useful information
$(this).attr("clicked", "true"); $(this).attr("clicked", "true");
// Add prettiness // Add prettiness
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment