mirror of
https://github.com/DSpace/dspace-angular.git
synced 2025-10-09 02:54:13 +00:00
Merge branch 'w2p-53881_facet-search-box' into search-features
Conflicts: src/app/core/shared/resource-type.ts src/app/shared/shared.module.ts
This commit is contained in:
@@ -43,14 +43,16 @@ import { VarDirective } from './utils/var.directive';
|
||||
import { LogInComponent } from './log-in/log-in.component';
|
||||
import { AuthNavMenuComponent } from './auth-nav-menu/auth-nav-menu.component';
|
||||
import { LogOutComponent } from './log-out/log-out.component';
|
||||
import { NotificationComponent } from './notifications/notification/notification.component';
|
||||
import { NotificationsBoardComponent } from './notifications/notifications-board/notifications-board.component';
|
||||
import { DragClickDirective } from './utils/drag-click.directive';
|
||||
import { TruncatePipe } from './utils/truncate.pipe';
|
||||
import { TruncatableComponent } from './truncatable/truncatable.component';
|
||||
import { TruncatableService } from './truncatable/truncatable.service';
|
||||
import { TruncatablePartComponent } from './truncatable/truncatable-part/truncatable-part.component';
|
||||
import { MockAdminGuard } from './mocks/mock-admin-guard.service';
|
||||
import { DebounceDirective } from './utils/debounce.directive';
|
||||
import { ClickOutsideDirective } from './utils/click-outside.directive';
|
||||
import { EmphasizePipe } from './utils/emphasize.pipe';
|
||||
import { InputSuggestionsComponent } from './input-suggestions/input-suggestions.component';
|
||||
|
||||
const MODULES = [
|
||||
// Do NOT include UniversalModule, HttpModule, or JsonpModule here
|
||||
@@ -68,7 +70,8 @@ const PIPES = [
|
||||
EnumKeysPipe,
|
||||
FileSizePipe,
|
||||
SafeUrlPipe,
|
||||
TruncatePipe
|
||||
TruncatePipe,
|
||||
EmphasizePipe
|
||||
];
|
||||
|
||||
const COMPONENTS = [
|
||||
@@ -95,6 +98,7 @@ const COMPONENTS = [
|
||||
ViewModeSwitchComponent,
|
||||
TruncatableComponent,
|
||||
TruncatablePartComponent,
|
||||
InputSuggestionsComponent
|
||||
];
|
||||
|
||||
const ENTRY_COMPONENTS = [
|
||||
@@ -116,7 +120,9 @@ const PROVIDERS = [
|
||||
|
||||
const DIRECTIVES = [
|
||||
VarDirective,
|
||||
DragClickDirective
|
||||
DragClickDirective,
|
||||
DebounceDirective,
|
||||
ClickOutsideDirective
|
||||
];
|
||||
|
||||
@NgModule({
|
||||
|
Reference in New Issue
Block a user