diff --git a/package.json b/package.json index e8b448ae..870591d1 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "leaflet": "^0.7.7", "leaflet-map": "^0.2.1", "lodash": "^4.12.0", - "ng2-bootstrap": "^1.0.20", + "ng2-bootstrap": "1.1.0", "ng2-tree": "^0.0.2-7", "ng2-ckeditor": "1.0.6", "ng2-smart-table": "^0.1.6", diff --git a/src/app/pages/forms/components/inputs/components/ratinginputs/ratinginputs.component.ts b/src/app/pages/forms/components/inputs/components/ratinginputs/ratinginputs.component.ts index 0e4b2e2d..8b2322a8 100644 --- a/src/app/pages/forms/components/inputs/components/ratinginputs/ratinginputs.component.ts +++ b/src/app/pages/forms/components/inputs/components/ratinginputs/ratinginputs.component.ts @@ -1,9 +1,7 @@ -import { RatingComponent } from 'ng2-bootstrap/ng2-bootstrap'; import { Component } from '@angular/core'; @Component({ selector: 'rating-inputs', - directives: [RatingComponent], template: require('./ratinginputs.html') }) diff --git a/src/app/pages/forms/forms.module.ts b/src/app/pages/forms/forms.module.ts index e3dee6a7..3234708c 100644 --- a/src/app/pages/forms/forms.module.ts +++ b/src/app/pages/forms/forms.module.ts @@ -4,6 +4,8 @@ import { FormsModule as AngularFormsModule } from '@angular/forms'; import { NgaModule } from '../../theme/nga.module'; import { routing } from './forms.routing'; + +import { RatingModule } from 'ng2-bootstrap/ng2-bootstrap'; import { Forms } from './forms.component'; import { Inputs } from './components/inputs'; import { Layouts } from './components/layouts'; @@ -14,6 +16,7 @@ import { Layouts } from './components/layouts'; CommonModule, AngularFormsModule, NgaModule, + RatingModule, routing ], declarations: [ diff --git a/src/app/pages/ui/components/buttons/components/dropdownButtons/dropdownButtons.component.ts b/src/app/pages/ui/components/buttons/components/dropdownButtons/dropdownButtons.component.ts index 4352a5b6..6c89df9a 100644 --- a/src/app/pages/ui/components/buttons/components/dropdownButtons/dropdownButtons.component.ts +++ b/src/app/pages/ui/components/buttons/components/dropdownButtons/dropdownButtons.component.ts @@ -1,10 +1,8 @@ import {Component, HostListener} from '@angular/core'; -import { DROPDOWN_DIRECTIVES } from 'ng2-bootstrap/ng2-bootstrap'; @Component({ selector: 'dropdown-buttons', - template: require('./dropdownButtons.html'), - directives: [DROPDOWN_DIRECTIVES] + template: require('./dropdownButtons.html') }) // TODO: appendToBody does not implemented yet, waiting for it diff --git a/src/app/pages/ui/components/buttons/components/dropdownButtons/dropdownButtons.html b/src/app/pages/ui/components/buttons/components/dropdownButtons/dropdownButtons.html index 6ee7f133..04a84b39 100644 --- a/src/app/pages/ui/components/buttons/components/dropdownButtons/dropdownButtons.html +++ b/src/app/pages/ui/components/buttons/components/dropdownButtons/dropdownButtons.html @@ -1,7 +1,7 @@