@chat21/chat21-ionic 3.0.80 → 3.0.81-rc.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +75 -3
- package/README.md +2 -2
- package/angular.json +1 -0
- package/deploy_amazon_beta.sh +29 -0
- package/deploy_amazon_prod.sh +30 -0
- package/package.json +2 -2
- package/src/app/app.component.html +7 -1
- package/src/app/app.component.scss +18 -2
- package/src/app/app.component.ts +113 -17
- package/src/app/app.module.ts +3 -1
- package/src/app/chatlib/conversation-detail/conversation-content/conversation-content.component.ts +8 -1
- package/src/app/chatlib/conversation-detail/ion-conversation-detail/ion-conversation-detail.component.html +77 -23
- package/src/app/chatlib/conversation-detail/ion-conversation-detail/ion-conversation-detail.component.scss +168 -86
- package/src/app/chatlib/conversation-detail/ion-conversation-detail/ion-conversation-detail.component.ts +39 -2
- package/src/app/chatlib/conversation-detail/message/bubble-message/bubble-message.component.html +11 -24
- package/src/app/chatlib/conversation-detail/message/bubble-message/bubble-message.component.scss +6 -10
- package/src/app/chatlib/conversation-detail/message/bubble-message/bubble-message.component.spec.ts +2 -2
- package/src/app/chatlib/conversation-detail/message/bubble-message/bubble-message.component.ts +16 -25
- package/src/app/chatlib/conversation-detail/message/buttons/action-button/action-button.component.html +5 -1
- package/src/app/chatlib/conversation-detail/message/buttons/action-button/action-button.component.scss +22 -15
- package/src/app/chatlib/conversation-detail/message/buttons/action-button/action-button.component.ts +25 -5
- package/src/app/chatlib/conversation-detail/message/buttons/link-button/link-button.component.html +2 -1
- package/src/app/chatlib/conversation-detail/message/buttons/link-button/link-button.component.scss +14 -15
- package/src/app/chatlib/conversation-detail/message/buttons/link-button/link-button.component.ts +24 -5
- package/src/app/chatlib/conversation-detail/message/buttons/text-button/text-button.component.html +6 -1
- package/src/app/chatlib/conversation-detail/message/buttons/text-button/text-button.component.scss +12 -13
- package/src/app/chatlib/conversation-detail/message/buttons/text-button/text-button.component.ts +26 -5
- package/src/app/chatlib/conversation-detail/message/frame/frame.component.html +8 -2
- package/src/app/chatlib/conversation-detail/message/frame/frame.component.scss +36 -0
- package/src/app/chatlib/conversation-detail/message/frame/frame.component.ts +2 -2
- package/src/app/chatlib/conversation-detail/message/html/html.component.ts +0 -1
- package/src/app/chatlib/conversation-detail/message/image/image.component.html +1 -1
- package/src/app/chatlib/conversation-detail/message/image/image.component.scss +17 -5
- package/src/app/chatlib/conversation-detail/message/image/image.component.ts +1 -1
- package/src/app/chatlib/conversation-detail/message/info-message/info-message.component.scss +3 -2
- package/src/app/chatlib/conversation-detail/message/message-attachment/message-attachment.component.html +16 -6
- package/src/app/chatlib/conversation-detail/message/message-attachment/message-attachment.component.scss +1 -3
- package/src/app/chatlib/conversation-detail/message/message-attachment/message-attachment.component.ts +2 -0
- package/src/app/chatlib/list-conversations-component/ion-list-conversations/ion-list-conversations.component.html +78 -52
- package/src/app/chatlib/list-conversations-component/ion-list-conversations/ion-list-conversations.component.scss +62 -20
- package/src/app/chatlib/list-conversations-component/ion-list-conversations/ion-list-conversations.component.ts +14 -10
- package/src/app/components/canned-response/canned-response.component.html +9 -8
- package/src/app/components/canned-response/canned-response.component.scss +24 -2
- package/src/app/components/canned-response/canned-response.component.ts +5 -5
- package/src/app/components/contacts-directory/contacts-directory.component.html +22 -26
- package/src/app/components/contacts-directory/contacts-directory.component.scss +8 -6
- package/src/app/components/conversation-detail/header-conversation-detail/header-conversation-detail.component.html +61 -42
- package/src/app/components/conversation-detail/header-conversation-detail/header-conversation-detail.component.scss +98 -61
- package/src/app/components/conversation-detail/header-conversation-detail/header-conversation-detail.component.ts +9 -25
- package/src/app/components/conversation-detail/header-conversation-detail/header-conversation-detail.component_2.html +116 -0
- package/src/app/components/conversation-detail/message-text-area/message-text-area.component.html +8 -6
- package/src/app/components/conversation-detail/message-text-area/message-text-area.component.scss +4 -4
- package/src/app/components/conversation-detail/message-text-area/message-text-area.component.ts +25 -87
- package/src/app/components/conversation-info/info-content/info-content.component.html +2 -1
- package/src/app/components/conversation-info/info-content/info-content.component.ts +3 -2
- package/src/app/components/conversation-info/info-direct/info-direct.component.html +1 -9
- package/src/app/components/conversation-info/info-direct/info-direct.component.ts +0 -2
- package/src/app/components/conversation-info/info-group/info-group.component.html +44 -108
- package/src/app/components/conversation-info/info-group/info-group.component.scss +101 -61
- package/src/app/components/conversation-info/info-group/info-group.component.ts +1 -0
- package/src/app/components/{ddp-header/ddp-header.component.html → conversations-list/header-conversations-list/header-conversations-list.component.html} +3 -3
- package/src/app/components/{ddp-header/ddp-header.component.scss → conversations-list/header-conversations-list/header-conversations-list.component.scss} +16 -4
- package/src/app/components/{conversation-detail/bubble-my-message/bubble-my-message.component.spec.ts → conversations-list/header-conversations-list/header-conversations-list.component.spec.ts} +6 -6
- package/src/app/components/{ddp-header/ddp-header.component.ts → conversations-list/header-conversations-list/header-conversations-list.component.ts} +7 -16
- package/src/app/components/conversations-list/header-conversations-list-archived/header-conversations-list-archived.component.html +12 -0
- package/src/app/components/conversations-list/header-conversations-list-archived/header-conversations-list-archived.component.scss +14 -0
- package/src/app/components/{conversation-detail/option-header/option-header.component.spec.ts → conversations-list/header-conversations-list-archived/header-conversations-list-archived.component.spec.ts} +5 -5
- package/src/app/components/{conversation-detail/option-header/option-header.component.ts → conversations-list/header-conversations-list-archived/header-conversations-list-archived.component.ts} +5 -4
- package/src/app/components/navbar/navbar.component.html +103 -0
- package/src/app/components/navbar/navbar.component.scss +249 -0
- package/src/app/components/{ddp-header/ddp-header.component.spec.ts → navbar/navbar.component.spec.ts} +6 -6
- package/src/app/components/navbar/navbar.component.ts +189 -0
- package/src/app/components/project-item/project-item.component.html +98 -149
- package/src/app/components/project-item/project-item.component.scss +42 -35
- package/src/app/components/project-item/project-item.component.ts +16 -4
- package/src/app/components/sidebar-user-details/sidebar-user-details.component.html +3 -3
- package/src/app/components/sidebar-user-details/sidebar-user-details.component.ts +2 -7
- package/src/app/components/utils/user-presence/user-presence.component.html +7 -2
- package/src/app/components/utils/user-presence/user-presence.component.scss +35 -18
- package/src/app/components/utils/user-presence/user-presence.component.ts +6 -10
- package/src/app/pages/contacts-directory/contacts-directory.page.html +1 -1
- package/src/app/pages/contacts-directory/contacts-directory.page.scss +41 -0
- package/src/app/pages/contacts-directory/contacts-directory.page.ts +2 -0
- package/src/app/pages/conversation-detail/conversation-detail.module.ts +0 -8
- package/src/app/pages/conversation-detail/conversation-detail.page.html +40 -23
- package/src/app/pages/conversation-detail/conversation-detail.page.scss +40 -250
- package/src/app/pages/conversation-detail/conversation-detail.page.ts +184 -117
- package/src/app/pages/conversations-list/conversations-list.page.html +11 -8
- package/src/app/pages/conversations-list/conversations-list.page.scss +11 -2
- package/src/app/pages/conversations-list/conversations-list.page.ts +25 -22
- package/src/app/pages/create-canned-response/create-canned-response.page.ts +13 -13
- package/src/app/pages/loader-preview/loader-preview.page.html +1 -1
- package/src/app/pages/loader-preview/loader-preview.page.scss +4 -0
- package/src/app/pages/loader-preview/loader-preview.page.ts +1 -2
- package/src/app/pages/profile-info/profile-info.page.html +2 -4
- package/src/app/pages/unassigned-conversations/unassigned-conversations.page.html +1 -1
- package/src/app/pages/unassigned-conversations/unassigned-conversations.page.scss +42 -0
- package/src/app/pages/unassigned-conversations/unassigned-conversations.page.ts +1 -0
- package/src/app/services/canned-responses/canned-responses.service.ts +26 -0
- package/src/app/services/projects/projects.service.spec.ts +12 -0
- package/src/app/services/projects/projects.service.ts +43 -0
- package/src/app/services/tiledesk/tiledesk.service.ts +2 -26
- package/src/app/shared/shared.module.ts +24 -33
- package/src/assets/i18n/ar.json +278 -265
- package/src/assets/i18n/az.json +14 -1
- package/src/assets/i18n/de.json +15 -2
- package/src/assets/i18n/en.json +15 -2
- package/src/assets/i18n/es.json +15 -2
- package/src/assets/i18n/fr.json +14 -1
- package/src/assets/i18n/it.json +14 -1
- package/src/assets/i18n/kk.json +15 -2
- package/src/assets/i18n/pt.json +15 -2
- package/src/assets/i18n/ru.json +14 -1
- package/src/assets/i18n/sr.json +277 -264
- package/src/assets/i18n/sv.json +15 -2
- package/src/assets/i18n/tr.json +15 -2
- package/src/assets/i18n/uk.json +15 -2
- package/src/assets/i18n/uz.json +14 -1
- package/src/assets/js/chat21client.js +177 -149
- package/src/assets/sounds/interface-start.mp3 +0 -0
- package/src/assets/sounds/wheep-wheep.mp3 +0 -0
- package/src/chat-config-native-mqtt.json +5 -1
- package/src/chat21-core/models/conversation.ts +0 -1
- package/src/chat21-core/models/projects.ts +27 -0
- package/src/chat21-core/providers/firebase/firebase-typing.service.ts +7 -9
- package/src/chat21-core/utils/constants.ts +6 -1
- package/src/chat21-core/utils/convertRequestToConversation.ts +41 -0
- package/src/chat21-core/utils/user-typing/user-typing.component.html +8 -5
- package/src/chat21-core/utils/user-typing/user-typing.component.scss +87 -17
- package/src/chat21-core/utils/user-typing/user-typing.component.ts +12 -94
- package/src/chat21-core/utils/utils.ts +38 -10
- package/src/global.scss +52 -56
- package/src/index.html +2 -2
- package/src/variables.scss +30 -10
- package/src/app/components/conversation-detail/bubble-day-message/bubble-day-message.component.html +0 -3
- package/src/app/components/conversation-detail/bubble-day-message/bubble-day-message.component.scss +0 -21
- package/src/app/components/conversation-detail/bubble-day-message/bubble-day-message.component.spec.ts +0 -24
- package/src/app/components/conversation-detail/bubble-day-message/bubble-day-message.component.ts +0 -14
- package/src/app/components/conversation-detail/bubble-my-message/bubble-my-message.component.html +0 -54
- package/src/app/components/conversation-detail/bubble-my-message/bubble-my-message.component.scss +0 -98
- package/src/app/components/conversation-detail/bubble-my-message/bubble-my-message.component.ts +0 -84
- package/src/app/components/conversation-detail/bubble-others-message/bubble-others-message.component.html +0 -30
- package/src/app/components/conversation-detail/bubble-others-message/bubble-others-message.component.scss +0 -83
- package/src/app/components/conversation-detail/bubble-others-message/bubble-others-message.component.spec.ts +0 -24
- package/src/app/components/conversation-detail/bubble-others-message/bubble-others-message.component.ts +0 -68
- package/src/app/components/conversation-detail/bubble-system-message/bubble-system-message.component.html +0 -3
- package/src/app/components/conversation-detail/bubble-system-message/bubble-system-message.component.scss +0 -10
- package/src/app/components/conversation-detail/bubble-system-message/bubble-system-message.component.spec.ts +0 -24
- package/src/app/components/conversation-detail/bubble-system-message/bubble-system-message.component.ts +0 -14
- package/src/app/components/conversation-detail/option-header/option-header.component.html +0 -13
- package/src/app/components/conversation-detail/option-header/option-header.component.scss +0 -0
package/src/app/components/conversation-detail/message-text-area/message-text-area.component.scss
CHANGED
|
@@ -4,6 +4,10 @@
|
|
|
4
4
|
height: auto;
|
|
5
5
|
padding: 0;
|
|
6
6
|
margin: 0;
|
|
7
|
+
|
|
8
|
+
ion-icon{
|
|
9
|
+
color: var(--basic-blue);
|
|
10
|
+
}
|
|
7
11
|
.buttons-left {
|
|
8
12
|
position: absolute;
|
|
9
13
|
left: 0;
|
|
@@ -165,10 +169,6 @@
|
|
|
165
169
|
border-radius: 50%;
|
|
166
170
|
}
|
|
167
171
|
|
|
168
|
-
.send-msg-activated {
|
|
169
|
-
color: #3880ff !important;
|
|
170
|
-
}
|
|
171
|
-
|
|
172
172
|
.send-msg-disabled {
|
|
173
173
|
cursor: default;
|
|
174
174
|
opacity: 0.8;
|
package/src/app/components/conversation-detail/message-text-area/message-text-area.component.ts
CHANGED
|
@@ -9,7 +9,7 @@ import { LoaderPreviewPage } from 'src/app/pages/loader-preview/loader-preview.p
|
|
|
9
9
|
// Services
|
|
10
10
|
import { UploadService } from 'src/chat21-core/providers/abstract/upload.service';
|
|
11
11
|
// utils
|
|
12
|
-
import { TYPE_MSG_TEXT } from 'src/chat21-core/utils/constants';
|
|
12
|
+
import { TYPE_MSG_TEXT, TYPE_SUPPORT_GROUP } from 'src/chat21-core/utils/constants';
|
|
13
13
|
// Models
|
|
14
14
|
import { UploadModel } from 'src/chat21-core/models/upload';
|
|
15
15
|
import { Observable } from 'rxjs';
|
|
@@ -62,16 +62,11 @@ export class MessageTextAreaComponent implements OnInit, AfterViewInit, OnChange
|
|
|
62
62
|
public messageString: string;
|
|
63
63
|
public HAS_PASTED: boolean = false;
|
|
64
64
|
public toastMsg: string;
|
|
65
|
-
public TEXAREA_PLACEHOLDER: string;
|
|
66
|
-
public LONG_TEXAREA_PLACEHOLDER: string;
|
|
67
|
-
public SHORT_TEXAREA_PLACEHOLDER: string;
|
|
68
|
-
public SHORTER_TEXAREA_PLACEHOLDER: string;
|
|
69
|
-
public currentWindowWidth: any;
|
|
70
65
|
private logger: LoggerService = LoggerInstance.getInstance();
|
|
71
66
|
public countClicks: number = 0;
|
|
72
|
-
public openCanned: boolean = false;
|
|
73
|
-
public IS_SUPPORT_GROUP_CONVERSATION: boolean;
|
|
74
67
|
public IS_ON_MOBILE_DEVICE: boolean;
|
|
68
|
+
|
|
69
|
+
TYPE_SUPPORT_GROUP = TYPE_SUPPORT_GROUP;
|
|
75
70
|
TYPE_MSG_TEXT = TYPE_MSG_TEXT;
|
|
76
71
|
msg: string
|
|
77
72
|
|
|
@@ -89,7 +84,26 @@ export class MessageTextAreaComponent implements OnInit, AfterViewInit, OnChange
|
|
|
89
84
|
addWhiteSpaceBefore: boolean;
|
|
90
85
|
emojiPerLine: number = 9
|
|
91
86
|
emojiColor: string ="#3880ff"
|
|
92
|
-
emojiiCategories = [ 'recent', 'people', 'nature', 'activity']
|
|
87
|
+
emojiiCategories = [ 'recent', 'people', 'nature', 'activity'] //, 'custom']
|
|
88
|
+
|
|
89
|
+
customEmojis = [
|
|
90
|
+
{
|
|
91
|
+
name: 'Customer-Service',
|
|
92
|
+
shortNames: ['customer'],
|
|
93
|
+
text: 'ee',
|
|
94
|
+
emoticons: [],
|
|
95
|
+
keywords: ['github'],
|
|
96
|
+
imageUrl: 'https://tiledesk.com/wp-content/uploads/2022/11/Customer-Service.png',
|
|
97
|
+
},
|
|
98
|
+
{
|
|
99
|
+
name: 'Octocat',
|
|
100
|
+
shortNames: ['octocat'],
|
|
101
|
+
text: 'rr',
|
|
102
|
+
emoticons: [],
|
|
103
|
+
keywords: ['github'],
|
|
104
|
+
imageUrl: 'https://tiledesk.com/wp-content/uploads/2022/11/FAQ-Chatbot.png',
|
|
105
|
+
}
|
|
106
|
+
];
|
|
93
107
|
/**
|
|
94
108
|
* Constructor
|
|
95
109
|
* @param chooser
|
|
@@ -118,15 +132,8 @@ export class MessageTextAreaComponent implements OnInit, AfterViewInit, OnChange
|
|
|
118
132
|
if (this.areVisibleCAR === false) {
|
|
119
133
|
this.emojiPerLine = 7
|
|
120
134
|
}
|
|
121
|
-
// this.events.subscribe((cannedmessage) => {
|
|
122
|
-
// this.logger.log("[CONVS-DETAIL] [MSG-TEXT-AREA] events.subscribe cannedmessage ", cannedmessage);
|
|
123
|
-
// })
|
|
124
135
|
|
|
125
|
-
// this.logger.log("[CONVS-DETAIL][MSG-TEXT-AREA] LONG_TEXAREA_PLACEHOLDER ", this.LONG_TEXAREA_PLACEHOLDER);
|
|
126
|
-
// this.logger.log("[CONVS-DETAIL][MSG-TEXT-AREA] SHORT_TEXAREA_PLACEHOLDER ", this.SHORT_TEXAREA_PLACEHOLDER);
|
|
127
|
-
// this.logger.log("[CONVS-DETAIL][MSG-TEXT-AREA] SHORTER_TEXAREA_PLACEHOLDER ", this.SHORTER_TEXAREA_PLACEHOLDER);
|
|
128
136
|
this.listenToNewCannedResponseCreated()
|
|
129
|
-
this.getWindowWidth();
|
|
130
137
|
this.isOnMobileDevice()
|
|
131
138
|
}
|
|
132
139
|
|
|
@@ -147,15 +154,8 @@ export class MessageTextAreaComponent implements OnInit, AfterViewInit, OnChange
|
|
|
147
154
|
// this.SHORT_TEXAREA_PLACEHOLDER = this.translationMap.get('LABEL_ENTER_MSG_SHORT')
|
|
148
155
|
// this.SHORTER_TEXAREA_PLACEHOLDER = this.translationMap.get('LABEL_ENTER_MSG_SHORTER')
|
|
149
156
|
|
|
150
|
-
this.TEXAREA_PLACEHOLDER = this.translationMap.get('LABEL_ENTER_MSG_SHORT')
|
|
151
|
-
|
|
152
157
|
}
|
|
153
158
|
|
|
154
|
-
if (this.conversationWith.startsWith("support-group")) {
|
|
155
|
-
this.IS_SUPPORT_GROUP_CONVERSATION = true
|
|
156
|
-
} else {
|
|
157
|
-
this.IS_SUPPORT_GROUP_CONVERSATION = false
|
|
158
|
-
}
|
|
159
159
|
// this.logger.log('[CONVS-DETAIL][MSG-TEXT-AREA] ngOnChanges supportMode ', this.supportMode)
|
|
160
160
|
// this.logger.log('[CONVS-DETAIL][MSG-TEXT-AREA] ngOnChanges disableTextarea ', this.disableTextarea)
|
|
161
161
|
// this.logger.log("[CONVS-DETAIL][MSG-TEXT-AREA] ngOnChanges DROP EVENT ", this.dropEvent);
|
|
@@ -206,36 +206,6 @@ export class MessageTextAreaComponent implements OnInit, AfterViewInit, OnChange
|
|
|
206
206
|
}
|
|
207
207
|
}
|
|
208
208
|
|
|
209
|
-
|
|
210
|
-
getWindowWidth(): any {
|
|
211
|
-
this.currentWindowWidth = window.innerWidth;
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
// if (this.currentWindowWidth >= 844 && this.isOpenInfoConversation === false && this.conversationWith.startsWith("support-group")) {
|
|
215
|
-
// this.TEXAREA_PLACEHOLDER = this.LONG_TEXAREA_PLACEHOLDER;
|
|
216
|
-
// this.logger.log('[CONVS-DETAIL][MSG-TEXT-AREA] currentWindowWidth', this.currentWindowWidth, ' - DISPLAY LONG_TEXAREA_PLACEHOLDER ');
|
|
217
|
-
// } else if (this.currentWindowWidth >= 844 && this.isOpenInfoConversation === true && this.conversationWith.startsWith("support-group")) {
|
|
218
|
-
// this.TEXAREA_PLACEHOLDER = this.SHORT_TEXAREA_PLACEHOLDER;
|
|
219
|
-
// } else if (this.currentWindowWidth < 844 && this.isOpenInfoConversation === false && this.conversationWith.startsWith("support-group")) {
|
|
220
|
-
// this.TEXAREA_PLACEHOLDER = this.SHORT_TEXAREA_PLACEHOLDER;
|
|
221
|
-
// } else if (this.currentWindowWidth < 844 && this.isOpenInfoConversation === true && this.conversationWith.startsWith("support-group")) {
|
|
222
|
-
// this.TEXAREA_PLACEHOLDER = this.SHORTER_TEXAREA_PLACEHOLDER;
|
|
223
|
-
// } else if (!this.conversationWith.startsWith("support-group")) {
|
|
224
|
-
// this.TEXAREA_PLACEHOLDER = this.SHORT_TEXAREA_PLACEHOLDER;
|
|
225
|
-
// }
|
|
226
|
-
|
|
227
|
-
// this.logger.log("[CONVS-DETAIL][MSG-TEXT-AREA] checkPlatformIsMobile() ", checkPlatformIsMobile());
|
|
228
|
-
if (checkPlatformIsMobile() === true) {
|
|
229
|
-
|
|
230
|
-
if (this.currentWindowWidth <= 430 && this.currentWindowWidth >= 274) {
|
|
231
|
-
this.TEXAREA_PLACEHOLDER = this.SHORT_TEXAREA_PLACEHOLDER;
|
|
232
|
-
|
|
233
|
-
} else if (this.currentWindowWidth <= 273) {
|
|
234
|
-
this.TEXAREA_PLACEHOLDER = this.SHORTER_TEXAREA_PLACEHOLDER;
|
|
235
|
-
}
|
|
236
|
-
}
|
|
237
|
-
}
|
|
238
|
-
|
|
239
209
|
// -------------------------------------------------------------------------------------------
|
|
240
210
|
// Change the placeholder of the 'send message' textarea according to the width of the window
|
|
241
211
|
// -------------------------------------------------------------------------------------------
|
|
@@ -243,37 +213,6 @@ export class MessageTextAreaComponent implements OnInit, AfterViewInit, OnChange
|
|
|
243
213
|
onResize(event) {
|
|
244
214
|
// this.getIfTexareaIsEmpty('onResize')
|
|
245
215
|
// console.log("[CONVS-DETAIL][MSG-TEXT-AREA] event.target.innerWidth; ", event.target.innerWidth);
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
// if (event.target.innerWidth >= 844 && this.isOpenInfoConversation === false && this.conversationWith.startsWith("support-group")) {
|
|
250
|
-
// this.TEXAREA_PLACEHOLDER = this.LONG_TEXAREA_PLACEHOLDER;
|
|
251
|
-
// } else if (event.target.innerWidth >= 844 && this.isOpenInfoConversation === true && this.conversationWith.startsWith("support-group")) {
|
|
252
|
-
// this.TEXAREA_PLACEHOLDER = this.SHORT_TEXAREA_PLACEHOLDER;
|
|
253
|
-
// } else if (event.target.innerWidth < 844 && this.isOpenInfoConversation === false && this.conversationWith.startsWith("support-group")) {
|
|
254
|
-
// this.TEXAREA_PLACEHOLDER = this.SHORT_TEXAREA_PLACEHOLDER;
|
|
255
|
-
// } else if (event.target.innerWidth < 844 && this.isOpenInfoConversation === true && this.conversationWith.startsWith("support-group")) {
|
|
256
|
-
// this.TEXAREA_PLACEHOLDER = this.SHORTER_TEXAREA_PLACEHOLDER;
|
|
257
|
-
// } else if (!this.conversationWith.startsWith("support-group")) {
|
|
258
|
-
// this.TEXAREA_PLACEHOLDER = this.SHORT_TEXAREA_PLACEHOLDER;
|
|
259
|
-
// }
|
|
260
|
-
|
|
261
|
-
// this.logger.log('[CONVS-DETAIL][MSG-TEXT-AREA] checkPlatformIsMobile() ', checkPlatformIsMobile());
|
|
262
|
-
if (checkPlatformIsMobile() === true) {
|
|
263
|
-
|
|
264
|
-
if (event.target.innerWidth <= 430 && event.target.innerWidth >= 274) {
|
|
265
|
-
this.TEXAREA_PLACEHOLDER = this.SHORT_TEXAREA_PLACEHOLDER;
|
|
266
|
-
} else if (this.currentWindowWidth <= 273) {
|
|
267
|
-
this.TEXAREA_PLACEHOLDER = this.SHORTER_TEXAREA_PLACEHOLDER;
|
|
268
|
-
}
|
|
269
|
-
|
|
270
|
-
}
|
|
271
|
-
|
|
272
|
-
// if (checkPlatformIsMobile && event.target.innerWidth <= 430) {
|
|
273
|
-
// this.TEXAREA_PLACEHOLDER = this.SHORT_TEXAREA_PLACEHOLDER;
|
|
274
|
-
// } else if (checkPlatformIsMobile && event.target.innerWidth > 430) {
|
|
275
|
-
// this.TEXAREA_PLACEHOLDER = this.LONG_TEXAREA_PLACEHOLDER;
|
|
276
|
-
// }
|
|
277
216
|
}
|
|
278
217
|
|
|
279
218
|
|
|
@@ -579,8 +518,7 @@ export class MessageTextAreaComponent implements OnInit, AfterViewInit, OnChange
|
|
|
579
518
|
}
|
|
580
519
|
|
|
581
520
|
openCannedResponses() {
|
|
582
|
-
this.
|
|
583
|
-
this.onClickOpenCannedResponses.emit(this.openCanned);
|
|
521
|
+
this.onClickOpenCannedResponses.emit();
|
|
584
522
|
}
|
|
585
523
|
|
|
586
524
|
|
|
@@ -698,7 +636,7 @@ export class MessageTextAreaComponent implements OnInit, AfterViewInit, OnChange
|
|
|
698
636
|
|
|
699
637
|
@HostListener('document:keydown', ['$event'])
|
|
700
638
|
handleKeyboardEvent(event: KeyboardEvent) {
|
|
701
|
-
this.logger.log("[CONVS-DETAIL][MSG-TEXT-AREA] handleKeyboardEvent event.key ", event);
|
|
639
|
+
// this.logger.log("[CONVS-DETAIL][MSG-TEXT-AREA] handleKeyboardEvent event.key ", event);
|
|
702
640
|
// Note: on mac keyboard "metakey" matches "cmd"
|
|
703
641
|
|
|
704
642
|
if (event.key === 'Enter' && event.altKey || event.key === 'Enter' && event.ctrlKey || event.key === 'Enter' && event.metaKey) {
|
|
@@ -7,7 +7,8 @@
|
|
|
7
7
|
</app-info-direct>
|
|
8
8
|
|
|
9
9
|
<app-info-group *ngIf="panelType === 'group-panel' && IS_GROUP_PANEL === true"
|
|
10
|
-
[groupDetail]="groupDetail"
|
|
10
|
+
[groupDetail]="groupDetail"
|
|
11
|
+
[isMobile]="isMobile">
|
|
11
12
|
</app-info-group>
|
|
12
13
|
|
|
13
14
|
<app-info-support-group *ngIf="panelType === 'support-group-panel'"
|
|
@@ -28,11 +28,12 @@ import { LoggerInstance } from 'src/chat21-core/providers/logger/loggerInstance'
|
|
|
28
28
|
|
|
29
29
|
export class InfoContentComponent implements OnInit {
|
|
30
30
|
@Input() openInfoConversation: boolean;
|
|
31
|
-
@Input() translationMap: Map<string, string>;
|
|
32
31
|
// @Input() member: UserModel;
|
|
33
32
|
@Input() loggedUser: UserModel
|
|
34
33
|
@Input() tenant: string
|
|
35
|
-
@Input() groupDetail: any
|
|
34
|
+
@Input() groupDetail: any;
|
|
35
|
+
@Input() isMobile: boolean;
|
|
36
|
+
@Input() translationMap: Map<string, string>;
|
|
36
37
|
|
|
37
38
|
|
|
38
39
|
public member: UserModel;
|
|
@@ -8,15 +8,7 @@
|
|
|
8
8
|
<div class="image-profile">
|
|
9
9
|
<app-avatar-profile [itemAvatar]='member'></app-avatar-profile>
|
|
10
10
|
</div>
|
|
11
|
-
|
|
12
|
-
<div class="user-presence">
|
|
13
|
-
<app-user-presence
|
|
14
|
-
[idUser]='member.uid'
|
|
15
|
-
[translationMap]='translationMap'
|
|
16
|
-
[borderColor]='borderColor'
|
|
17
|
-
[fontColor]='fontColor'>
|
|
18
|
-
</app-user-presence>
|
|
19
|
-
</div>
|
|
11
|
+
|
|
20
12
|
<!-- -> {{member |json}} -->
|
|
21
13
|
<div class="info-profile">
|
|
22
14
|
<div class="name">
|
|
@@ -15,8 +15,6 @@ export class InfoDirectComponent implements OnInit, AfterViewInit, OnChanges {
|
|
|
15
15
|
@Input() translationMap: Map<string, string>;
|
|
16
16
|
@Input() conversationWith: string;
|
|
17
17
|
|
|
18
|
-
borderColor = '#ffffff';
|
|
19
|
-
fontColor = '#949494';
|
|
20
18
|
advancedAttributes: Array<any> = [];
|
|
21
19
|
private logger: LoggerService = LoggerInstance.getInstance();
|
|
22
20
|
|
|
@@ -1,115 +1,51 @@
|
|
|
1
1
|
<!-- <pre style="font-size: 12px;"> {{ groupDetail | json }} </pre> -->
|
|
2
2
|
|
|
3
3
|
<ion-content class="group-profile">
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
</div>
|
|
10
|
-
|
|
11
|
-
<div class="info-profile">
|
|
12
|
-
<div class="name">
|
|
13
|
-
<span class="read">{{groupDetail?.name}}</span>
|
|
4
|
+
<ion-card>
|
|
5
|
+
<div class="chat21-box-profile chat21-box">
|
|
6
|
+
<div class="chat21-content">
|
|
7
|
+
<div class="image-profile">
|
|
8
|
+
<app-avatar-profile [itemAvatar]="groupDetail"></app-avatar-profile>
|
|
14
9
|
</div>
|
|
15
|
-
</div>
|
|
16
|
-
<!-- <div class="member-email">
|
|
17
|
-
<a [href]="'mailto:' + member.email + '?Subject='">
|
|
18
|
-
{{member.email}}
|
|
19
|
-
</a>
|
|
20
|
-
</div> -->
|
|
21
|
-
</div>
|
|
22
|
-
|
|
23
|
-
</div>
|
|
24
|
-
</ion-card>
|
|
25
10
|
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
<ion-skeleton-text animated style="width: 44px; height: 44px;"></ion-skeleton-text>
|
|
30
|
-
</ion-avatar>
|
|
31
|
-
<ion-label>
|
|
32
|
-
<h3>
|
|
33
|
-
<ion-skeleton-text animated style="width: 60%;position: relative;top: 2px;height: 16px;"></ion-skeleton-text>
|
|
34
|
-
</h3>
|
|
35
|
-
</ion-label>
|
|
36
|
-
</ion-item>
|
|
37
|
-
</ion-list>
|
|
38
|
-
|
|
39
|
-
<!-- <pre style="font-size: 8px;"> {{member_array | json }} </pre> <pre style="font-size: 8px;"> {{displaySkeletonScreen}} </pre> -->
|
|
40
|
-
<ion-list id="members-list" *ngIf="groupDetail?.member_array?.length > 0 && !displaySkeletonScreen">
|
|
41
|
-
<ion-item lines="none" *ngFor='let member of groupDetail?.member_array'>
|
|
42
|
-
<ion-avatar slot="start" style="margin-right: 12px;">
|
|
43
|
-
<app-avatar-profile [itemAvatar]=member></app-avatar-profile>
|
|
44
|
-
<div class="user-online" [ngStyle]="{ 'background-color':(member?.userOnline)?'#24d066':'#db4437' }"></div>
|
|
45
|
-
</ion-avatar>
|
|
46
|
-
<ion-label>
|
|
47
|
-
<h3>
|
|
48
|
-
{{ member.fullname }}
|
|
49
|
-
</h3>
|
|
50
|
-
</ion-label>
|
|
51
|
-
</ion-item>
|
|
52
|
-
</ion-list>
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
<div *ngIf="groupDetail" style="display:none">
|
|
58
|
-
<div *ngFor='let member of groupDetail?.member_array'>
|
|
59
|
-
<ion-grid>
|
|
60
|
-
<ion-row class="ion-align-items-center">
|
|
61
|
-
<ion-col size="3">
|
|
62
|
-
<div class="member-profile">
|
|
63
|
-
<!-- (click)="copyLoggedUserUID({member.userid)" -->
|
|
64
|
-
<!-- <div class="avatar-container" [tooltip]="useruidTooltip" [options]="tooltipOptions" placement="top"
|
|
65
|
-
content-type="template" > -->
|
|
66
|
-
<app-avatar-profile [itemAvatar]=member></app-avatar-profile>
|
|
67
|
-
<!-- </div> -->
|
|
68
|
-
<!-- <ng-template #useruidTooltip>
|
|
69
|
-
<span> {{member.userid}}</span>
|
|
70
|
-
</ng-template> -->
|
|
71
|
-
|
|
72
|
-
<div class="user-online" [ngStyle]="{ 'background-color':(member?.userOnline)?'#24d066':'#db4437' }">
|
|
73
|
-
</div>
|
|
11
|
+
<div class="info-profile">
|
|
12
|
+
<div class="name">
|
|
13
|
+
<span class="read">{{groupDetail?.name}}</span>
|
|
74
14
|
</div>
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
{{ member.fullname }}
|
|
81
|
-
</ion-label>
|
|
82
|
-
|
|
83
|
-
<!-- <div class="info-group-member-email">
|
|
84
|
-
<a [href]="'mailto:' + member.email + '?Subject='">
|
|
85
|
-
{{member.email}}
|
|
86
|
-
</a>
|
|
87
|
-
</div> -->
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
</ion-col>
|
|
91
|
-
</ion-row>
|
|
92
|
-
</ion-grid>
|
|
93
|
-
<!-- </ion-avatar>
|
|
94
|
-
</ion-item> -->
|
|
95
|
-
<!-- {{member | json}}
|
|
15
|
+
</div>
|
|
16
|
+
</div>
|
|
17
|
+
|
|
18
|
+
</div>
|
|
19
|
+
</ion-card>
|
|
96
20
|
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
21
|
+
<ion-list id="fake-members-list" *ngIf="displaySkeletonScreen">
|
|
22
|
+
<ion-item lines="none" *ngFor="let fake of generateFake(membersObjectLength)" style="margin-left:-3px">
|
|
23
|
+
<ion-avatar slot="start">
|
|
24
|
+
<ion-skeleton-text animated style="width: 44px; height: 44px;"></ion-skeleton-text>
|
|
25
|
+
</ion-avatar>
|
|
26
|
+
<ion-label>
|
|
27
|
+
<h3>
|
|
28
|
+
<ion-skeleton-text animated style="width: 60%;position: relative;top: 2px;height: 16px;"></ion-skeleton-text>
|
|
29
|
+
</h3>
|
|
30
|
+
</ion-label>
|
|
31
|
+
</ion-item>
|
|
32
|
+
</ion-list>
|
|
33
|
+
|
|
34
|
+
<!-- <pre style="font-size: 8px;"> {{member_array | json }} </pre> <pre style="font-size: 8px;"> {{displaySkeletonScreen}} </pre> -->
|
|
35
|
+
<ion-list id="members-list" *ngIf="groupDetail?.member_array?.length > 0 && !displaySkeletonScreen">
|
|
36
|
+
<ion-item lines="none" *ngFor='let member of groupDetail?.member_array'>
|
|
37
|
+
<ion-avatar slot="start" style="margin-right: 12px;">
|
|
38
|
+
<app-avatar-profile [itemAvatar]=member></app-avatar-profile>
|
|
39
|
+
<div class="status-icon-container" [class.mobile]="isMobile" >
|
|
40
|
+
<svg xmlns="http://www.w3.org/2000/svg" [class.online]="(member?.userOnline)" height="15" width="15" viewBox="0 0 24 24" fill="#000000"><path d="M12 12c2.21 0 4-1.79 4-4s-1.79-4-4-4-4 1.79-4 4 1.79 4 4 4zm0 2c-2.67 0-8 1.34-8 4v2h16v-2c0-2.66-5.33-4-8-4z"/></svg>
|
|
41
|
+
</div>
|
|
42
|
+
</ion-avatar>
|
|
43
|
+
<ion-label>
|
|
44
|
+
<h3>
|
|
45
|
+
{{ member.fullname }}
|
|
46
|
+
</h3>
|
|
47
|
+
</ion-label>
|
|
48
|
+
</ion-item>
|
|
49
|
+
</ion-list>
|
|
50
|
+
|
|
51
|
+
</ion-content>
|
|
@@ -7,74 +7,114 @@
|
|
|
7
7
|
-webkit-box-shadow: none;
|
|
8
8
|
box-shadow: none;
|
|
9
9
|
border-bottom: 1px solid rgba(169, 169, 169, 0.2);
|
|
10
|
-
}
|
|
11
10
|
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
11
|
+
.image-profile {
|
|
12
|
+
padding: 0 0 0 0;
|
|
13
|
+
width: 100px;
|
|
14
|
+
height: 100px;
|
|
15
|
+
margin: auto;
|
|
16
|
+
line-height: 100px;
|
|
17
|
+
font-size: 40px;
|
|
18
|
+
color: white;
|
|
19
|
+
}
|
|
21
20
|
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
21
|
+
.info-profile {
|
|
22
|
+
padding: 10px 0 0 0;
|
|
23
|
+
text-align: center;
|
|
24
|
+
.name {
|
|
25
|
+
-webkit-font-smoothing: antialiased;
|
|
26
|
+
text-rendering: optimizeLegibility;
|
|
27
|
+
text-size-adjust: none;
|
|
28
|
+
user-select: text;
|
|
29
|
+
font-family: "Roboto", "Helvetica Neue", sans-serif;
|
|
30
|
+
-webkit-box-direction: normal;
|
|
31
|
+
color: #333333;
|
|
32
|
+
font-weight: 500;
|
|
33
|
+
font-size: 17px;
|
|
34
|
+
box-sizing: border-box;
|
|
35
|
+
-webkit-tap-highlight-color: transparent;
|
|
36
|
+
display: block;
|
|
37
|
+
font-size: large;
|
|
38
|
+
font-weight: bold;
|
|
39
|
+
}
|
|
40
|
+
}
|
|
31
41
|
}
|
|
32
42
|
|
|
33
|
-
.user-online {
|
|
34
|
-
height: 11px;
|
|
35
|
-
width: 11px;
|
|
36
|
-
border-radius: 50%;
|
|
37
|
-
position: absolute;
|
|
38
|
-
top: 44px;
|
|
39
|
-
left: 40px;
|
|
40
|
-
border: 0.5px solid #fff;
|
|
41
|
-
}
|
|
42
43
|
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
44
|
+
#members-list{
|
|
45
|
+
ion-item{
|
|
46
|
+
display: flex;
|
|
47
|
+
height: 60px;
|
|
48
|
+
|
|
49
|
+
.status-icon-container{
|
|
50
|
+
position: absolute;
|
|
51
|
+
top: 35px;
|
|
52
|
+
left: 45px;
|
|
53
|
+
background-color: white;
|
|
54
|
+
height: 17px;
|
|
55
|
+
width: 17px;
|
|
56
|
+
border-radius: 50%;
|
|
57
|
+
display: flex;
|
|
58
|
+
align-items: center;
|
|
59
|
+
justify-content: center;
|
|
60
|
+
|
|
61
|
+
&.mobile{
|
|
62
|
+
top: 30px;
|
|
63
|
+
left: 50px;
|
|
64
|
+
}
|
|
65
|
+
|
|
66
|
+
svg{
|
|
67
|
+
fill: #f44336;
|
|
68
|
+
|
|
69
|
+
&.online{
|
|
70
|
+
fill: #4caf50;
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
}
|
|
50
74
|
|
|
51
|
-
.info-profile {
|
|
52
|
-
padding: 10px 0 0 0;
|
|
53
|
-
text-align: center;
|
|
54
|
-
.name {
|
|
55
|
-
-webkit-font-smoothing: antialiased;
|
|
56
|
-
text-rendering: optimizeLegibility;
|
|
57
|
-
text-size-adjust: none;
|
|
58
|
-
user-select: text;
|
|
59
|
-
font-family: "Roboto", "Helvetica Neue", sans-serif;
|
|
60
|
-
-webkit-box-direction: normal;
|
|
61
|
-
color: #333333;
|
|
62
|
-
font-weight: 500;
|
|
63
|
-
font-size: 17px;
|
|
64
|
-
box-sizing: border-box;
|
|
65
|
-
-webkit-tap-highlight-color: transparent;
|
|
66
|
-
display: block;
|
|
67
|
-
font-size: large;
|
|
68
|
-
font-weight: bold;
|
|
69
75
|
}
|
|
70
76
|
}
|
|
71
77
|
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
78
|
+
|
|
79
|
+
|
|
80
|
+
// .member-profile {
|
|
81
|
+
// padding: 0 0 0 0;
|
|
82
|
+
// width: 55px;
|
|
83
|
+
// height: 55px;
|
|
84
|
+
// margin: auto;
|
|
85
|
+
// line-height: 57px;
|
|
86
|
+
// font-size: 25px;
|
|
87
|
+
// color: white;
|
|
88
|
+
// position: relative;
|
|
89
|
+
// }
|
|
90
|
+
|
|
91
|
+
// .user-online {
|
|
92
|
+
// height: 11px;
|
|
93
|
+
// width: 11px;
|
|
94
|
+
// border-radius: 50%;
|
|
95
|
+
// position: absolute;
|
|
96
|
+
// top: 44px;
|
|
97
|
+
// left: 40px;
|
|
98
|
+
// border: 0.5px solid #fff;
|
|
99
|
+
// }
|
|
100
|
+
|
|
101
|
+
|
|
102
|
+
// .user-presence {
|
|
103
|
+
// position: absolute;
|
|
104
|
+
// top: 88px;
|
|
105
|
+
// height: 12px;
|
|
106
|
+
// left: calc(50% + 30px);
|
|
107
|
+
// width: 100px;
|
|
108
|
+
// }
|
|
109
|
+
|
|
110
|
+
|
|
111
|
+
|
|
112
|
+
// .info-group-member-email {
|
|
113
|
+
// font-size: 13px;
|
|
114
|
+
// margin-top: 2px;
|
|
115
|
+
// white-space: nowrap;
|
|
116
|
+
// width: 205px;
|
|
117
|
+
// overflow: hidden;
|
|
118
|
+
// text-overflow: ellipsis;
|
|
119
|
+
// }
|
|
80
120
|
}
|
|
@@ -23,6 +23,7 @@ export class InfoGroupComponent implements OnInit, AfterViewInit, OnChanges {
|
|
|
23
23
|
// objectKeys = Object.keys;
|
|
24
24
|
|
|
25
25
|
@Input() groupDetail: any;
|
|
26
|
+
@Input() isMobile: boolean;
|
|
26
27
|
// @Input() member_array: any;
|
|
27
28
|
public displaySkeletonScreen: boolean = true;
|
|
28
29
|
public member_array: any
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
<ion-toolbar
|
|
1
|
+
<ion-toolbar [class.mobile]="isMobile">
|
|
2
2
|
|
|
3
|
-
<ion-buttons *ngIf="
|
|
3
|
+
<ion-buttons *ngIf="isMobile || supportMode === false" slot="start" style="height:60px">
|
|
4
4
|
<ion-button ion-button icon-only fill="clear" (click)="onOpenProfileInfo($event)">
|
|
5
5
|
<ion-icon slot="icon-only" name="reorder-three-outline"></ion-icon>
|
|
6
6
|
</ion-button>
|
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
<div *ngIf="numberOpenConv > 0" class="number-open-conv">({{numberOpenConv}})</div>
|
|
12
12
|
</ion-title>
|
|
13
13
|
|
|
14
|
-
<ion-buttons slot="start">
|
|
14
|
+
<ion-buttons slot="start" *ngIf="isMobile">
|
|
15
15
|
<ion-button *ngIf="sound_btn==='enabled'" ion-button fill="clear" (click)="onSoundChangeFN('disabled')">
|
|
16
16
|
<ion-icon slot="icon-only" name="volume-high-outline" ></ion-icon>
|
|
17
17
|
</ion-button>
|
|
@@ -1,3 +1,19 @@
|
|
|
1
|
+
|
|
2
|
+
ion-toolbar {
|
|
3
|
+
height: var(--header-height);
|
|
4
|
+
&:not(.mobile){
|
|
5
|
+
--background: var(--list-bkg-color);
|
|
6
|
+
border: none;
|
|
7
|
+
}
|
|
8
|
+
&.mobile{
|
|
9
|
+
border-bottom: 1px solid rgba(0, 0, 0, 0.05);
|
|
10
|
+
}
|
|
11
|
+
|
|
12
|
+
ion-button{
|
|
13
|
+
--color: var(--basic-blue);
|
|
14
|
+
}
|
|
15
|
+
}
|
|
16
|
+
|
|
1
17
|
ion-title img {
|
|
2
18
|
height: 30px;
|
|
3
19
|
}
|
|
@@ -23,8 +39,4 @@ ion-title img {
|
|
|
23
39
|
|
|
24
40
|
.header-logo {
|
|
25
41
|
margin-top: 5px;
|
|
26
|
-
}
|
|
27
|
-
|
|
28
|
-
.bottom-border-on-mobile {
|
|
29
|
-
border-bottom: 1px solid rgba(0, 0, 0, 0.05);
|
|
30
42
|
}
|