diff --git a/src/app/entity-groups/iiif-entities/item-pages/iiif-searchable/iiif-searchable.component.ts b/src/app/entity-groups/iiif-entities/item-pages/iiif-searchable/iiif-searchable.component.ts index 6250e58368..2033f8dddf 100644 --- a/src/app/entity-groups/iiif-entities/item-pages/iiif-searchable/iiif-searchable.component.ts +++ b/src/app/entity-groups/iiif-entities/item-pages/iiif-searchable/iiif-searchable.component.ts @@ -1,6 +1,6 @@ import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator'; import { ViewMode } from '../../../../core/shared/view-mode.model'; -import { Component, OnInit } from '@angular/core'; +import {Component, OnInit} from '@angular/core'; import { ItemComponent } from '../../../../+item-page/simple/item-types/shared/item.component'; import { RouteService } from '../../../../core/services/route.service'; import { Observable } from 'rxjs/internal/Observable'; @@ -46,4 +46,5 @@ export class IIIFSearchableComponent extends ItemComponent implements OnInit { }) ); } + } diff --git a/src/app/entity-groups/iiif-entities/mirador-viewer/mirador-viewer.component.ts b/src/app/entity-groups/iiif-entities/mirador-viewer/mirador-viewer.component.ts index 06212a8734..3a7f53536b 100644 --- a/src/app/entity-groups/iiif-entities/mirador-viewer/mirador-viewer.component.ts +++ b/src/app/entity-groups/iiif-entities/mirador-viewer/mirador-viewer.component.ts @@ -30,6 +30,8 @@ export class MiradorViewerComponent implements OnInit { multi = false; + notMobile = false; + constructor(private sanitizer: DomSanitizer, private bitstreamDataService: BitstreamDataService, @Inject(PLATFORM_ID) private platformId: any) { @@ -40,6 +42,7 @@ export class MiradorViewerComponent implements OnInit { * or multi-page thumbnail navigation. */ setURL() { + const width = window.innerWidth; // The path to the REST manifest endpoint. const manifestApiEndpoint = encodeURIComponent(environment.rest.baseUrl + '/api/iiif/' + this.item.id + '/manifest'); @@ -57,6 +60,9 @@ export class MiradorViewerComponent implements OnInit { // Tell the viewer to add thumbnail navigation. If searchable, thumbnail navigation is added by default. viewerPath += '&multi=' + this.multi; } + if (this.notMobile) { + viewerPath += '¬Mobile=true'; + } // TODO: review whether the item.id should be sanitized. The query term should be (check mirador viewer). return this.sanitizer.bypassSecurityTrustResourceUrl(viewerPath); } @@ -66,6 +72,9 @@ export class MiradorViewerComponent implements OnInit { * Initializes the iframe url observable. */ if (isPlatformBrowser(this.platformId)) { + if (window.innerWidth > 768) { + this.notMobile = true; + } this.iframeViewerUrl = this.bitstreamDataService .findAllByItemAndBundleName(this.item, 'IIIF', {}) .pipe( diff --git a/src/mirador-viewer/index.js b/src/mirador-viewer/index.js index fe0c00675a..e4860f9963 100644 --- a/src/mirador-viewer/index.js +++ b/src/mirador-viewer/index.js @@ -9,6 +9,7 @@ const manifest = params.get('manifest'); const searchable = params.get('searchable'); const query = params.get('query'); const multi = params.get('multi'); +const notMobile = params.get('notMobile'); let windowSettings = {}; let sidbarPanel = 'info'; @@ -19,21 +20,22 @@ let thumbNavigation = 'off'; windowSettings.manifestId = manifest; (() => { - console.log('setting params in viewer'); if (searchable) { - console.log(multi) defaultView = 'book'; sidbarPanel = 'search'; multipleItems = true; - thumbNavigation = 'far-right'; + if (notMobile) { + thumbNavigation = 'far-right'; + } if (query !== 'null') { windowSettings.defaultSearchQuery = query; } } else { - console.log(multi) if(multi) { multipleItems = multi; - thumbNavigation = 'far-right'; + if (notMobile) { + thumbNavigation = 'far-right'; + } } } })(); @@ -126,7 +128,7 @@ windowSettings.manifestId = manifest; allowFullscreen: true, allowMaximize: false, defaultView: defaultView, - sideBarOpen: true, + sideBarOpen: notMobile, allowTopMenuButton: true, defaultSidebarPanelWidth: 230, switchCanvasOnSearch: true,