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

Merge pull request #1628 from dpalou/MOBILE-2752

Browse Source 
MOBILE-2752 iframe: Handle window.open with target _self
This commit is contained in:
Juan Leyva 2018-11-27 15:33:06 +01:00 committed by GitHub
commit 173728541f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/providers/utils/iframe.ts
View File

@ -195,7 +195,7 @@ export class CoreIframeUtilsProvider {
redefineWindowOpen(element: any, contentWindow: Window, contentDocument: Document): void { redefineWindowOpen(element: any, contentWindow: Window, contentDocument: Document): void {
if (contentWindow) { if (contentWindow) {
// Intercept window.open. // Intercept window.open.
contentWindow.open = (url: string): Window => { contentWindow.open = (url: string, target: string): Window => {
const scheme = this.urlUtils.getUrlScheme(url); const scheme = this.urlUtils.getUrlScheme(url);
if (!scheme) { if (!scheme) {
// It's a relative URL, use the frame src to create the full URL. // It's a relative URL, use the frame src to create the full URL.
@ -216,7 +216,14 @@ export class CoreIframeUtilsProvider {
} }
} }
if (url.indexOf('cdvfile://') === 0 || url.indexOf('file://') === 0) { if (target == '_self') {
// Link should be loaded in the same frame.
if (element.tagName.toLowerCase() == 'object') {
element.setAttribute('data', url);
} else {
element.setAttribute('src', url);
}
} else if (url.indexOf('cdvfile://') === 0 || url.indexOf('file://') === 0) {
// It's a local file. // It's a local file.
this.utils.openFile(url).catch((error) => { this.utils.openFile(url).catch((error) => {
this.domUtils.showErrorModal(error); this.domUtils.showErrorModal(error);