[Library | Trunk]: Remove directive modal-select.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59257 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
parent
c1977b1404
commit
1e8a635c1b
|
@ -24,9 +24,9 @@ declare var UIkit: any;
|
||||||
<div class="uk-padding">
|
<div class="uk-padding">
|
||||||
<mat-form-field class="matSelectionFormField uk-width-1-1">
|
<mat-form-field class="matSelectionFormField uk-width-1-1">
|
||||||
<mat-label>Select a citation style</mat-label>
|
<mat-label>Select a citation style</mat-label>
|
||||||
<mat-select #matSelect class="matSelection" id="citations" name="citeselect" [(ngModel)]="selectedStyle"
|
<mat-select class="matSelection" id="citations" name="citeselect" [(ngModel)]="selectedStyle"
|
||||||
(ngModelChange)="styleChanged()"
|
(ngModelChange)="styleChanged()"
|
||||||
[disableOptionCentering]="true" modal-select [matSelect]="matSelect"
|
[disableOptionCentering]="true"
|
||||||
panelClass="matSelectionPanel">
|
panelClass="matSelectionPanel">
|
||||||
<mat-option *ngFor=" let style of this.citation.templates let i = index"
|
<mat-option *ngFor=" let style of this.citation.templates let i = index"
|
||||||
[value]="style">{{style}}</mat-option>
|
[value]="style">{{style}}</mat-option>
|
||||||
|
|
|
@ -1,15 +1,14 @@
|
||||||
import { NgModule} from '@angular/core';
|
import {NgModule} from '@angular/core';
|
||||||
import { CommonModule } from '@angular/common';
|
import {CommonModule} from '@angular/common';
|
||||||
import { FormsModule } from '@angular/forms';
|
import {FormsModule} from '@angular/forms';
|
||||||
|
|
||||||
import {CiteThisComponent} from './citeThis.component';
|
import {CiteThisComponent} from './citeThis.component';
|
||||||
import {MatSelectModule} from "@angular/material";
|
import {MatSelectModule} from "@angular/material";
|
||||||
import {ModalSelectModule} from "../../../utils/modal-select/modal-select.module";
|
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [
|
imports: [
|
||||||
|
|
||||||
CommonModule, FormsModule, MatSelectModule, ModalSelectModule
|
CommonModule, FormsModule, MatSelectModule
|
||||||
],
|
],
|
||||||
declarations: [
|
declarations: [
|
||||||
CiteThisComponent
|
CiteThisComponent
|
||||||
|
|
|
@ -352,7 +352,7 @@
|
||||||
<div>
|
<div>
|
||||||
<mat-form-field class="matSelectionFormField uk-width-1-1">
|
<mat-form-field class="matSelectionFormField uk-width-1-1">
|
||||||
<mat-label>Select a funder to download report</mat-label>
|
<mat-label>Select a funder to download report</mat-label>
|
||||||
<mat-select [(value)]="funder" #matSelect modal-select [matSelect]="matSelect"
|
<mat-select [(value)]="funder"
|
||||||
[disableOptionCentering]="true"
|
[disableOptionCentering]="true"
|
||||||
class="matSelection" panelClass="matSelectionPanel">
|
class="matSelection" panelClass="matSelectionPanel">
|
||||||
<mat-option *ngFor="let element of fetchProjects.funders"
|
<mat-option *ngFor="let element of fetchProjects.funders"
|
||||||
|
|
|
@ -26,7 +26,6 @@ import {OrganizationsDeletedByInferenceModule} from "./deletedByInference/delete
|
||||||
import {LandingHeaderModule} from "../landing-utils/landing-header/landing-header.module";
|
import {LandingHeaderModule} from "../landing-utils/landing-header/landing-header.module";
|
||||||
import {FeedbackModule} from "../feedback/feedback.module";
|
import {FeedbackModule} from "../feedback/feedback.module";
|
||||||
import {MatSelectModule} from "@angular/material/select";
|
import {MatSelectModule} from "@angular/material/select";
|
||||||
import {ModalSelectModule} from "../../utils/modal-select/modal-select.module";
|
|
||||||
import {TabsModule} from "../../utils/tabs/tabs.module";
|
import {TabsModule} from "../../utils/tabs/tabs.module";
|
||||||
import {SearchTabModule} from "../../utils/tabs/contents/search-tab.module";
|
import {SearchTabModule} from "../../utils/tabs/contents/search-tab.module";
|
||||||
|
|
||||||
|
@ -46,7 +45,7 @@ import {SearchTabModule} from "../../utils/tabs/contents/search-tab.module";
|
||||||
ProjectsServiceModule,
|
ProjectsServiceModule,
|
||||||
Schema2jsonldModule, SEOServiceModule, HelperModule,
|
Schema2jsonldModule, SEOServiceModule, HelperModule,
|
||||||
OrganizationsDeletedByInferenceModule, LandingHeaderModule, FeedbackModule,
|
OrganizationsDeletedByInferenceModule, LandingHeaderModule, FeedbackModule,
|
||||||
MatSelectModule, ModalSelectModule,
|
MatSelectModule,
|
||||||
TabsModule, SearchTabModule
|
TabsModule, SearchTabModule
|
||||||
],
|
],
|
||||||
declarations: [
|
declarations: [
|
||||||
|
|
|
@ -278,8 +278,7 @@
|
||||||
<div class="uk-padding-small uk-padding-remove-vertical">
|
<div class="uk-padding-small uk-padding-remove-vertical">
|
||||||
<mat-form-field class="matSelectionFormField uk-width-1-1">
|
<mat-form-field class="matSelectionFormField uk-width-1-1">
|
||||||
<mat-label>Select content type to share</mat-label>
|
<mat-label>Select content type to share</mat-label>
|
||||||
<mat-select #matSelect modal-select [matSelect]="matSelect"
|
<mat-select [(value)]="share_research_results_type"
|
||||||
[(value)]="share_research_results_type"
|
|
||||||
[disableOptionCentering]="true"
|
[disableOptionCentering]="true"
|
||||||
panelClass="entitiesSelectionPanel"
|
panelClass="entitiesSelectionPanel"
|
||||||
class="matSelection">
|
class="matSelection">
|
||||||
|
@ -323,8 +322,7 @@
|
||||||
<mat-form-field
|
<mat-form-field
|
||||||
class="matSelectionFormField uk-width-1-1">
|
class="matSelectionFormField uk-width-1-1">
|
||||||
<mat-label>Select content type report to download</mat-label>
|
<mat-label>Select content type report to download</mat-label>
|
||||||
<mat-select #matSelect modal-select [matSelect]="matSelect"
|
<mat-select [(value)]="download_research_results_type"
|
||||||
[(value)]="download_research_results_type"
|
|
||||||
[disableOptionCentering]="true"
|
[disableOptionCentering]="true"
|
||||||
panelClass="entitiesSelectionPanel"
|
panelClass="entitiesSelectionPanel"
|
||||||
class="matSelection">
|
class="matSelection">
|
||||||
|
|
|
@ -1,18 +1,18 @@
|
||||||
//import {MaterialModule} from '@angular/material';
|
//import {MaterialModule} from '@angular/material';
|
||||||
import { NgModule} from '@angular/core';
|
import {NgModule} from '@angular/core';
|
||||||
import { CommonModule } from '@angular/common';
|
import {CommonModule} from '@angular/common';
|
||||||
import { FormsModule } from '@angular/forms';
|
import {FormsModule} from '@angular/forms';
|
||||||
import { RouterModule } from '@angular/router';
|
import {RouterModule} from '@angular/router';
|
||||||
import {MatSelectModule} from "@angular/material";
|
import {MatSelectModule} from "@angular/material";
|
||||||
|
|
||||||
import { ProjectComponent } from './project.component';
|
import {ProjectComponent} from './project.component';
|
||||||
import {ProjectServiceModule} from './projectService.module';
|
import {ProjectServiceModule} from './projectService.module';
|
||||||
import {HtmlProjectReportService} from "../htmlProjectReport/htmlProjectReport.service";
|
import {HtmlProjectReportService} from "../htmlProjectReport/htmlProjectReport.service";
|
||||||
import {ReportsServiceModule} from '../../services/reportsService.module';
|
import {ReportsServiceModule} from '../../services/reportsService.module';
|
||||||
import {SearchResearchResultsServiceModule} from '../../services/searchResearchResultsService.module';
|
import {SearchResearchResultsServiceModule} from '../../services/searchResearchResultsService.module';
|
||||||
|
|
||||||
import {MetricsModule} from '../landing-utils/metrics/metrics.module';
|
import {MetricsModule} from '../landing-utils/metrics/metrics.module';
|
||||||
import {LandingModule } from '../landing-utils/landing.module';
|
import {LandingModule} from '../landing-utils/landing.module';
|
||||||
import {LandingHeaderModule} from "../landing-utils/landing-header/landing-header.module";
|
import {LandingHeaderModule} from "../landing-utils/landing-header/landing-header.module";
|
||||||
|
|
||||||
import {LoadingModalModule} from '../../utils/modal/loadingModal.module';
|
import {LoadingModalModule} from '../../utils/modal/loadingModal.module';
|
||||||
|
@ -21,14 +21,13 @@ import {ErrorMessagesModule} from '../../utils/errorMessages.module';
|
||||||
import {HelperModule} from "../../utils/helper/helper.module";
|
import {HelperModule} from "../../utils/helper/helper.module";
|
||||||
import {IFrameModule} from '../../utils/iframe.module';
|
import {IFrameModule} from '../../utils/iframe.module';
|
||||||
|
|
||||||
import {FreeGuard} from'../../login/freeGuard.guard';
|
import {FreeGuard} from '../../login/freeGuard.guard';
|
||||||
import {IsRouteEnabled} from '../../error/isRouteEnabled.guard';
|
import {IsRouteEnabled} from '../../error/isRouteEnabled.guard';
|
||||||
import {Schema2jsonldModule} from '../../sharedComponents/schema2jsonld/schema2jsonld.module';
|
import {Schema2jsonldModule} from '../../sharedComponents/schema2jsonld/schema2jsonld.module';
|
||||||
import {SEOServiceModule } from '../../sharedComponents/SEO/SEOService.module';
|
import {SEOServiceModule} from '../../sharedComponents/SEO/SEOService.module';
|
||||||
import {FeedbackModule} from "../feedback/feedback.module";
|
import {FeedbackModule} from "../feedback/feedback.module";
|
||||||
import {AltMetricsModule} from "../../utils/altmetrics.module";
|
import {AltMetricsModule} from "../../utils/altmetrics.module";
|
||||||
import {TabsModule} from "../../utils/tabs/tabs.module";
|
import {TabsModule} from "../../utils/tabs/tabs.module";
|
||||||
import {ModalSelectModule} from "../../utils/modal-select/modal-select.module";
|
|
||||||
import {SearchTabModule} from "../../utils/tabs/contents/search-tab.module";
|
import {SearchTabModule} from "../../utils/tabs/contents/search-tab.module";
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
|
@ -39,7 +38,7 @@ import {SearchTabModule} from "../../utils/tabs/contents/search-tab.module";
|
||||||
SearchResearchResultsServiceModule, ProjectServiceModule,
|
SearchResearchResultsServiceModule, ProjectServiceModule,
|
||||||
Schema2jsonldModule, SEOServiceModule, HelperModule,
|
Schema2jsonldModule, SEOServiceModule, HelperModule,
|
||||||
LandingHeaderModule, MatSelectModule, FeedbackModule, AltMetricsModule,
|
LandingHeaderModule, MatSelectModule, FeedbackModule, AltMetricsModule,
|
||||||
TabsModule, ModalSelectModule, SearchTabModule
|
TabsModule, SearchTabModule
|
||||||
],
|
],
|
||||||
declarations: [
|
declarations: [
|
||||||
ProjectComponent
|
ProjectComponent
|
||||||
|
|
|
@ -1,17 +0,0 @@
|
||||||
import {Directive, Input, OnInit} from "@angular/core";
|
|
||||||
import {MatSelect} from "@angular/material/select";
|
|
||||||
|
|
||||||
@Directive({
|
|
||||||
selector: '[modal-select]'
|
|
||||||
})
|
|
||||||
export class ModalSelectDirective implements OnInit{
|
|
||||||
|
|
||||||
@Input() matSelect: MatSelect;
|
|
||||||
|
|
||||||
ngOnInit() {
|
|
||||||
this.matSelect._openedStream.subscribe( () => {
|
|
||||||
let divElement: HTMLDivElement = <HTMLDivElement>document.getElementsByClassName('cdk-overlay-container')[0];
|
|
||||||
divElement.classList.add('modal-select');
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,10 +0,0 @@
|
||||||
import {NgModule} from "@angular/core";
|
|
||||||
import {CommonModule} from "@angular/common";
|
|
||||||
import {ModalSelectDirective} from "./modal-select.directive";
|
|
||||||
|
|
||||||
@NgModule({
|
|
||||||
imports: [CommonModule],
|
|
||||||
declarations: [ModalSelectDirective],
|
|
||||||
exports: [ModalSelectDirective]
|
|
||||||
})
|
|
||||||
export class ModalSelectModule {}
|
|
Loading…
Reference in New Issue