Merge branch 'iiif-mirador' of https://github.com/mspalti/dspace-angular into iiif-mirador

src/app/entity-groups/iiif-entities/item-pages/iiif-searchable/iiif-searchable.component.spec.ts

@@ -3,7 +3,7 @@ import { ChangeDetectionStrategy, DebugElement, NO_ERRORS_SCHEMA } from '@angula
 import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
 import { Store } from '@ngrx/store';
 import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import {Observable, of as observableOf} from 'rxjs';
+import { Observable } from 'rxjs';
 import { GenericItemPageFieldComponent } from '../../../../+item-page/simple/field-components/specific-field/generic/generic-item-page-field.component';
 import { RemoteDataBuildService } from '../../../../core/cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../../../../core/cache/object-cache.service';
@@ -27,8 +27,8 @@ import { TruncatableService } from '../../../../shared/truncatable/truncatable.s
 import { TruncatePipe } from '../../../../shared/utils/truncate.pipe';
 import { IIIFSearchableComponent } from './iiif-searchable.component';
 import { By } from '@angular/platform-browser';
-import {RelationshipService} from '../../../../core/data/relationship.service';
+import { RelationshipService } from '../../../../core/data/relationship.service';
-import {RouteService} from '../../../../core/services/route.service';
+import { RouteService } from '../../../../core/services/route.service';
 
 let comp: IIIFSearchableComponent;
 let fixture: ComponentFixture<IIIFSearchableComponent>;
@@ -117,7 +117,8 @@ describe('IIIFSearchableComponent', () => {
       const fields = fixture.debugElement.queryAll(By.css('.item-page-fields'));
       expect(containsFieldInput(fields, key)).toBeTruthy();
     });
-   }
+  }
+
 });
 
 function containsFieldInput(fields: DebugElement[], metadataKey: string): boolean {

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';

src/app/entity-groups/iiif-entities/item-pages/iiif/iiif.component.spec.ts

@@ -27,7 +27,7 @@ import { TruncatableService } from '../../../../shared/truncatable/truncatable.s
 import { TruncatePipe } from '../../../../shared/utils/truncate.pipe';
 import { IIIFComponent } from './iiif.component';
 import { By } from '@angular/platform-browser';
-import {RelationshipService} from '../../../../core/data/relationship.service';
+import { RelationshipService } from '../../../../core/data/relationship.service';
 
 let comp: IIIFComponent;
 let fixture: ComponentFixture<IIIFComponent>;

src/mirador-viewer/index.js

@@ -9,7 +9,10 @@ const manifest = params.get('manifest');
 const searchable = params.get('searchable');
 const query = params.get('query');
 const multi = params.get('multi');
+<<<<<<< HEAD
 const notMobile = params.get('notMobile');
+=======
+>>>>>>> aa27ddad0258c1d4829fdcfbfdcf0e5c3432aa34
 
 let windowSettings = {};
 let sidbarPanel = 'info';
@@ -20,6 +23,7 @@ let thumbNavigation = 'off';
 windowSettings.manifestId = manifest;
 
 (() => {
+<<<<<<< HEAD
   if (searchable) {
     defaultView = 'book';
     sidbarPanel = 'search';
@@ -27,15 +31,31 @@ windowSettings.manifestId = manifest;
     if (notMobile) {
       thumbNavigation = 'far-right';
     }
+=======
+  console.log('setting params in viewer');
+  if (searchable) {
+    console.log(multi)
+    defaultView = 'book';
+    sidbarPanel = 'search';
+    multipleItems = true;
+    thumbNavigation = 'far-right';
+>>>>>>> aa27ddad0258c1d4829fdcfbfdcf0e5c3432aa34
     if (query !== 'null') {
       windowSettings.defaultSearchQuery = query;
     }
   } else {
+<<<<<<< HEAD
     if(multi) {
       multipleItems = multi;
       if (notMobile) {
         thumbNavigation = 'far-right';
       }
+=======
+    console.log(multi)
+    if(multi) {
+      multipleItems = multi;
+      thumbNavigation = 'far-right';
+>>>>>>> aa27ddad0258c1d4829fdcfbfdcf0e5c3432aa34
     }
   }
 })();
@@ -128,7 +148,11 @@ windowSettings.manifestId = manifest;
         allowFullscreen: true,
         allowMaximize: false,
         defaultView: defaultView,
+<<<<<<< HEAD
         sideBarOpen: notMobile,
+=======
+        sideBarOpen: true,
+>>>>>>> aa27ddad0258c1d4829fdcfbfdcf0e5c3432aa34
         allowTopMenuButton: true,
         defaultSidebarPanelWidth: 230,
         switchCanvasOnSearch: true,