Skip to content

Commit f8daa7f

Browse files
authored
Merge pull request #2381 from dpalou/MOBILE-3401
Mobile 3401
2 parents 33991e2 + fd464d4 commit f8daa7f

File tree

3 files changed

+10
-2
lines changed

3 files changed

+10
-2
lines changed

src/app/app.component.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,11 @@ export class MoodleMobileApp implements OnInit {
191191
return;
192192
}
193193

194+
if (!this.urlSchemesProvider.isCustomURL(url)) {
195+
// Not a custom URL, ignore.
196+
return;
197+
}
198+
194199
this.logger.debug('App launched by URL ', url);
195200

196201
this.lastUrls[url] = Date.now();

src/components/iframe/iframe.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ export class CoreIframeComponent implements OnInit, OnChanges {
9999
if (changes.src) {
100100
const url = this.urlUtils.getYoutubeEmbedUrl(changes.src.currentValue) || changes.src.currentValue;
101101

102-
if (this.platform.is('ios')) {
102+
if (this.platform.is('ios') && !this.urlUtils.isLocalFileUrl(url)) {
103103
// Save a "fake" cookie for the iframe's domain to fix a bug in WKWebView.
104104
try {
105105
const win = <WKWebViewCookiesWindow> window;

src/core/user/components/participants/participants.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,10 @@ export class CoreUserParticipantsComponent implements OnInit {
143143
toggleSearch(): void {
144144
this.showSearchBox = !this.showSearchBox;
145145

146-
if (!this.showSearchBox && this.displaySearchResults) {
146+
if (this.showSearchBox) {
147+
// Make search bar visible.
148+
this.domUtils.scrollToTop(this.content);
149+
} else if (!this.showSearchBox && this.displaySearchResults) {
147150
this.clearSearch();
148151
}
149152
}

0 commit comments

Comments
 (0)