Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ Repository changes:
* Changed the js file header to point at repo/demo/docs urls instead of eyecon.ro
* The css files are now the output of the standalone build scripts instead of `build/build.less` etc.
* `composer.json` now supports component-installer
* Added [JSHint](http://www.jshint.com/docs/) and [JSCS](https://github.com/mdevils/node-jscs) configurations
* Added [JSHint](https://www.jshint.com/docs/) and [JSCS](https://github.com/mdevils/node-jscs) configurations


1.2.0
Expand Down
2 changes: 1 addition & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ module.exports = function(grunt){
'/*!',
' * Datepicker for Bootstrap v<%= pkg.version %> (<%= pkg.homepage %>)',
' *',
' * Licensed under the Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0)',
' * Licensed under the Apache License v2.0 (https://www.apache.org/licenses/LICENSE-2.0)',
' */'
].join('\n') + '\n',

Expand Down
4 changes: 2 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
https://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

Expand Down Expand Up @@ -193,7 +193,7 @@
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0
https://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
[![npm](https://img.shields.io/npm/dt/bootstrap-datepicker.svg)](https://github.com/uxsolutions/bootstrap-datepicker)
[![Twitter Follow](https://img.shields.io/twitter/follow/bsdatepicker.svg?style=social&label=Follow)](https://twitter.com/bsdatepicker)

Versions are incremented according to [semver](http://semver.org/).
Versions are incremented according to [semver](https://semver.org/).

## CDN

Expand Down
2 changes: 1 addition & 1 deletion docs/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Documentation
=============

Project documentation is built using [Sphinx docs](http://sphinx-doc.org/), which uses [ReST](http://docutils.sourceforge.net/rst.html) for markup. This allows the docs to cover a vast amount of topics without using a thousand-line README file.
Project documentation is built using [Sphinx docs](https://www.sphinx-doc.org/), which uses [reST](http://docutils.sourceforge.net/rst.html) for markup. This allows the docs to cover a vast amount of topics without using a thousand-line README file.

Sphinx docs is pip-installable via `pip install sphinx`. Once installed, open a command line in the docs folder and run the following commands:

Expand Down
2 changes: 1 addition & 1 deletion docs/_screenshots/assets/common.js
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
document.write("<script src='https://code.jquery.com/jquery-3.1.1.slim.js'></script>");
document.write("<script src='../../node_modules/jquery/dist/jquery.slim.js'></script>");
document.write("<script src='../../js/bootstrap-datepicker.js'></script>");
8 changes: 6 additions & 2 deletions docs/_screenshots/option_todayhighlight.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
const NativeDate = window.Date;
const date = function date(y,m,d,h,i,s,j){
switch(arguments.length){
case 0: return date.now ? new NativeDate(date.now) : new NativeDate();
case 0: return new NativeDate(date.now());
case 1: return new NativeDate(y);
case 2: return new NativeDate(y,m);
case 3: return new NativeDate(y,m,d);
Expand All @@ -18,6 +18,7 @@
case 7: return new NativeDate(y,y,m,d,h,i,s,j);
}
};
date.now = NativeDate.now;
date.UTC = NativeDate.UTC;
return function() {
Array.prototype.push.call(arguments, date);
Expand All @@ -28,7 +29,10 @@
}
document.addEventListener('DOMContentLoaded', function() {
patch_date(function(Date){
Date.now = new Date(2013, 2, 18);
Date.now = () => {
return new Date(2013, 2, 18).getTime();
};

$('input').datepicker({
todayHighlight: true
}).datepicker('show');
Expand Down
Binary file modified docs/_static/screenshots/demo_head.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/_static/screenshots/markup_component.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/_static/screenshots/markup_daterange.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/_static/screenshots/markup_inline.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/_static/screenshots/markup_input.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/_static/screenshots/option_calendarweeks.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/_static/screenshots/option_clearbtn.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/_static/screenshots/option_daysofweekdisabled.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/_static/screenshots/option_enddate.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/_static/screenshots/option_language.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/_static/screenshots/option_multidate.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/_static/screenshots/option_showweekdays.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/_static/screenshots/option_startdate.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/_static/screenshots/option_todaybtn.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/_static/screenshots/option_todayhighlight.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/_static/screenshots/option_weekstart.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 1 addition & 4 deletions docs/screenshots.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,12 @@ const puppeteer = require('puppeteer');

(async () => {
const browser = await puppeteer.launch({
headless: false,
args: [
'--no-sandbox',
'--disable-gpu',
'--disable-translate',
'--disable-extensions',
'--hide-scrollbars'
],
slowMo: 100
]
});

const page = await browser.newPage();
Expand Down
4 changes: 2 additions & 2 deletions js/bootstrap-datepicker.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
/* =========================================================
* bootstrap-datepicker.js
* Repo: https://github.com/uxsolutions/bootstrap-datepicker/
* Demo: https://eternicode.github.io/bootstrap-datepicker/
* Demo: https://uxsolutions.github.io/bootstrap-datepicker/
* Docs: https://bootstrap-datepicker.readthedocs.org/
* =========================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
Expand Down
2 changes: 1 addition & 1 deletion js/locales/bootstrap-datepicker.da.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* Danish translation for bootstrap-datepicker
* Christian Pedersen <http://github.com/chripede>
* Christian Pedersen <https://github.com/chripede>
* Ivan Mylyanyk <https://github.com/imylyanyk>
*/
;(function($){
Expand Down
2 changes: 1 addition & 1 deletion js/locales/bootstrap-datepicker.fo.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* Faroese translation for bootstrap-datepicker
* Theodor Johannesen <http://github.com/theodorjohannesen>
* Theodor Johannesen <https://github.com/theodorjohannesen>
*/
;(function($){
$.fn.datepicker.dates['fo'] = {
Expand Down
2 changes: 1 addition & 1 deletion js/locales/bootstrap-datepicker.kr.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* Korean translation for bootstrap-datepicker
* Gu Youn <http://github.com/guyoun>
* Gu Youn <https://github.com/guyoun>
*
* DEPRECATED: This language code 'kr' is deprecated and will be removed in 2.0.
* Korean support is now in a 'ko' translation file to follow the ISO language
Expand Down
3 changes: 1 addition & 2 deletions js/locales/bootstrap-datepicker.sq.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* Albanian translation for bootstrap-datepicker
* Tomor Pupovci <http://www.github.com/ttomor>
* Tomor Pupovci <https://www.github.com/ttomor>
*/
;(function($){
$.fn.datepicker.dates['sq'] = {
Expand All @@ -16,4 +16,3 @@
clear: "Pastro"
};
}(jQuery));

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"grunt-jscs": "^3.0.1",
"grunt-string-replace": "^1.3.1",
"load-grunt-tasks": "^3.5.2",
"puppeteer": "1.17.0",
"puppeteer": "1.18.1",
"time-grunt": "^1.4.0"
}
}