From 1088649fc3b28726f4c2269ba90f2f942c56876b Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Wed, 6 Jul 2016 22:31:17 +0200
Subject: [PATCH] Re-order for correct flow

---
 UI/FormManager.js | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/UI/FormManager.js b/UI/FormManager.js
index 36878e8..9d47693 100644
--- a/UI/FormManager.js
+++ b/UI/FormManager.js
@@ -157,6 +157,14 @@
             injects = form.getSubmitInjects(),
             counter = 0;
 
+        // todo: test if attach necessary (maybe already attached in event manager)
+        // Register normal form behavior
+        this.app.eventManager.attach(form.getId(), function ()
+        {
+            self.submitForm(form);
+        });
+
+        // Run all injects first
         for (let property in injects) {
             if (injects.hasOwnProperty(property)) {
                 counter++;
@@ -166,12 +174,6 @@
                 this.app.logger.warning('Invalid property.');
             }
         }
-
-        this.app.eventManager.attach(form.getId(), function ()
-        {
-            self.submitForm(form);
-        });
-        this.app.eventManager.trigger('?', form.getId());
     };
 
     /**
@@ -186,6 +188,7 @@
      */
     jsOMS.UI.FormManager.prototype.submitForm = function (form)
     {
+        console.log('triggered');
         if (!form.isValid()) {
             this.app.logger.debug('Form "' + form.getId() + '" has invalid values.');
             return;
@@ -220,7 +223,6 @@
                     }
                 }
             } catch (e) {
-                console.log(e);
                 self.app.logger.error('Invalid form response. \n' +
                     'URL: ' + form.getAction() + '\n' +
                     'Request: ' + JSON.stringify(form.getData()) + '\n' +