GuzhavinAleksey/Vmeda.Online
1
0
Fork 0
forked from CIT/Vmeda.Online
Code Pull Requests Activity

Merge pull request #2544 from crazyserver/MOBILE-3540

Browse Source 
MOBILE-3540 links: Force open in app or browser links
This commit is contained in:
Juan Leyva 2020-09-22 15:21:08 +02:00 committed by GitHub
commit 8ba5b4d48f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/directives/link.ts
View File

@ -22,6 +22,7 @@ import { CoreUtilsProvider } from '@providers/utils/utils';
import { CoreContentLinksHelperProvider } from '@core/contentlinks/providers/helper'; import { CoreContentLinksHelperProvider } from '@core/contentlinks/providers/helper';
import { CoreSplitViewComponent } from '@components/split-view/split-view'; import { CoreSplitViewComponent } from '@components/split-view/split-view';
import { CoreTextUtilsProvider } from '@providers/utils/text'; import { CoreTextUtilsProvider } from '@providers/utils/text';
import { CoreConfigConstants } from '../configconstants';
import { CoreCustomURLSchemesProvider } from '@providers/urlschemes'; import { CoreCustomURLSchemesProvider } from '@providers/urlschemes';
/** /**
@ -59,7 +60,7 @@ export class CoreLinkDirective implements OnInit {
* Function executed when the component is initialized. * Function executed when the component is initialized.
*/ */
ngOnInit(): void { ngOnInit(): void {
this.inApp = this.utils.isTrueOrOne(this.inApp); this.inApp = typeof this.inApp == 'undefined' ? this.inApp : this.utils.isTrueOrOne(this.inApp);
let navCtrl = this.navCtrl; let navCtrl = this.navCtrl;
@ -76,15 +77,17 @@ export class CoreLinkDirective implements OnInit {
event.preventDefault(); event.preventDefault();
event.stopPropagation(); event.stopPropagation();
const openIn = this.element.getAttribute('data-open-in');
if (this.utils.isTrueOrOne(this.capture)) { if (this.utils.isTrueOrOne(this.capture)) {
href = this.textUtils.decodeURI(href); href = this.textUtils.decodeURI(href);
this.contentLinksHelper.handleLink(href, undefined, navCtrl, true, true).then((treated) => { this.contentLinksHelper.handleLink(href, undefined, navCtrl, true, true).then((treated) => {
if (!treated) { if (!treated) {
this.navigate(href); this.navigate(href, openIn);
} }
}); });
} else { } else {
this.navigate(href); this.navigate(href, openIn);
} }
} }
} }
@ -95,9 +98,10 @@ export class CoreLinkDirective implements OnInit {
* Convenience function to correctly navigate, open file or url in the browser. * Convenience function to correctly navigate, open file or url in the browser.
* *
* @param href HREF to be opened. * @param href HREF to be opened.
* @param openIn Open In App value coming from data-open-in attribute.
* @return Promise resolved when done. * @return Promise resolved when done.
*/ */
protected async navigate(href: string): Promise<void> { protected async navigate(href: string, openIn: string): Promise<void> {
if (this.urlUtils.isLocalFileUrl(href)) { if (this.urlUtils.isLocalFileUrl(href)) {
// We have a local file. // We have a local file.
@ -166,7 +170,19 @@ export class CoreLinkDirective implements OnInit {
this.utils.openInBrowser(href); this.utils.openInBrowser(href);
} }
} else { } else {
if (this.inApp) { // Priority order is: core-link inApp attribute > forceOpenLinksIn setting > data-open-in HTML attribute.
let openInApp;
if (typeof this.inApp == 'undefined') {
if (CoreConfigConstants['forceOpenLinksIn'] == 'browser') {
openInApp = false;
} else if (CoreConfigConstants['forceOpenLinksIn'] == 'app' || openIn == 'app') {
openInApp = true;
}
} else {
openInApp = this.inApp;
}
if (openInApp) {
await this.sitesProvider.getCurrentSite().openInAppWithAutoLoginIfSameSite(href); await this.sitesProvider.getCurrentSite().openInAppWithAutoLoginIfSameSite(href);
} else { } else {
await this.sitesProvider.getCurrentSite().openInBrowserWithAutoLoginIfSameSite(href); await this.sitesProvider.getCurrentSite().openInBrowserWithAutoLoginIfSameSite(href);