From acb406757a2bb76386a6b80b882f4d28c84d4034 Mon Sep 17 00:00:00 2001 From: Dani Palou Date: Thu, 21 May 2020 11:28:06 +0200 Subject: [PATCH 1/3] MOBILE-3401 participants: Scroll top when enable search --- src/core/user/components/participants/participants.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/core/user/components/participants/participants.ts b/src/core/user/components/participants/participants.ts index 23e8fb2e5..342fbea50 100644 --- a/src/core/user/components/participants/participants.ts +++ b/src/core/user/components/participants/participants.ts @@ -143,7 +143,10 @@ export class CoreUserParticipantsComponent implements OnInit { toggleSearch(): void { this.showSearchBox = !this.showSearchBox; - if (!this.showSearchBox && this.displaySearchResults) { + if (this.showSearchBox) { + // Make search bar visible. + this.domUtils.scrollToTop(this.content); + } else if (!this.showSearchBox && this.displaySearchResults) { this.clearSearch(); } } From 82add048f01abcf80b619dd59857294c74170d03 Mon Sep 17 00:00:00 2001 From: Dani Palou Date: Thu, 21 May 2020 12:56:50 +0200 Subject: [PATCH 2/3] MOBILE-3401 core: Fix invalid site URL in iOS when clicking links This is caused by a bug in InAppBrowser plugin. Even with the IAB fix, the handleOpenURL function is called if there is no app to handle the URL so we'll need this check anyway --- src/app/app.component.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 54d49f357..434d6925b 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -191,6 +191,11 @@ export class MoodleMobileApp implements OnInit { return; } + if (!this.urlSchemesProvider.isCustomURL(url)) { + // Not a custom URL, ignore. + return; + } + this.logger.debug('App launched by URL ', url); this.lastUrls[url] = Date.now(); From fd464d45ce65e9c4f40ba7163d6a866c5162580c Mon Sep 17 00:00:00 2001 From: Dani Palou Date: Fri, 22 May 2020 15:18:16 +0200 Subject: [PATCH 3/3] MOBILE-3401 ios: Fix iframes loading local file --- src/components/iframe/iframe.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/iframe/iframe.ts b/src/components/iframe/iframe.ts index 58e63b551..c4969b4f4 100644 --- a/src/components/iframe/iframe.ts +++ b/src/components/iframe/iframe.ts @@ -99,7 +99,7 @@ export class CoreIframeComponent implements OnInit, OnChanges { if (changes.src) { const url = this.urlUtils.getYoutubeEmbedUrl(changes.src.currentValue) || changes.src.currentValue; - if (this.platform.is('ios')) { + if (this.platform.is('ios') && !this.urlUtils.isLocalFileUrl(url)) { // Save a "fake" cookie for the iframe's domain to fix a bug in WKWebView. try { const win = window;