Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
check
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abook_web
check
Commits
86419b42
Commit
86419b42
authored
Apr 03, 2015
by
vietdo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
#15763 プッシュ通知が無効ならヘッダの「通知」ボタンを非表示にする
parent
bb51b5c2
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
27 additions
and
8 deletions
+27
-8
abvw/bookmark.html
+1
-1
abvw/contentsearch.html
+1
-1
abvw/history.html
+1
-1
abvw/js/bookmark.js
+4
-0
abvw/js/contentsearch.js
+4
-0
abvw/js/header.js
+5
-1
abvw/js/history.js
+4
-0
abvw/js/home.js
+2
-3
abvw/js/settings.js
+4
-0
abvw/settings.html
+1
-1
login.html
+0
-0
No files found.
abvw/bookmark.html
View file @
86419b42
...
...
@@ -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
View file @
86419b42
...
...
@@ -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
View file @
86419b42
...
...
@@ -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
View file @
86419b42
...
...
@@ -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
View file @
86419b42
...
...
@@ -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
View file @
86419b42
...
...
@@ -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
View file @
86419b42
...
...
@@ -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
View file @
86419b42
...
...
@@ -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
View file @
86419b42
...
...
@@ -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
View file @
86419b42
...
...
@@ -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>
...
...
login.html
View file @
86419b42
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment