Include new loginForm

ylavoie · Jun 19, 2020 · 50e840b · 50e840b
1 parent b713609
commit 50e840b
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 18 deletions.
diff --git a/UI/js-src/lsmb/loginForm.js b/UI/js-src/lsmb/loginForm.js
@@ -1,13 +1,15 @@
 /** @format */
 
-require([
+define([
+   "dojo/_base/declare",
    "dojo/request/xhr",
    "dojo/dom",
    "dojo/dom-style",
    "dojo/json",
+   "dijit/form/Form",
    "dijit/Dialog",
    "dijit/ProgressBar"
-], function (xhr, dom, domStyle, json, dialog, progressBar) {
+], function (declare, xhr, dom, domStyle, json, Form, dialog, progressBar) {
    // Make indicator visible
    function showIndicator() {
       domStyle.set(dom.byId("login-indicator"), "visibility", "visible");
@@ -77,19 +79,16 @@ require([
       indicator.startup();
    }
 
-   // Submit form and show a 10 seconds progress bar
-   function submitForm() {
-      showIndicator();
-      window.setTimeout(showIndicator, 0);
-      window.setTimeout(sendForm, 10);
-      return false;
-   }
-
-   window.addEventListener(
-       'load',
-       function () {
-           setIndicator();
-           // Make it public
-           window.submitForm = submitForm;
-       });
+   return declare("lsmb/loginForm", [Form], {
+      startup: function () {
+         this.inherited(arguments);
+         setIndicator();
+      },
+      onSubmit: function () {
+         showIndicator();
+         window.setTimeout(showIndicator, 0);
+         window.setTimeout(sendForm, 10);
+         return false;
+      }
+   });
 });
diff --git a/UI/js-src/lsmb/main.js b/UI/js-src/lsmb/main.js
@@ -44,7 +44,7 @@ define([
    "lsmb/InvoiceLines",
    "lsmb/journal/fx_checkbox",
    "lsmb/layout/TableContainer",
-   "lsmb/login",
+   "lsmb/loginForm",
    "lsmb/MainContentPane",
    "lsmb/MaximizeMinimize",
    "lsmb/menus/Tree",