Skip to content

Commit

Permalink
Merge pull request #2485 from vsn4ik/prepare-v1.9
Browse files Browse the repository at this point in the history
Bump v1.9.0
  • Loading branch information
acrobat committed May 20, 2019
2 parents 5122dea + fae655f commit fb8776d
Show file tree
Hide file tree
Showing 20 changed files with 1,435 additions and 498 deletions.
4 changes: 1 addition & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
sudo: false

language: node_js

node_js:
- "10"
- "12"

before_script:
- npm install -g grunt-cli
18 changes: 18 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,24 @@
Changelog
=========

1.9.0
-----

## Features
* Added clearDates for clears range (#2114)

## Bugfix
* Hide today button when before start or after end date (#2474)
* Fix navigation buttons states (#2277)
* Fix updateNavArrows bug (#2230)

## Locales
### Bugfix
* Added monthsTitle to Latvian locale (#2255)
* Rename en-CA locale file to match the rest of the files (#2217)
* Fix cs locale date format (#2275)
* Added translation for months (fixing the default 'en' locale) (#2271)

1.7.1
-----

Expand Down
2 changes: 1 addition & 1 deletion dist/css/bootstrap-datepicker.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/css/bootstrap-datepicker.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/css/bootstrap-datepicker.standalone.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/css/bootstrap-datepicker.standalone.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/css/bootstrap-datepicker3.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/css/bootstrap-datepicker3.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/css/bootstrap-datepicker3.standalone.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/css/bootstrap-datepicker3.standalone.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 12 additions & 8 deletions dist/js/bootstrap-datepicker.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Datepicker for Bootstrap v1.8.0 (https://github.com/uxsolutions/bootstrap-datepicker)
* Datepicker for Bootstrap v1.9.0 (https://github.com/uxsolutions/bootstrap-datepicker)
*
* Licensed under the Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0)
*/
Expand Down Expand Up @@ -89,6 +89,10 @@

var Datepicker = function(element, options){
$.data(element, 'datepicker', this);

this._events = [];
this._secondaryEvents = [];

this._process_options(options);

this.dates = new DateArray();
Expand All @@ -98,7 +102,7 @@
this.element = $(element);
this.isInput = this.element.is('input');
this.inputField = this.isInput ? this.element : this.element.find('input');
this.component = this.element.hasClass('date') ? this.element.find('.add-on, .input-group-addon, .btn') : false;
this.component = this.element.hasClass('date') ? this.element.find('.add-on, .input-group-addon, .input-group-append, .input-group-prepend, .btn') : false;
if (this.component && this.component.length === 0)
this.component = false;
this.isInline = !this.component && this.element.is('div');
Expand Down Expand Up @@ -308,8 +312,6 @@
o.defaultViewDate = UTCToday();
}
},
_events: [],
_secondaryEvents: [],
_applyEvents: function(evs){
for (var i=0, el, ch, ev; i < evs.length; i++){
el = evs[i][0];
Expand Down Expand Up @@ -465,7 +467,7 @@
},

show: function(){
if (this.inputField.prop('disabled') || (this.inputField.prop('readonly') && this.o.enableOnReadonly === false))
if (this.inputField.is(':disabled') || (this.inputField.prop('readonly') && this.o.enableOnReadonly === false))
return;
if (!this.isInline)
this.picker.appendTo(this.o.container);
Expand Down Expand Up @@ -962,7 +964,9 @@
endMonth = this.o.endDate !== Infinity ? this.o.endDate.getUTCMonth() : Infinity,
todaytxt = dates[this.o.language].today || dates['en'].today || '',
cleartxt = dates[this.o.language].clear || dates['en'].clear || '',
titleFormat = dates[this.o.language].titleFormat || dates['en'].titleFormat,
titleFormat = dates[this.o.language].titleFormat || dates['en'].titleFormat,
todayDate = UTCToday(),
titleBtnVisible = (this.o.todayBtn === true || this.o.todayBtn === 'linked') && todayDate >= this.o.startDate && todayDate <= this.o.endDate && !this.weekOfDateIsDisabled(todayDate),
tooltip,
before;
if (isNaN(year) || isNaN(month))
Expand All @@ -971,7 +975,7 @@
.text(DPGlobal.formatDate(d, titleFormat, this.o.language));
this.picker.find('tfoot .today')
.text(todaytxt)
.css('display', this.o.todayBtn === true || this.o.todayBtn === 'linked' ? 'table-cell' : 'none');
.css('display', titleBtnVisible ? 'table-cell' : 'none');
this.picker.find('tfoot .clear')
.text(cleartxt)
.css('display', this.o.clearBtn === true ? 'table-cell' : 'none');
Expand Down Expand Up @@ -2003,7 +2007,7 @@

/* DATEPICKER VERSION
* =================== */
$.fn.datepicker.version = '1.8.0';
$.fn.datepicker.version = '1.9.0';

$.fn.datepicker.deprecated = function(msg){
var console = window.console;
Expand Down
6 changes: 3 additions & 3 deletions dist/js/bootstrap-datepicker.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/locales/bootstrap-datepicker.az.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions dist/locales/bootstrap-datepicker.bm.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/locales/bootstrap-datepicker.no.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/locales/bootstrap-datepicker.sq.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/locales/bootstrap-datepicker.zh-CN.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions js/bootstrap-datepicker.js
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,10 @@

var Datepicker = function(element, options){
$.data(element, 'datepicker', this);

this._events = [];
this._secondaryEvents = [];

this._process_options(options);

this.dates = new DateArray();
Expand Down Expand Up @@ -2020,7 +2020,7 @@

/* DATEPICKER VERSION
* =================== */
$.fn.datepicker.version = '1.8.0';
$.fn.datepicker.version = '1.9.0';

$.fn.datepicker.deprecated = function(msg){
var console = window.console;
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "bootstrap-datepicker",
"description": "A datepicker for Bootstrap",
"version": "1.8.0",
"version": "1.9.0",
"license": "Apache-2.0",
"keywords": [
"datepicker",
Expand All @@ -28,10 +28,10 @@
"jquery": ">=1.7.1 <4.0.0"
},
"devDependencies": {
"grunt": "^1.0.1",
"grunt": "^1.0.4",
"grunt-banner": "~0.6.0",
"grunt-contrib-clean": "^1.0.0",
"grunt-contrib-compress": "^1.4.1",
"grunt-contrib-compress": "^1.5.0",
"grunt-contrib-concat": "^1.0.1",
"grunt-contrib-csslint": "^2.0.0",
"grunt-contrib-cssmin": "^1.0.2",
Expand Down

0 comments on commit fb8776d

Please sign in to comment.