mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-18 20:47:54 +00:00
merge with developer done
This commit is contained in:
@@ -159,7 +159,6 @@ export class HomePage implements OnInit {
|
|||||||
|
|
||||||
|
|
||||||
SendIntent.checkSendIntentReceived().then((result: any) => {
|
SendIntent.checkSendIntentReceived().then((result: any) => {
|
||||||
alert('shared')
|
|
||||||
if (result) {
|
if (result) {
|
||||||
console.log('SendIntent received');
|
console.log('SendIntent received');
|
||||||
console.log(JSON.stringify(result));
|
console.log(JSON.stringify(result));
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import { Component, ElementRef, OnInit, QueryList, ViewChild, ViewChildren } from '@angular/core';
|
import { Component, ElementRef, OnInit, QueryList, ViewChild, ViewChildren } from '@angular/core';
|
||||||
import { ActivatedRoute, Router } from '@angular/router';
|
import { ActivatedRoute, Router } from '@angular/router';
|
||||||
import { ModalController, IonicSlides } from '@ionic/angular';
|
import { ModalController, IonicSlides, Platform } from '@ionic/angular';
|
||||||
import { Publication } from 'src/app/models/publication';
|
import { Publication } from 'src/app/models/publication';
|
||||||
import { PublicationFolder } from 'src/app/models/publicationfolder';
|
import { PublicationFolder } from 'src/app/models/publicationfolder';
|
||||||
import { PublicationPipe } from 'src/app/pipes/publication.pipe';
|
import { PublicationPipe } from 'src/app/pipes/publication.pipe';
|
||||||
@@ -68,7 +68,8 @@ export class ViewPublicationsPage implements OnInit {
|
|||||||
public publicationFolderService: PublicationFolderService,
|
public publicationFolderService: PublicationFolderService,
|
||||||
public checkFileType: checkFileTypeService,
|
public checkFileType: checkFileTypeService,
|
||||||
private publicationVideoManagerService: PublicationVideoManagerService,
|
private publicationVideoManagerService: PublicationVideoManagerService,
|
||||||
public stopvideoService: StopvideoService) {
|
public stopvideoService: StopvideoService,
|
||||||
|
private platform: Platform,) {
|
||||||
|
|
||||||
|
|
||||||
/* this.publicationVideoManagerService.setContainer(this.VideoManager.nativeElement) */
|
/* this.publicationVideoManagerService.setContainer(this.VideoManager.nativeElement) */
|
||||||
@@ -192,7 +193,8 @@ export class ViewPublicationsPage implements OnInit {
|
|||||||
|
|
||||||
goBack() {
|
goBack() {
|
||||||
if (window["sharedContent"]) {
|
if (window["sharedContent"]) {
|
||||||
App.exitApp();
|
if (this.platform.is('android'))
|
||||||
|
App.exitApp();
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
this.router.navigate(['/home/publications']);
|
this.router.navigate(['/home/publications']);
|
||||||
|
|||||||
Reference in New Issue
Block a user