diff --git a/src/app/page.service.ts b/src/app/page.service.ts index 7ea34f9..b2a63c3 100644 --- a/src/app/page.service.ts +++ b/src/app/page.service.ts @@ -73,6 +73,9 @@ export class PageService { page['parent_title']=item['parentTitle']['title']; page['parent_link']=item['parentTitle']['link']; + if (item['acf']['pdf']) { page['pdf']=item['acf']['pdf']; } + else { page['pdf']=null; } + /* chilsd */ page["hasChild"]=item["hasChild"]; // if (item["hasChild"]) { @@ -86,8 +89,6 @@ export class PageService { /* featured images */ if ( !childs && item["_embedded"]["wp:featuredmedia"]) { - console.log('featured image: '+item.id); - console.log(item["_embedded"]["wp:featuredmedia"]) page["featuredmedia"] = item["_embedded"]["wp:featuredmedia"]; if (item["_embedded"]["wp:featuredmedia"][0]["media_details"]["sizes"]["large"]) { diff --git a/src/app/page/page.component.html b/src/app/page/page.component.html index 96f7feb..d0832a3 100644 --- a/src/app/page/page.component.html +++ b/src/app/page/page.component.html @@ -36,11 +36,11 @@
-
+
- +
- +
diff --git a/src/app/page/page.component.ts b/src/app/page/page.component.ts index 82d43a8..5aebd9c 100644 --- a/src/app/page/page.component.ts +++ b/src/app/page/page.component.ts @@ -40,6 +40,7 @@ export class PageComponent implements OnInit { imageIndex = 1; galleryId = 1; gallery: Image[]; + loaderPDF: number; constructor( private route: ActivatedRoute, @@ -56,7 +57,6 @@ export class PageComponent implements OnInit { } ngOnInit() { - console.log('init') // $('html body').animate( // {scrollTop:0}, 1000); document.documentElement.scrollTop = 0 @@ -78,9 +78,8 @@ export class PageComponent implements OnInit { var safeUrl:SafeUrl; safeUrl = this.sanitizer.bypassSecurityTrustUrl('https://backend.industriapaisaia.eus/wp-content/uploads/2018/10/test.pdf'); p['publitas_link_sanitize'] = safeUrl; - console.log(p['publitas_link_sanitize']); + if (p['pdf']) { p['pdfUrl'] = p['pdf']['url']; }; }) - //console.log(data); }); } @@ -134,12 +133,12 @@ buttonsConfigIndustria: ButtonsConfig = { // } onVisibleIndex(event: ImageModalEvent) { - console.log('onVisibleIndex action: ' + Action[event.action]); - console.log('onVisibleIndex result:' + event.result); + // console.log('onVisibleIndex action: ' + Action[event.action]); + // console.log('onVisibleIndex result:' + event.result); } openImageModalRowDescription(image: Image) { - console.log('Opening modal gallery from custom plain gallery row and description, with image: ', image); + // console.log('Opening modal gallery from custom plain gallery row and description, with image: ', image); const index: number = this.getCurrentIndexCustomLayout(image, this.pages[0].gallery); this.customPlainGalleryRowDescConfig = Object.assign({}, this.customPlainGalleryRowDescConfig, { layout: new AdvancedLayout(index, true) }); } @@ -148,4 +147,10 @@ private getCurrentIndexCustomLayout(image: Image, images: Image[]): number { return image ? images.indexOf(image) : -1; } +onProgressPDF(event,total) { + let loadInt = parseInt(event.loaded, 10); + let totalInt = parseInt(total,10); + this.loaderPDF = Math.floor(loadInt/totalInt*100); +} + } diff --git a/src/assets/test.pdf b/src/assets/test.pdf deleted file mode 100644 index 9aa7342..0000000 Binary files a/src/assets/test.pdf and /dev/null differ