Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -62,17 +62,19 @@ export class ReviewListComponent implements OnInit, OnChanges, AfterViewInit {
}

// go to the review
goto(review: Review, keyboardEvent?: KeyboardEvent) {
if (keyboardEvent && (keyboardEvent?.code === 'Space' || keyboardEvent?.code === 'Enter')) {
keyboardEvent.preventDefault();
} else if (keyboardEvent) {
return;
goto(review: Review, keyboardEvent?: Event) {
if (keyboardEvent instanceof KeyboardEvent) {
if (keyboardEvent.code === 'Space' || keyboardEvent.code === 'Enter') {
keyboardEvent.preventDefault();
} else {
return;
}
}

this.navigate.emit(review);
}

switchStatus(event: CustomEvent<SegmentChangeEventDetail>) {
switchStatus(event?: CustomEvent<SegmentChangeEventDetail>) {
if (!event) {
return;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,15 +93,11 @@ export class BadgesCertificatesPage implements OnInit, OnDestroy {
this._updatePage();
}

async openBadgeDetail(achievement: Achievement, keyboardEvent?: KeyboardEvent) {
if (
keyboardEvent &&
keyboardEvent.key !== 'Enter' &&
keyboardEvent.key !== ' '
) {
return;
}
if (keyboardEvent) {
async openBadgeDetail(achievement: Achievement, keyboardEvent?: Event) {
if (keyboardEvent instanceof KeyboardEvent) {
if (keyboardEvent.key !== 'Enter' && keyboardEvent.key !== ' ') {
return;
}
keyboardEvent.preventDefault();
}
const modal = await this.modalController.create({
Expand Down
24 changes: 15 additions & 9 deletions projects/v3/src/app/pages/chat/chat-room/chat-room.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1024,14 +1024,13 @@ export class ChatRoomComponent implements OnInit, OnDestroy, AfterViewInit {
return result;
}

async preview(file, keyboardEvent?: KeyboardEvent) {
if (
keyboardEvent &&
(keyboardEvent?.code === "Space" || keyboardEvent?.code === "Enter")
) {
keyboardEvent.preventDefault();
} else if (keyboardEvent) {
return;
async preview(file, keyboardEvent?: Event) {
if (keyboardEvent instanceof KeyboardEvent) {
if (keyboardEvent.code === "Space" || keyboardEvent.code === "Enter") {
keyboardEvent.preventDefault();
} else {
return;
}
}

const modal = await this.modalController.create({
Expand Down Expand Up @@ -1169,7 +1168,14 @@ export class ChatRoomComponent implements OnInit, OnDestroy, AfterViewInit {
/**
* open edit modal for a sent message.
*/
async openEditMessagePopup(index: number) {
async openEditMessagePopup(messageOrIndex: Message | number) {
const index =
typeof messageOrIndex === 'number'
? messageOrIndex
: this.messageList.findIndex((message) => message.uuid === messageOrIndex.uuid);
if (index < 0) {
return;
}
const modal = await this.modalController.create({
component: EditMessagePopupComponent,
cssClass: 'chat-edit-message-popup',
Expand Down
Loading