Update UIkit to 3.12.2. Add Subjects: Cliking add will add the input value also.
This commit is contained in:
parent
3f4a4b3501
commit
f4b54fa745
|
@ -39,7 +39,7 @@
|
||||||
"sass-loader": "7.3.1",
|
"sass-loader": "7.3.1",
|
||||||
"ts-md5": "^1.2.0",
|
"ts-md5": "^1.2.0",
|
||||||
"tslib": "^2.0.0",
|
"tslib": "^2.0.0",
|
||||||
"uikit": "3.12.0",
|
"uikit": "3.12.2",
|
||||||
"zone.js": "~0.11.4"
|
"zone.js": "~0.11.4"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
|
@ -64,4 +64,4 @@
|
||||||
"ts-node": "~7.0.0",
|
"ts-node": "~7.0.0",
|
||||||
"typescript": "~4.6.4"
|
"typescript": "~4.6.4"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit f1f824674d1431ca1d4e6c31d720d3e36b153d1e
|
Subproject commit 7ecb56ec9883e78cc6039c6094e60975176c7b57
|
|
@ -287,7 +287,7 @@
|
||||||
</ul>
|
</ul>
|
||||||
<ul class="uk-switcher">
|
<ul class="uk-switcher">
|
||||||
<li *ngIf="subjectsForm">
|
<li *ngIf="subjectsForm">
|
||||||
<div input [type]="'chips'" [formInput]="subjectsForm" [inputClass]="'flat small'" [extendEnter]="onEnter"
|
<div #addSubjectsInput input [type]="'chips'" [formInput]="subjectsForm" [inputClass]="'flat small'" [extendEnter]="onEnter"
|
||||||
[separators]="[',', 'enter']" [visibleChips]="3" class="uk-width-1-1 uk-width-xlarge@m"
|
[separators]="[',', 'enter']" [visibleChips]="3" class="uk-width-1-1 uk-width-xlarge@m"
|
||||||
[placeholder]="{static: true, label: 'Type subjects as free text keywords'}">
|
[placeholder]="{static: true, label: 'Type subjects as free text keywords'}">
|
||||||
<div tools class="uk-flex uk-flex-right">
|
<div tools class="uk-flex uk-flex-right">
|
||||||
|
@ -313,4 +313,4 @@
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
</fs-modal>
|
</fs-modal>
|
||||||
|
|
|
@ -16,6 +16,7 @@ import {NotificationHandler} from "../../../openaireLibrary/utils/notification-h
|
||||||
import {ClearCacheService} from "../../../openaireLibrary/services/clear-cache.service";
|
import {ClearCacheService} from "../../../openaireLibrary/services/clear-cache.service";
|
||||||
import {SdgSelectionComponent} from '../../../openaireLibrary/sdg/sdg-selection/sdg-selection.component';
|
import {SdgSelectionComponent} from '../../../openaireLibrary/sdg/sdg-selection/sdg-selection.component';
|
||||||
import {FosSelectionComponent} from '../../../openaireLibrary/fos/fos-selection/fos-selection.component';
|
import {FosSelectionComponent} from '../../../openaireLibrary/fos/fos-selection/fos-selection.component';
|
||||||
|
import {InputComponent} from "../../../openaireLibrary/sharedComponents/input/input.component";
|
||||||
|
|
||||||
declare var UIkit: any;
|
declare var UIkit: any;
|
||||||
|
|
||||||
|
@ -55,7 +56,7 @@ export class SubjectsEditFormComponent implements OnInit {
|
||||||
indexSdg: number = 0;
|
indexSdg: number = 0;
|
||||||
indexFos: number = 0;
|
indexFos: number = 0;
|
||||||
|
|
||||||
@ViewChild('searchInputComponent') searchInputComponent: SearchInputComponent;
|
@ViewChild('addSubjectsInput') addSubjectsInput: InputComponent;
|
||||||
@ViewChild('editModal') editModal: AlertModal;
|
@ViewChild('editModal') editModal: AlertModal;
|
||||||
@ViewChild('deleteModal') deleteModal: AlertModal;
|
@ViewChild('deleteModal') deleteModal: AlertModal;
|
||||||
@ViewChild('fsModal', {static: true}) fullscreen: FullScreenModalComponent;
|
@ViewChild('fsModal', {static: true}) fullscreen: FullScreenModalComponent;
|
||||||
|
@ -274,8 +275,10 @@ export class SubjectsEditFormComponent implements OnInit {
|
||||||
}
|
}
|
||||||
|
|
||||||
public addSubjectsIntoList() {
|
public addSubjectsIntoList() {
|
||||||
const subjectsFromUserInput = this.subjectsForm.getRawValue();
|
if(this.addSubjectsInput.searchControl.getRawValue()) {
|
||||||
subjectsFromUserInput.forEach(element => {
|
this.addSubjectsInput.add(null, true);
|
||||||
|
}
|
||||||
|
this.subjectsForm.getRawValue().forEach(element => {
|
||||||
this.displayedSubjects.unshift(element);
|
this.displayedSubjects.unshift(element);
|
||||||
});
|
});
|
||||||
this.subjectsForm.clear();
|
this.subjectsForm.clear();
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit f264617e5ab356c4279ee1ef1819db434fec4fba
|
Subproject commit aa1e6c9df390a4ba0919b5f8591374f7eec75089
|
Loading…
Reference in New Issue