EVOgeek
/
Vmeda.Online
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1928 from dpalou/MOBILE-3039 

Mobile 3039
main
Juan Leyva 2019-05-21 13:33:32 +02:00 committed by GitHub
parent 4e5f772558 1647cad957
commit 99774954a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/addon/messages/pages/discussion/discussion.ts
View File

@ -811,7 +811,8 @@ export class AddonMessagesDiscussionPage implements OnDestroy {
*/ */
deleteMessage(message: any, index: number): void { deleteMessage(message: any, index: number): void {
const canDeleteAll = this.conversation && this.conversation.candeletemessagesforallusers, const canDeleteAll = this.conversation && this.conversation.candeletemessagesforallusers,
langKey = message.pending || canDeleteAll ? 'core.areyousure' : 'addon.messages.deletemessageconfirmation', langKey = message.pending || canDeleteAll || this.isSelf ? 'core.areyousure' :
'addon.messages.deletemessageconfirmation',
options: any = {}; options: any = {};
if (canDeleteAll && !message.pending) { if (canDeleteAll && !message.pending) {

4
src/providers/local-notifications.ts
View File

@ -136,8 +136,8 @@ export class CoreLocalNotificationsProvider {
this.handleEvent('cancel', notification); this.handleEvent('cancel', notification);
}); });
this.addSubscription = localNotifications.on('add').subscribe((notification: ILocalNotification) => { this.addSubscription = localNotifications.on('schedule').subscribe((notification: ILocalNotification) => {
this.handleEvent('add', notification); this.handleEvent('schedule', notification);
}); });
this.updateSubscription = localNotifications.on('update').subscribe((notification: ILocalNotification) => { this.updateSubscription = localNotifications.on('update').subscribe((notification: ILocalNotification) => {