Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(Tizen) Add logout to exit menu #5271

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

(Tizen) Add logout to exit menu #5271

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0a42aa1
Add logout to exit menu
RoboMagus Mar 8, 2024
4388e5e
Only show logout option if user is logged in
RoboMagus Mar 9, 2024
5f137b1
Fix dashboard import
RoboMagus Mar 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 20 additions & 13 deletions src/components/apphost.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,19 +304,26 @@ function askForExit() {
return;
}

import('../components/actionSheet/actionSheet').then((actionsheet) => {
exitPromise = actionsheet.show({
title: globalize.translate('MessageConfirmAppExit'),
items: [
{ id: 'yes', name: globalize.translate('Yes') },
{ id: 'no', name: globalize.translate('No') }
]
}).then(function (value) {
if (value === 'yes') {
doExit();
}
}).finally(function () {
exitPromise = null;
import('../scripts/clientUtils').then(() => {
github-actions[bot] marked this conversation as resolved.
Show resolved Hide resolved
import('../components/actionSheet/actionSheet').then((actionsheet) => {
const userId = Dashboard.getCurrentUserId();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

'Dashboard' is not defined. no-undef

const logoutEntry = userId ? [{ id: 'logout', name: globalize.translate('ButtonSignOut') }] : [];
exitPromise = actionsheet.show({
title: globalize.translate('MessageConfirmAppExit'),
items: [
...logoutEntry,
{ id: 'yes', name: globalize.translate('Yes') },
{ id: 'no', name: globalize.translate('No') }
]
}).then(function (value) {
if (value === 'yes') {
doExit();
} else if (value === 'logout') {
Dashboard.logout();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

'Dashboard' is not defined. no-undef

}
}).finally(function () {
exitPromise = null;
});
});
});
}
Expand Down
Loading