Skip to content

C
check
Commit 5b4f86b0 by Takumi Imai
Options

Merge branch 'feature/1.0_check_web_dev' into 'feature/1.0_check_web' 

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

See merge request !100
parents d7c9f4e4 a8ef0dfa
Showing with 8 additions and 14 deletions
abweb/html/reportForm.html
...@@ -26,6 +26,11 @@ ...@@ -26,6 +26,11 @@
<script type="text/javascript" src="../js/template/template.js"></script> <script type="text/javascript" src="../js/template/template.js"></script>
<script src="../js/reportForm/reportForm.js?__UPDATEID__"></script> <script src="../js/reportForm/reportForm.js?__UPDATEID__"></script>
<script type="text/javascript">
$(document).ready(function () {
RF.init();
});
</script>
</head> </head>
<body> <body>
......
abweb/js/reportForm/reportForm.js
...@@ -11,20 +11,11 @@ RF.addReportFlg; ...@@ -11,20 +11,11 @@ RF.addReportFlg;
* init * init
*/ */
RF.init = function () { 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(); COMMON.showLoading();
//Check if user is logged in //Check if user is logged in
COMMON.checkAuth(false); setTimeout(function () {
COMMON.checkAuth(false);
}, 2000);
COMMON.checkQuickReport(function (result) { COMMON.checkQuickReport(function (result) {
if (result) { if (result) {
RF.addReportFlg = result.addReportFlg; RF.addReportFlg = result.addReportFlg;
...@@ -33,8 +24,6 @@ RF.init = function () { ...@@ -33,8 +24,6 @@ RF.init = function () {
RF.loadCommon(); RF.loadCommon();
}; };
RF.interval = setInterval(RF.init(), 1000);
/** /**
* load common * load common
*/ */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment