Skip to content

Commit fb8776d

Browse files
authored
Merge pull request #2485 from vsn4ik/prepare-v1.9
Bump v1.9.0
2 parents 5122dea + fae655f commit fb8776d

20 files changed

+1435
-498
lines changed

.travis.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
sudo: false
2-
31
language: node_js
42

53
node_js:
6-
- "10"
4+
- "12"
75

86
before_script:
97
- npm install -g grunt-cli

CHANGELOG.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,24 @@
11
Changelog
22
=========
33

4+
1.9.0
5+
-----
6+
7+
## Features
8+
* Added clearDates for clears range (#2114)
9+
10+
## Bugfix
11+
* Hide today button when before start or after end date (#2474)
12+
* Fix navigation buttons states (#2277)
13+
* Fix updateNavArrows bug (#2230)
14+
15+
## Locales
16+
### Bugfix
17+
* Added monthsTitle to Latvian locale (#2255)
18+
* Rename en-CA locale file to match the rest of the files (#2217)
19+
* Fix cs locale date format (#2275)
20+
* Added translation for months (fixing the default 'en' locale) (#2271)
21+
422
1.7.1
523
-----
624

dist/css/bootstrap-datepicker.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/bootstrap-datepicker.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/bootstrap-datepicker.standalone.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/bootstrap-datepicker.standalone.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/bootstrap-datepicker3.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/bootstrap-datepicker3.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/bootstrap-datepicker3.standalone.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/bootstrap-datepicker3.standalone.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/js/bootstrap-datepicker.js

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Datepicker for Bootstrap v1.8.0 (https://github.com/uxsolutions/bootstrap-datepicker)
2+
* Datepicker for Bootstrap v1.9.0 (https://github.com/uxsolutions/bootstrap-datepicker)
33
*
44
* Licensed under the Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0)
55
*/
@@ -89,6 +89,10 @@
8989

9090
var Datepicker = function(element, options){
9191
$.data(element, 'datepicker', this);
92+
93+
this._events = [];
94+
this._secondaryEvents = [];
95+
9296
this._process_options(options);
9397

9498
this.dates = new DateArray();
@@ -98,7 +102,7 @@
98102
this.element = $(element);
99103
this.isInput = this.element.is('input');
100104
this.inputField = this.isInput ? this.element : this.element.find('input');
101-
this.component = this.element.hasClass('date') ? this.element.find('.add-on, .input-group-addon, .btn') : false;
105+
this.component = this.element.hasClass('date') ? this.element.find('.add-on, .input-group-addon, .input-group-append, .input-group-prepend, .btn') : false;
102106
if (this.component && this.component.length === 0)
103107
this.component = false;
104108
this.isInline = !this.component && this.element.is('div');
@@ -308,8 +312,6 @@
308312
o.defaultViewDate = UTCToday();
309313
}
310314
},
311-
_events: [],
312-
_secondaryEvents: [],
313315
_applyEvents: function(evs){
314316
for (var i=0, el, ch, ev; i < evs.length; i++){
315317
el = evs[i][0];
@@ -465,7 +467,7 @@
465467
},
466468

467469
show: function(){
468-
if (this.inputField.prop('disabled') || (this.inputField.prop('readonly') && this.o.enableOnReadonly === false))
470+
if (this.inputField.is(':disabled') || (this.inputField.prop('readonly') && this.o.enableOnReadonly === false))
469471
return;
470472
if (!this.isInline)
471473
this.picker.appendTo(this.o.container);
@@ -962,7 +964,9 @@
962964
endMonth = this.o.endDate !== Infinity ? this.o.endDate.getUTCMonth() : Infinity,
963965
todaytxt = dates[this.o.language].today || dates['en'].today || '',
964966
cleartxt = dates[this.o.language].clear || dates['en'].clear || '',
965-
titleFormat = dates[this.o.language].titleFormat || dates['en'].titleFormat,
967+
titleFormat = dates[this.o.language].titleFormat || dates['en'].titleFormat,
968+
todayDate = UTCToday(),
969+
titleBtnVisible = (this.o.todayBtn === true || this.o.todayBtn === 'linked') && todayDate >= this.o.startDate && todayDate <= this.o.endDate && !this.weekOfDateIsDisabled(todayDate),
966970
tooltip,
967971
before;
968972
if (isNaN(year) || isNaN(month))
@@ -971,7 +975,7 @@
971975
.text(DPGlobal.formatDate(d, titleFormat, this.o.language));
972976
this.picker.find('tfoot .today')
973977
.text(todaytxt)
974-
.css('display', this.o.todayBtn === true || this.o.todayBtn === 'linked' ? 'table-cell' : 'none');
978+
.css('display', titleBtnVisible ? 'table-cell' : 'none');
975979
this.picker.find('tfoot .clear')
976980
.text(cleartxt)
977981
.css('display', this.o.clearBtn === true ? 'table-cell' : 'none');
@@ -2003,7 +2007,7 @@
20032007

20042008
/* DATEPICKER VERSION
20052009
* =================== */
2006-
$.fn.datepicker.version = '1.8.0';
2010+
$.fn.datepicker.version = '1.9.0';
20072011

20082012
$.fn.datepicker.deprecated = function(msg){
20092013
var console = window.console;

dist/js/bootstrap-datepicker.min.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/locales/bootstrap-datepicker.az.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/locales/bootstrap-datepicker.bm.min.js

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/locales/bootstrap-datepicker.no.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/locales/bootstrap-datepicker.sq.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/locales/bootstrap-datepicker.zh-CN.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/bootstrap-datepicker.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,10 @@
102102

103103
var Datepicker = function(element, options){
104104
$.data(element, 'datepicker', this);
105-
105+
106106
this._events = [];
107107
this._secondaryEvents = [];
108-
108+
109109
this._process_options(options);
110110

111111
this.dates = new DateArray();
@@ -2020,7 +2020,7 @@
20202020

20212021
/* DATEPICKER VERSION
20222022
* =================== */
2023-
$.fn.datepicker.version = '1.8.0';
2023+
$.fn.datepicker.version = '1.9.0';
20242024

20252025
$.fn.datepicker.deprecated = function(msg){
20262026
var console = window.console;

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "bootstrap-datepicker",
33
"description": "A datepicker for Bootstrap",
4-
"version": "1.8.0",
4+
"version": "1.9.0",
55
"license": "Apache-2.0",
66
"keywords": [
77
"datepicker",
@@ -28,10 +28,10 @@
2828
"jquery": ">=1.7.1 <4.0.0"
2929
},
3030
"devDependencies": {
31-
"grunt": "^1.0.1",
31+
"grunt": "^1.0.4",
3232
"grunt-banner": "~0.6.0",
3333
"grunt-contrib-clean": "^1.0.0",
34-
"grunt-contrib-compress": "^1.4.1",
34+
"grunt-contrib-compress": "^1.5.0",
3535
"grunt-contrib-concat": "^1.0.1",
3636
"grunt-contrib-csslint": "^2.0.0",
3737
"grunt-contrib-cssmin": "^1.0.2",

0 commit comments

Comments
 (0)