#50850　Edgeだと作業が開かない

a8ef0dfa · Takumi Imai · a486be7b · a8ef0dfa · a8ef0dfa
Commit a8ef0dfa authored Nov 28, 2022 by Takumi Imai
Show whitespace changes
Inline Side-by-side

Showing with 7 additions and 13 deletions

abweb/html/reportForm.html
+5 -0

abweb/js/reportForm/reportForm.js
+2 -13

No files found.
--- a/abweb/html/reportForm.html
+++ b/abweb/html/reportForm.html
@@ -26,6 +26,11 @@
    <script type="text/javascript" src="../js/template/template.js"></script>

    <script src="../js/reportForm/reportForm.js?__UPDATEID__"></script>
+    <script type="text/javascript">
+        $(document).ready(function () {
+            RF.init();
+        });
+    </script>
 </head>

 <body>

--- a/abweb/js/reportForm/reportForm.js
+++ b/abweb/js/reportForm/reportForm.js
@@ -11,20 +11,11 @@ RF.addReportFlg;
 * init
 */
 RF.init = function () {
-    let count = 0;
-    if (new COMMON.sysSetting() != null) {
-        clearInterval(RF.interval);
-    } else {
-        count++;
-        if (count >= 5) {
-            clearInterval(RF.interval);
-            COMMON.goUrlWithCurrentParams(CONSTANT.PAGE_NAME.LOGIN);
-        }
-        return;
-    }
    COMMON.showLoading();
    //Check if user is logged in
+    setTimeout(function () {
        COMMON.checkAuth(false);
+    }, 2000);
    COMMON.checkQuickReport(function (result) {
        if (result) {
            RF.addReportFlg = result.addReportFlg;
@@ -33,8 +24,6 @@ RF.init = function () {
    RF.loadCommon();
 };

-RF.interval = setInterval(RF.init(), 1000);
-
 /**
 * load common
 */