From fde528916aa795c406a04ce74715741ad3caab08 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Fri, 6 May 2016 18:23:50 +0200 Subject: [PATCH] Formatting and bug fixes --- UI/Button.js | 6 +++--- UI/FormManager.js | 11 ++++------- UI/UIManager.js | 2 +- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/UI/Button.js b/UI/Button.js index 11b8a24..b3244bc 100644 --- a/UI/Button.js +++ b/UI/Button.js @@ -22,12 +22,12 @@ if (typeof id !== 'undefined') { this.bindButton(id) } else { - let buttons = document.getElementsByTagName('form'), + let buttons = document.getElementsByTagName('button'), length = buttons.length; for (var i = 0; i < length; i++) { - if (typeof buttons[i].getAttribute('data-action') !== 'undefined') { - this.bind(buttons[i].id); + if (typeof buttons[i].getAttribute('data-action') !== 'undefined' && buttons[i].getAttribute('id') !== null) { + this.bindButton(buttons[i].getAttribute('id')); } } } diff --git a/UI/FormManager.js b/UI/FormManager.js index 1996e4f..97942d7 100644 --- a/UI/FormManager.js +++ b/UI/FormManager.js @@ -48,8 +48,8 @@ length = forms.length; for (var i = 0; i < length; i++) { - if (typeof this.ignore[forms[i].id] === 'undefined') { - this.bindForm(forms[i].id); + if (typeof forms[i].getAttribute('id') !== 'undefined' && forms[i].getAttribute('id') !== null && typeof this.ignore[forms[i].getAttribute('id')] === 'undefined') { + this.bindForm(forms[i].getAttribute('id')); } } } @@ -62,14 +62,11 @@ return; } - let self = this; + let self = this; + this.forms[id] = new jsOMS.Views.FormView(id); this.unbind(id); - if (typeof this.ignore[id] === 'undefined') { - this.forms[id] = new jsOMS.Views.FormView(id); - } - this.forms[id].getSubmit().addEventListener('click', function (event) { jsOMS.preventAll(event); diff --git a/UI/UIManager.js b/UI/UIManager.js index 91c6ec5..543414b 100644 --- a/UI/UIManager.js +++ b/UI/UIManager.js @@ -23,7 +23,7 @@ this.formManager = new jsOMS.UI.FormManager(this.app); this.tabManager = new jsOMS.UI.TabManager(this.app.responseManager); this.tableManager = new jsOMS.UI.TableManager(this.app.responseManager); - this.button = new jsOMS.Ui.Button(this.app); + this.button = new jsOMS.UI.Button(this.app); }; /**