Skip to content

Commit

Permalink
Prepare 1.6.0 release
Browse files Browse the repository at this point in the history
  • Loading branch information
acrobat committed Feb 1, 2016
1 parent decf9ce commit 4a28c83
Show file tree
Hide file tree
Showing 13 changed files with 30 additions and 21 deletions.
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.

24 changes: 16 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.6.0-alpha (https://github.com/eternicode/bootstrap-datepicker)
* Datepicker for Bootstrap v1.6.0 (https://github.com/eternicode/bootstrap-datepicker)
*
* Copyright 2012 Stefan Petre
* Improvements by Andrew Rowls
Expand Down Expand Up @@ -1087,12 +1087,20 @@
if (this.o.beforeShowMonth !== $.noop){
var that = this;
$.each(months, function(i, month){
if (!$(month).hasClass('disabled')) {
var moDate = new Date(year, i, 1);
var before = that.o.beforeShowMonth(moDate);
if (before === false)
$(month).addClass('disabled');
}
var moDate = new Date(year, i, 1);
var before = that.o.beforeShowMonth(moDate);
if (before === undefined)
before = {};
else if (typeof(before) === 'boolean')
before = {enabled: before};
else if (typeof(before) === 'string')
before = {classes: before};
if (before.enabled === false && !$(month).hasClass('disabled'))
$(month).addClass('disabled');
if (before.classes)
$(month).addClass(before.classes);
if (before.tooltip)
$(month).prop('title', before.tooltip);
});
}

Expand Down Expand Up @@ -2093,7 +2101,7 @@

/* DATEPICKER VERSION
* =================== */
$.fn.datepicker.version = '1.6.0-alpha';
$.fn.datepicker.version = '1.6.0';

/* DATEPICKER DATA-API
* ================== */
Expand Down
6 changes: 3 additions & 3 deletions dist/js/bootstrap-datepicker.min.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions dist/locales/bootstrap-datepicker.en-AU.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 js/bootstrap-datepicker.js
Original file line number Diff line number Diff line change
Expand Up @@ -2117,7 +2117,7 @@

/* DATEPICKER VERSION
* =================== */
$.fn.datepicker.version = '1.6.0-alpha';
$.fn.datepicker.version = '1.6.0';

/* DATEPICKER DATA-API
* ================== */
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "bootstrap-datepicker",
"description": "A datepicker for Bootstrap forked from Stefan Petre's (of eyecon.ro), improvements by eternicode",
"version": "1.6.0-alpha",
"version": "1.6.0",
"license": "Apache-2.0",
"keywords": [
"datepicker",
Expand Down

0 comments on commit 4a28c83

Please sign in to comment.