Skip to content

Commit

Permalink
fix default placment settings
Browse files Browse the repository at this point in the history
  • Loading branch information
MrFrankel committed Jan 17, 2018
1 parent 2c93f5c commit aa7e954
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 9 deletions.
3 changes: 1 addition & 2 deletions example/app/app.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@
[popper]="popper1Content"
[popperTrigger]="'click'"
[popperTarget]="popper1"
[popperShowOnStart]="true"
[popperPlacement]="example1select" class="rel" id="example10reference1">
[popperShowOnStart]="true" class="rel" id="example10reference1">
<p class="bold">Hey!</p>
<p class="thin">Choose where to put your popper!</p>
<select [(ngModel)]="example1select" (change)="changeExample1(popper1Content)"
Expand Down
2 changes: 0 additions & 2 deletions example/app/app.component.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import {Component, ElementRef, ViewEncapsulation, OnInit, ViewChild} from '@angular/core';
import {PopperContent} from '../../src/popper-content';
import {PopperController} from '../../src/popper-directive';
/**
* This class represents the main application component.
*/
Expand All @@ -20,7 +19,6 @@ export class AppComponent implements OnInit {
@ViewChild('popper3Content') popper3Content: PopperContent;

constructor(private elem: ElementRef) {
PopperController.baseOptions.disableAnimation = true;
}

ngOnInit() {
Expand Down
3 changes: 2 additions & 1 deletion example/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ import {Draggable} from 'ng2draggable/draggable.directive';
FormsModule,
NgxPopperModule.forRoot({
trigger: Triggers.NONE,
hideOnClickOutside: false
hideOnClickOutside: false,
disableAnimation: true
})],
declarations: [
Draggable,
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ngx-popper",
"version": "1.9.4",
"version": "1.9.6",
"description": "ngx-popper is an angular wrapper for popper.js",
"directories": {
"test": "test"
Expand Down
11 changes: 8 additions & 3 deletions src/popper-directive.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,15 @@ export class PopperController implements OnInit, OnChanges {
private resolver: ComponentFactoryResolver,
private renderer: Renderer2,
@Inject('popperDefaults') private popperDefaults: PopperContentOptions) {
PopperController.baseOptions = {...this.popperDefaults, ...PopperController.baseOptions}
PopperController.baseOptions = {...PopperController.baseOptions, ...this.popperDefaults}
}

public static baseOptions: PopperContentOptions = <PopperContentOptions>{};
public static baseOptions: PopperContentOptions = <PopperContentOptions>{
placement: Placements.Auto,
hideOnClickOutside: true,
hideOnScroll: false,
showTrigger: Triggers.HOVER
};

@Input('popper')
content: string | PopperContent;
Expand All @@ -44,7 +49,7 @@ export class PopperController implements OnInit, OnChanges {
disabled: boolean;

@Input('popperPlacement')
placement: Placement = Placements.Auto;
placement: Placement;

@Input('popperTrigger')
showTrigger: Trigger | undefined;
Expand Down

0 comments on commit aa7e954

Please sign in to comment.