tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

events.js: Properly handle the default for param `autosubmit' 

refs #8369
This commit is contained in:
Johannes Meyer 2015-08-20 14:36:55 +02:00
parent 291c712b44
commit 2fe3c6e5cf
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
public/js/icinga/events.js
View File

@ -246,6 +246,10 @@
encoding = 'application/x-www-form-urlencoded'; encoding = 'application/x-www-form-urlencoded';
} }
if (typeof autosubmit === 'undefined') {
autosubmit = false;
}
if ($button.length === 0) { if ($button.length === 0) {
$button = $('input[type=submit]', $form).add('button[type=submit]', $form).first(); $button = $('input[type=submit]', $form).add('button[type=submit]', $form).first();
} }
@ -271,7 +275,7 @@
if (method === 'GET') { if (method === 'GET') {
var dataObj = $form.serializeObject(); var dataObj = $form.serializeObject();
if (typeof autosubmit === 'undefined' || ! autosubmit) { if (! autosubmit) {
if ($button.length && $button.attr('name') !== 'undefined') { if ($button.length && $button.attr('name') !== 'undefined') {
dataObj[$button.attr('name')] = $button.attr('value'); dataObj[$button.attr('name')] = $button.attr('value');
} }
@ -289,7 +293,7 @@
$form.find(':input:not(:disabled)').prop('disabled', true); $form.find(':input:not(:disabled)').prop('disabled', true);
}, 0); }, 0);
if (! typeof autosubmit === 'undefined' && autosubmit) { if (autosubmit) {
if ($button.length) { if ($button.length) {
// We're autosubmitting the form so the button has not been clicked, however, // We're autosubmitting the form so the button has not been clicked, however,
// to be really safe, we're disabling the button explicitly, just in case.. // to be really safe, we're disabling the button explicitly, just in case..
@ -310,7 +314,7 @@
data = $form.serializeArray(); data = $form.serializeArray();
} }
if (typeof autosubmit === 'undefined' || ! autosubmit) { if (! autosubmit) {
if ($button.length && $button.attr('name') !== 'undefined') { if ($button.length && $button.attr('name') !== 'undefined') {
if (encoding === 'multipart/form-data') { if (encoding === 'multipart/form-data') {
data.append($button.attr('name'), $button.attr('value')); data.append($button.attr('name'), $button.attr('value'));