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

change call push message list init when ready See merge request !16

Merge branch 'feature/1.0_check_web_dev_50267' into 'feature/1.0_check_web_dev'
change call push message list init when ready See merge request !16
d394f378 · Takumi Imai · 3e8b4c1e · abd71600 · d394f378 · d394f378
Commit d394f378 authored Nov 04, 2022 by Takumi Imai
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 9 deletions

abvw/html/push-message-list.html
+7 -2

abvw/js/pushMessageList/push-message-list.js
+2 -7

No files found.
--- a/abvw/html/push-message-list.html
+++ b/abvw/html/push-message-list.html
@@ -24,12 +24,17 @@
    <script src="../common/js/constant.js?__UPDATEID__"></script>
    <script src="../common/js/common.js?__UPDATEID__"></script>
+    <script type="text/javascript" src="../js/template/template.js"></script>
    <script type="text/javascript" src="../js/pushMessageList/push-message-list.js"></script>
+    <script type="text/javascript">
+        $(document).ready(function(){
+            PushMessageList.init();
+        });
+    </script>
 </head>
-<body onload="PushMessageList.init();">
+<body>
    <!-- header -->
    <div id="includedHeader"></div>

--- a/abvw/js/pushMessageList/push-message-list.js
+++ b/abvw/js/pushMessageList/push-message-list.js
@@ -9,9 +9,7 @@ PushMessageList.baseApiUrl = CONSTANT.URL.CMS.BASE + ClientData.userInfo_account
 * Init when html onload
 */
 PushMessageList.init = function() {
-    $("#includedHeader").load("../common/header.html" , function() {
+    TEMPLATE.loadHearder("#includedHeader");
-        I18N.initi18n();
-    });
    PushMessageList.getMessageList(function(messageList) {
        PushMessageList.generateMessageListHtml(messageList.pushMessageList);
    });
@@ -26,15 +24,12 @@ PushMessageList.getMessageList = function (callback) {
        sid: COMMON.getSid(),
    };
    const url = PushMessageList.baseApiUrl;
-    COMMON.cmsAjax(url, param, false, function (json) {
+    COMMON.cmsAjax(url, param, true, function (json) {
        if (callback) {
            callback(json);
        }
    }, function() {
        console.log('PushMessageList.getMessageList error');
-        if (callback) {
-            callback(PushMessageList.dummyMessageListJson);
-        }
    });
 };