mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-18 20:47:54 +00:00
fix chat
This commit is contained in:
@@ -816,7 +816,9 @@ export class ChatPage implements OnInit {
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
await modal.present();
|
await modal.present();
|
||||||
modal.onDidDismiss();
|
modal.onDidDismiss().then(() =>{
|
||||||
|
this.ChatSystemService.currentRoom.roomLeave()
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -528,7 +528,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
|
|||||||
async openOptions() {
|
async openOptions() {
|
||||||
const modal = await this.popoverController.create({
|
const modal = await this.popoverController.create({
|
||||||
component: ChatPopoverPage,
|
component: ChatPopoverPage,
|
||||||
cssClass: 'chat-popover',
|
cssClass: 'popover-bottom',
|
||||||
componentProps: {
|
componentProps: {
|
||||||
roomId: this.roomId,
|
roomId: this.roomId,
|
||||||
members: this.members,
|
members: this.members,
|
||||||
|
|||||||
@@ -519,7 +519,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
|
|||||||
enterAnimation,
|
enterAnimation,
|
||||||
leaveAnimation,
|
leaveAnimation,
|
||||||
component: ChatPopoverPage,
|
component: ChatPopoverPage,
|
||||||
cssClass: 'model profile-modal search-submodal chat-aside',
|
cssClass: 'model search-submodal chat-option-aside',
|
||||||
componentProps: {
|
componentProps: {
|
||||||
roomId: this.roomId,
|
roomId: this.roomId,
|
||||||
members: this.members,
|
members: this.members,
|
||||||
|
|||||||
@@ -39,10 +39,8 @@ export class ChatPopoverPage implements OnInit {
|
|||||||
close(action:any){
|
close(action:any){
|
||||||
if( window.innerWidth < 701){
|
if( window.innerWidth < 701){
|
||||||
this.popoverController.dismiss(action);
|
this.popoverController.dismiss(action);
|
||||||
this.modalController.dismiss(action)
|
|
||||||
}
|
}
|
||||||
else{
|
else{
|
||||||
this.popoverController.dismiss(action);
|
|
||||||
this.modalController.dismiss(action)
|
this.modalController.dismiss(action)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -123,25 +121,16 @@ export class ChatPopoverPage implements OnInit {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
this.popoverController.dismiss('delete');
|
this.close('delete');
|
||||||
this.modalController.dismiss('delete')
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async openChangeGroupName(){
|
async openChangeGroupName(){
|
||||||
if( window.innerWidth < 701){
|
this.close('edit');
|
||||||
this.popoverController.dismiss('edit');
|
|
||||||
this.modalController.dismiss('edit')
|
|
||||||
}
|
|
||||||
else{
|
|
||||||
this.popoverController.dismiss('edit');
|
|
||||||
this.modalController.dismiss('edit')
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
async addUser() {
|
async addUser() {
|
||||||
this.popoverController.dismiss('addUser');
|
this.close('addUser');
|
||||||
this.modalController.dismiss('addUser')
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -348,6 +348,32 @@ $app-theme: mat-light-theme(
|
|||||||
right: 0 !important;
|
right: 0 !important;
|
||||||
top: unset !important;
|
top: unset !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.popover-bottom::part(content), .popover-bottom .popover-content {
|
||||||
|
top: unset !important;
|
||||||
|
bottom: 0px;
|
||||||
|
position: absolute;
|
||||||
|
width: 100%;
|
||||||
|
left: 0px !important;
|
||||||
|
right: 0px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.chat-option-aside::part(content), .chat-option-aside .modal-wrapper{
|
||||||
|
position: absolute;
|
||||||
|
right: 0px;
|
||||||
|
height: 90%;
|
||||||
|
max-width: 100%;
|
||||||
|
top: -40px;
|
||||||
|
border-radius: 0 0 25px 25px;
|
||||||
|
-webkit-border-radius: 0 0 25px 25px;
|
||||||
|
-moz-border-radius: 0 0 25px 25px;
|
||||||
|
-ms-border-radius: 0 0 25px 25px;
|
||||||
|
-o-border-radius: 0 0 25px 25px;
|
||||||
|
max-width: 400px;
|
||||||
|
width: 100%;
|
||||||
|
opacity: 1;
|
||||||
|
}
|
||||||
|
|
||||||
.exp-options .popover-content {
|
.exp-options .popover-content {
|
||||||
width: 100% !important;
|
width: 100% !important;
|
||||||
left: 0 !important;
|
left: 0 !important;
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
export let versionData = {
|
export let versionData = {
|
||||||
"shortSHA": "a558e835a",
|
"shortSHA": "9c7281ce4",
|
||||||
"SHA": "a558e835a044e44664bb473f0e70428ad8a82b56",
|
"SHA": "9c7281ce48b7bd3b792db5b350d99dd7cf06f60e",
|
||||||
"branch": "no_bug_movemente",
|
"branch": "no_bug_movemente",
|
||||||
"lastCommitAuthor": "'Peter Maquiran'",
|
"lastCommitAuthor": "'Peter Maquiran'",
|
||||||
"lastCommitTime": "'Thu Mar 9 17:13:19 2023 +0100'",
|
"lastCommitTime": "'Thu Mar 9 17:14:42 2023 +0100'",
|
||||||
"lastCommitMessage": "remove plugin and remove header",
|
"lastCommitMessage": "fix",
|
||||||
"lastCommitNumber": "4857",
|
"lastCommitNumber": "4858",
|
||||||
"change": "",
|
"change": "",
|
||||||
"changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/shared/publication/view-publications/view-publications.page.ts",
|
"changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/pages/chat/chat.page.ts\n\tmodified: src/app/pages/chat/group-messages/group-messages.page.ts\n\tmodified: src/app/shared/chat/group-messages/group-messages.page.ts\n\tmodified: src/app/shared/popover/chat-popover/chat-popover.page.ts\n\tmodified: src/theme/variables.scss\n\tmodified: version/git-version.ts",
|
||||||
"changeAuthor": "peter.maquiran"
|
"changeAuthor": "peter.maquiran"
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user