Skip to content
Snippets Groups Projects
Unverified Commit a40f1975 authored by xgui3783's avatar xgui3783 Committed by GitHub
Browse files

Merge pull request #664 from HumanBrainProject/dev_move_drag_and_drop_to_nehuba_container

Move drag&drop to nehuba container
parents 3157d674 9035e21b
No related branches found
No related tags found
No related merge requests found
...@@ -41,7 +41,6 @@ ...@@ -41,7 +41,6 @@
<!-- atlas template --> <!-- atlas template -->
<ng-template #viewerBody> <ng-template #viewerBody>
<div class="atlas-container" <div class="atlas-container"
(drag-drop)="localFileService.handleFileDrop($event)"
iav-media-query iav-media-query
#media="iavMediaQuery"> #media="iavMediaQuery">
<!-- prevent default is required so that user do not zoom in on UI or scroll on mobile UI --> <!-- prevent default is required so that user do not zoom in on UI or scroll on mobile UI -->
...@@ -54,7 +53,8 @@ ...@@ -54,7 +53,8 @@
[currentOnHover]="iavMouseHoverEl.currentOnHoverObs$ | async" [currentOnHover]="iavMouseHoverEl.currentOnHoverObs$ | async"
iav-captureClickListenerDirective iav-captureClickListenerDirective
[iav-captureClickListenerDirective-captureDocument]="true" [iav-captureClickListenerDirective-captureDocument]="true"
(iav-captureClickListenerDirective-onUnmovedClick)="mouseClickDocument($event)"> (iav-captureClickListenerDirective-onUnmovedClick)="mouseClickDocument($event)"
(drag-drop)="localFileService.handleFileDrop($event)">
<!-- top right content transclusion --> <!-- top right content transclusion -->
<div ui-nehuba-container-overlay-top-right class="d-inline-flex flex-row justify-content-end align-items-start z-index-6 position-absolute pe-none w-100 h-100"> <div ui-nehuba-container-overlay-top-right class="d-inline-flex flex-row justify-content-end align-items-start z-index-6 position-absolute pe-none w-100 h-100">
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
</ng-container> </ng-container>
</mat-chip-list> </mat-chip-list>
<!-- current layer tmpl --> <!-- current layer tmpl -->
<ng-template #currParcellationTmpl let-parc="parc" let-addParc="addParc"> <ng-template #currParcellationTmpl let-parc="parc" let-addParc="addParc">
...@@ -149,7 +149,7 @@ ...@@ -149,7 +149,7 @@
[ngClass]="chipClass" [ngClass]="chipClass"
(click)="onclick && onclick()" (click)="onclick && onclick()"
[selected]="selected"> [selected]="selected">
<span> <span>
{{ parcel?.groupName ? (parcel?.groupName + ' - ') : '' }}{{ parcel && (parcel.displayName || parcel.name) }} {{ parcel?.groupName ? (parcel?.groupName + ' - ') : '' }}{{ parcel && (parcel.displayName || parcel.name) }}
</span> </span>
...@@ -291,7 +291,7 @@ ...@@ -291,7 +291,7 @@
[iav-dataset-preview-dataset-file-kgid]="layer.datasetId" [iav-dataset-preview-dataset-file-kgid]="layer.datasetId"
[iav-dataset-preview-dataset-file-filename]="layer.filename" [iav-dataset-preview-dataset-file-filename]="layer.filename"
#preview="iavDatasetPreviewDatasetFile"> #preview="iavDatasetPreviewDatasetFile">
</div> </div>
<mat-chip class="pe-all" <mat-chip class="pe-all"
(click)="uiNehubaContainer.matDrawerMinor.open() && uiNehubaContainer.navSideDrawerMainSwitch.open()"> (click)="uiNehubaContainer.matDrawerMinor.open() && uiNehubaContainer.navSideDrawerMainSwitch.open()">
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment