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
5a8177d7
Commit
5a8177d7
authored
Nov 16, 2022
by
NGUYEN HOANG SON
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix confirm modal logout
parent
e511043b
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
8 deletions
+11
-8
abweb/common/js/header.js
+6
-5
abweb/js/pushMessageDetail/pushMessageDetail.js
+4
-3
abweb/js/pushMessageList/pushMessageList.js
+1
-0
No files found.
abweb/common/js/header.js
View file @
5a8177d7
...
...
@@ -37,11 +37,12 @@ HEADER.goToHomePage = function (pageId) {
*/
HEADER
.
logoutFunction
=
function
()
{
console
.
log
(
'clicked logout'
);
$
(
'#modalTitle'
).
text
(
I18N
.
i18nText
(
"confirmation"
));
$
(
'#msgModel'
).
text
(
I18N
.
i18nText
(
'msgLogoutConfirm'
));
$
(
'#confirmYes'
).
show
();
$
(
'#confirmYes'
).
click
(
HEADER
.
processLogout
);
$
(
'#confirmNo'
).
text
(
I18N
.
i18nText
(
"confirmNo"
));
COMMON
.
showConfirm
(
'msgLogoutConfirm'
,
HEADER
.
processLogout
);
// $('#modalTitle').text(I18N.i18nText("confirmation"));
// $('#msgModel').text(I18N.i18nText('msgLogoutConfirm'));
// $('#confirmYes').show();
// $('#confirmYes').click(HEADER.processLogout);
// $('#confirmNo').text(I18N.i18nText("confirmNo"));
};
/**
...
...
abweb/js/pushMessageDetail/pushMessageDetail.js
View file @
5a8177d7
...
...
@@ -26,20 +26,21 @@ PushMessageDetail.init = function () {
COMMON
.
checkAuth
(
false
);
//load common html
TEMPLATE
.
loadHeader
(
'#includedHeader'
);
TEMPLATE
.
loadConfirmModal
();
const
navs
=
[
{
titleLang
:
'dashboard'
,
href
:
'dashboard.html'
,
},
{
titleLang
:
'
messageListTitle
'
,
titleLang
:
'
pushMessageList
'
,
href
:
'pushMessageList.html'
,
},
{
titleLang
:
'
m
essageDetail'
,
titleLang
:
'
pushM
essageDetail'
,
},
];
TEMPLATE
.
loadMainNavsTitle
(
'#includedMainTitle'
,
'
m
essageDetail'
,
navs
,
null
);
TEMPLATE
.
loadMainNavsTitle
(
'#includedMainTitle'
,
'
pushM
essageDetail'
,
navs
,
null
);
//request message detail data
let
urlParam
=
COMMON
.
getUrlParameter
();
if
(
typeof
urlParam
!==
'object'
||
typeof
urlParam
.
pushMessageId
===
'undefined'
)
{
...
...
abweb/js/pushMessageList/pushMessageList.js
View file @
5a8177d7
...
...
@@ -12,6 +12,7 @@ PushMessageList.init = function () {
//Check if user is logged in
COMMON
.
checkAuth
(
false
);
TEMPLATE
.
loadHeader
(
'#includedHeader'
);
TEMPLATE
.
loadConfirmModal
();
const
navs
=
[
{
titleLang
:
'dashboard'
,
...
...
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