Skip to content

Commit

Permalink
Merge branch 'development' of github.com:valor-software/ngx-bootstrap…
Browse files Browse the repository at this point in the history
… into update-ngx-bootstrap-to-ng9
  • Loading branch information
daniloff200 committed Jul 2, 2020
2 parents b46d25e + 7f5c340 commit cd2055d
Show file tree
Hide file tree
Showing 50 changed files with 2,162 additions and 5,479 deletions.
21 changes: 21 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,24 @@
<a name="5.7.0"></a>
# [5.7.0](https://github.com/valor-software/ngx-bootstrap/compare/v5.6.2...v5.7.0) (2020-06-30)


### Bug Fixes

* **common:** fix next ver issue with moduleWithProviders ([#5812](https://github.com/valor-software/ngx-bootstrap/issues/5812)) ([e2ef559](https://github.com/valor-software/ngx-bootstrap/commit/e2ef559))
* **datepicker:** double tap ios issue ([#5821](https://github.com/valor-software/ngx-bootstrap/issues/5821)) ([955cb93](https://github.com/valor-software/ngx-bootstrap/commit/955cb93))
* **datepicker:** issue [#5790](https://github.com/valor-software/ngx-bootstrap/issues/5790) and [#5793](https://github.com/valor-software/ngx-bootstrap/issues/5793) ([#5817](https://github.com/valor-software/ngx-bootstrap/issues/5817)) ([1dc5308](https://github.com/valor-software/ngx-bootstrap/commit/1dc5308))
* **modal:** Close modal on back button click ([735c197](https://github.com/valor-software/ngx-bootstrap/commit/735c197))
* **typeahead:** fix error on blur after init ([ceeed10](https://github.com/valor-software/ngx-bootstrap/commit/ceeed10)), closes [#5736](https://github.com/valor-software/ngx-bootstrap/issues/5736)
* **typeahead:** fix typo to cancel request on focus lost ([#5593](https://github.com/valor-software/ngx-bootstrap/issues/5593)), ([#4622](https://github.com/valor-software/ngx-bootstrap/issues/4622)), ([#1884](https://github.com/valor-software/ngx-bootstrap/issues/1884)) ([29a44e0](https://github.com/valor-software/ngx-bootstrap/commit/29a44e0))


### Features

* **datepicker:** Add optional "today" button ([#5786](https://github.com/valor-software/ngx-bootstrap/issues/5786)) ([41e7a0b](https://github.com/valor-software/ngx-bootstrap/commit/41e7a0b))
* **modal:** add ability to inject default modal options ([#4222](https://github.com/valor-software/ngx-bootstrap/issues/4222)) ([2c1b2bd](https://github.com/valor-software/ngx-bootstrap/commit/2c1b2bd))



<a name="5.6.2"></a>
## [5.6.2](https://github.com/valor-software/ngx-bootstrap/compare/v5.6.1...v5.6.2) (2020-04-10)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ import { DemoDatePickerQuickSelectRangesComponent } from './demos/quick-select-r
import { DemoDateRangePickerShowPreviousMonth } from './demos/daterangepicker-show-previous-month/show-previous-month';
import { DemoDatePickerSelectWeekRangeComponent } from './demos/select-week-range/select-week-range';
import { DemoDateRangePickerDisplayOneMonth } from './demos/daterangepicker-display-one-month/display-one-month';
import { DemoDatepickerTodayButtonComponent } from './demos/today-button/today-button';


export const demoComponentContent: ContentSection[] = [
Expand Down Expand Up @@ -406,6 +407,14 @@ export const demoComponentContent: ContentSection[] = [
description: `<p>Pick previous & current month instead of current & next month.When daterange selected and related to current month,
daterangepicker will works by default, with current & next month</p>`,
outlet: DemoDateRangePickerShowPreviousMonth
},
{
title: 'Show Today Button',
anchor: 'datepicker-show-today-button',
component: require('!!raw-loader!./demos/today-button/today-button.ts'),
html: require('!!raw-loader!./demos/today-button/today-button.html'),
description: `<p>Display an optional 'Today' button that will automatically select today's date.</p>`,
outlet: DemoDatepickerTodayButtonComponent
}
]
},
Expand Down
4 changes: 3 additions & 1 deletion demo/src/app/components/+datepicker/demos/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ import { DemoDatePickerVisibilityEventsComponent } from './visibility-events/vis
import { DemoDatePickerQuickSelectRangesComponent } from './quick-select-ranges/quick-select-ranges';
import { DemoDateRangePickerShowPreviousMonth } from './daterangepicker-show-previous-month/show-previous-month';
import { DemoDateRangePickerDisplayOneMonth } from './daterangepicker-display-one-month/display-one-month';
import { DemoDatepickerTodayButtonComponent } from './today-button/today-button';


export const DEMO_COMPONENTS = [
Expand Down Expand Up @@ -76,5 +77,6 @@ export const DEMO_COMPONENTS = [
DemoDateRangePickerShowPreviousMonth,
DemoDateRangePickerDisplayOneMonth,
DemoDatePickerVisibilityEventsComponent,
DemoDatePickerQuickSelectRangesComponent
DemoDatePickerQuickSelectRangesComponent,
DemoDatepickerTodayButtonComponent
];
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<div class="row">
<div class="col-xs-12 col-12 col-md-4 form-group">
<input type="text"
placeholder="Datepicker"
class="form-control"
bsDatepicker
[bsConfig]="{ showTodayButton: true, todayPosition: 'center' }">
</div>
</div>
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import { Component } from '@angular/core';

@Component({
selector: 'demo-datepicker-today-button',
templateUrl: './today-button.html'
})
export class DemoDatepickerTodayButtonComponent {}
30 changes: 27 additions & 3 deletions demo/src/ng-api-doc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -537,7 +537,7 @@ export const ngdoc: any = {
"properties": [
{
"name": "_a",
"type": "DateArray",
"type": "number[]",
"description": "<p>DateArray [year, month, date, .....]</p>\n"
},
{
Expand Down Expand Up @@ -613,7 +613,7 @@ export const ngdoc: any = {
{
"name": "_w",
"type": "WeekParsing",
"description": "<p>week</p>\n"
"description": "<p>date specific info\nweek</p>\n"
}
]
},
Expand Down Expand Up @@ -1093,6 +1093,18 @@ export const ngdoc: any = {
"type": "boolean",
"description": "<p>Shows previous and current month, instead of current and next (dateRangePicker only)</p>\n"
},
{
"name": "showTodayButton",
"defaultValue": "false",
"type": "boolean",
"description": "<p>Shows &#39;today&#39; button</p>\n"
},
{
"name": "todayPosition",
"defaultValue": "center",
"type": "string",
"description": "<p>Positioning for &#39;today&#39; button</p>\n"
},
{
"name": "showWeekNumbers",
"defaultValue": "true",
Expand Down Expand Up @@ -2352,6 +2364,12 @@ export const ngdoc: any = {
}
],
"returnType": "BsModalRef"
},
{
"name": "checkScrollbar",
"description": "<p>Checks if the body is overflowing and sets scrollbar width</p>\n",
"args": [],
"returnType": "void"
}
],
"properties": []
Expand Down Expand Up @@ -2512,6 +2530,12 @@ export const ngdoc: any = {
"description": "<p>Events tricks</p>\n",
"args": [],
"returnType": "void"
},
{
"name": "checkScrollbar",
"description": "<p>Scroll bar tricks</p>\n",
"args": [],
"returnType": "void"
}
]
},
Expand Down Expand Up @@ -4215,7 +4239,7 @@ export const ngdoc: any = {
{
"name": "activeDescendant",
"type": "string",
"description": "<p>if false don&#39;t focus the input element the typeahead directive is associated with on selection</p>\n"
"description": "<p>if false restrict model values to the ones selected from the popup only will be provided\nif false the first match automatically will not be focused as you type\nformat the ng-model result after selection\nif true automatically select an item when there is one option that exactly matches the user input\nif true select the currently highlighted match on blur\nif false don&#39;t focus the input element the typeahead directive is associated with on selection</p>\n"
}
],
"methods": []
Expand Down
Loading

0 comments on commit cd2055d

Please sign in to comment.