#15763 プッシュ通知が無効ならヘッダの「通知」ボタンを非表示にする

abvw/bookmark.html

@@ -96,7 +96,7 @@
 				</ul>
 			</div>
 			<ul class="button">
-				<li class="floatL" id="dspPushMessage">
+				<li class="floatL" id="dspPushMessage" style="display:none">
 					<a href="#" id="liPushMessage"><span class="pushMessage"><span class="icon"></span> <span class="lang" lang="txtPushAlert"><!--新着 : --></span><span id="numbermessage"></span><span class="arrow"></span></span></a>
 					<div id="accordion" style="display:none;">
 						<div id="show-push-message"></div>

abvw/contentsearch.html

@@ -102,7 +102,7 @@
 				</ul>
 			</div>
 			<ul class="button">
-				<li class="floatL" id="dspPushMessage">
+				<li class="floatL" id="dspPushMessage" style="display:none">
 					<a href="#" id="liPushMessage"><span class="pushMessage"><span class="icon"></span> <span class="lang" lang="txtPushAlert"><!--新着 : --></span><span id="numbermessage"></span><span class="arrow"></span></span></a>
 					<div id="accordion" style="display:none;">
 						<div id="show-push-message"></div>

abvw/history.html

@@ -106,7 +106,7 @@
 				</ul>
 			</div>
 			<ul class="button">
-				<li class="floatL" id="dspPushMessage">
+				<li class="floatL" id="dspPushMessage" style="display:none">
 					<a href="#" id="liPushMessage"><span class="pushMessage"><span class="icon"></span> <span class="lang" lang="txtPushAlert"><!--新着 : --></span><span id="numbermessage"></span><span class="arrow"></span></span></a>
 					<div id="accordion" style="display:none;">
 						<div id="show-push-message"></div>

abvw/js/bookmark.js

@@ -82,6 +82,10 @@ $(document).ready(function () {
         $('#dspPushMessage').hide();
     }
 
+    if((ClientData.serviceOpt_apns() == 'Y') || (ClientData.serviceOpt_usable_push_message() == 'Y')) {
+    	$('#dspPushMessage').show();
+    }
+
     //ダイアログ関連
     $("#dspTitleNm").click(BOOKMARK.dspTitleNm_Click);
     $("#dspTitleNmKn").click(BOOKMARK.dspTitleNmKn_Click);

abvw/js/contentsearch.js

@@ -112,6 +112,10 @@ $(document).ready(function(){
 		HEADER.checkForceChangePassword();
 	}
 
+	if((ClientData.serviceOpt_apns() == 'Y') || (ClientData.serviceOpt_usable_push_message() == 'Y')) {
+    	$('#dspPushMessage').show();
+    }
+
     if (COMMON.isAnonymousLogin()) {
         //プッシュメッセージ隠す
         $('#dspPushMessage').hide();

abvw/js/header.js

@@ -824,8 +824,11 @@ HEADER.initPushMessage = function()
 
         // check new push message
         if (COMMON.isAnonymousLogin() == false ) {
+        	if((ClientData.serviceOpt_apns() == 'Y') || (ClientData.serviceOpt_usable_push_message() == 'Y')) {
         		 HEADER.getPushMessageNew();
             }
+
+        }
     };
 
 // get time wait check new push message
@@ -860,6 +863,7 @@ HEADER.getPushMessageNew = function()
 
 // callback get number new message success
 HEADER.callbackGetPushMessageNewSuccess = function(data) {
+
     if (data) {
         // get current number message in session
         var currentMessage = parseInt(ClientData.pushInfo_newMsgNumber());
@@ -867,7 +871,6 @@ HEADER.callbackGetPushMessageNewSuccess = function(data) {
             currentMessage = 0;
         }
         var totalMessage = currentMessage + data.count;
-
         if ($('#liPushMessage').hasClass('hide')) {
             // update new number message to session
             ClientData.pushInfo_newMsgNumber(totalMessage);
@@ -917,6 +920,7 @@ HEADER.getPushMessageList = function() {
     		"post",
     		params,
     		function (data) {
+    			console.log(data);
     			// reset number message
     			ClientData.pushInfo_newMsgNumber(0);
     			// hide number new message

abvw/js/history.js

@@ -99,6 +99,10 @@ $(document).ready(function(){
 		HEADER.checkForceChangePassword();
  	}
 
+ 	if((ClientData.serviceOpt_apns() == 'Y') || (ClientData.serviceOpt_usable_push_message() == 'Y')) {
+    	$('#dspPushMessage').show();
+    }
+
     if (COMMON.isAnonymousLogin()) {
         //プッシュメッセージ隠す
         $('#dspPushMessage').hide();

abvw/js/home.js

@@ -150,9 +150,8 @@ $(document).ready(function () {
                 });
             }
         }
-        console.log(ClientData.serviceOpt_apns());
-        console.log(ClientData.serviceOpt_usable_push_message());
-        if((ClientData.serviceOpt_apns() == 'Y') && (ClientData.serviceOpt_usable_push_message() == 'Y')) {
+
+        if((ClientData.serviceOpt_apns() == 'Y') || (ClientData.serviceOpt_usable_push_message() == 'Y')) {
         	$('#dspPushMessage').show();
         }
 

abvw/js/settings.js

@@ -15,6 +15,10 @@ $(document).ready(function () {
     // Set bookmark screen
     ClientData.BookmarkScreen(COMMON.ScreenIds.Setting);
 
+    if((ClientData.serviceOpt_apns() == 'Y') || (ClientData.serviceOpt_usable_push_message() == 'Y')) {
+    	$('#dspPushMessage').show();
+    }
+
     SETTINGS.initScreen();
 
     $("#dspSave").click(SETTINGS.dspSave_Click);

abvw/settings.html

@@ -86,7 +86,7 @@
 				</ul>
 			</div>
 			<ul class="button">
-				<li class="floatL">
+				<li class="floatL" id="dspPushMessage" style="display:none">
 					<a href="#" id="liPushMessage"><span class="pushMessage"><span class="icon"></span> <span class="lang" lang="txtPushAlert"><!--新着 : --></span><span id="numbermessage"></span><span class="arrow"></span></span></a>
 					<div id="accordion" style="display:none;">
 						<div id="show-push-message"></div>