nitro/nitro-react
1
0
Fork 0
mirror of https://github.com/billsonnn/nitro-react.git synced 2024-11-22 22:30:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix-text-invalid-floor' into 'dev'

Browse Source 
Fix issue #211 - Text invalid floor

See merge request nitro/nitro-react!97
This commit is contained in:
Bill 2022-10-25 23:45:39 +00:00
commit 6b7d97329b
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/hooks/notification/useNotification.ts
View File

@ -84,19 +84,21 @@ const useNotificationState = () =>
if(configuration) for(const key in configuration) options.set(key, configuration[key]);
if (type === 'floorplan_editor.error') options.set('message', options.get('message').replace(/[^a-zA-Z._ ]/g, ''));
const title = getNotificationPart(options, type, 'title', true);
const message = getNotificationPart(options, type, 'message', true).replace(/\\r/g, '\r');
const linkTitle = getNotificationPart(options, type, 'linkTitle', false);
const linkUrl = getNotificationPart(options, type, 'linkUrl', false);
const image = getNotificationImageUrl(options, type);
if(options.get('display') === 'BUBBLE')
{
showSingleBubble(LocalizeText(message), NotificationBubbleType.INFO, image, linkUrl);
}
else
{
simpleAlert(message, type, linkUrl, linkTitle, title, image);
simpleAlert(LocalizeText(message), type, linkUrl, linkTitle, title, image);
}
if(options.get('sound')) PlaySound(options.get('sound'));
@ -346,7 +348,7 @@ const useNotificationState = () =>
useMessageEvent<HotelClosedAndOpensEvent>(HotelClosedAndOpensEvent, event =>
{
const parser = event.getParser();
simpleAlert(LocalizeText('opening.hours.disconnected', [ 'h', 'm' ], [ parser.openHour.toString(), parser.openMinute.toString() ]), NotificationAlertType.DEFAULT, null, null, LocalizeText('opening.hours.title'));
});