Skip to content

Commit

Permalink
update docs and core
Browse files Browse the repository at this point in the history
  • Loading branch information
Eonasdan committed Dec 21, 2017
1 parent fe355ad commit fb2e58d
Show file tree
Hide file tree
Showing 26 changed files with 328 additions and 291 deletions.
115 changes: 58 additions & 57 deletions build/js/tempusdominus-bootstrap-4.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*@preserve
* Tempus Dominus Bootstrap4 v5.0.0-alpha10 (https://tempusdominus.github.io/bootstrap-4/)
* Tempus Dominus Bootstrap4 v5.0.0-alpha11 (https://tempusdominus.github.io/bootstrap-4/)
* Copyright 2016-2017 Jonathan Peterson
* Licensed under MIT (https://github.com/tempusdominus/bootstrap-3/blob/master/LICENSE)
*/
Expand Down Expand Up @@ -41,7 +41,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
var DateTimePicker = function ($, moment) {
// ReSharper disable InconsistentNaming
var NAME = 'datetimepicker',
VERSION = '5.0.0-alpha7',
VERSION = '5.0.0-alpha11',
DATA_KEY = '' + NAME,
EVENT_KEY = '.' + DATA_KEY,
EMIT_EVENT_KEY = DATA_KEY + '.',
Expand All @@ -65,6 +65,58 @@ var DateTimePicker = function ($, moment) {
HIDE: EMIT_EVENT_KEY + 'hide',
SHOW: EMIT_EVENT_KEY + 'show'
},
DatePickerModes = [{
CLASS_NAME: 'days',
NAV_FUNCTION: 'M',
NAV_STEP: 1
}, {
CLASS_NAME: 'months',
NAV_FUNCTION: 'y',
NAV_STEP: 1
}, {
CLASS_NAME: 'years',
NAV_FUNCTION: 'y',
NAV_STEP: 10
}, {
CLASS_NAME: 'decades',
NAV_FUNCTION: 'y',
NAV_STEP: 100
}],
KeyMap = {
'up': 38,
38: 'up',
'down': 40,
40: 'down',
'left': 37,
37: 'left',
'right': 39,
39: 'right',
'tab': 9,
9: 'tab',
'escape': 27,
27: 'escape',
'enter': 13,
13: 'enter',
'pageUp': 33,
33: 'pageUp',
'pageDown': 34,
34: 'pageDown',
'shift': 16,
16: 'shift',
'control': 17,
17: 'control',
'space': 32,
32: 'space',
't': 84,
84: 't',
'delete': 46,
46: 'delete'
},
ViewModes = ['times', 'days', 'months', 'years', 'decades'],
keyState = {},
keyPressHandled = {};

var MinViewModeNumber = 0,
Default = {
timeZone: '',
format: false,
Expand Down Expand Up @@ -269,59 +321,8 @@ var DateTimePicker = function ($, moment) {
viewDate: false,
allowMultidate: false,
multidateSeparator: ','
},
DatePickerModes = [{
CLASS_NAME: 'days',
NAV_FUNCTION: 'M',
NAV_STEP: 1
}, {
CLASS_NAME: 'months',
NAV_FUNCTION: 'y',
NAV_STEP: 1
}, {
CLASS_NAME: 'years',
NAV_FUNCTION: 'y',
NAV_STEP: 10
}, {
CLASS_NAME: 'decades',
NAV_FUNCTION: 'y',
NAV_STEP: 100
}],
KeyMap = {
'up': 38,
38: 'up',
'down': 40,
40: 'down',
'left': 37,
37: 'left',
'right': 39,
39: 'right',
'tab': 9,
9: 'tab',
'escape': 27,
27: 'escape',
'enter': 13,
13: 'enter',
'pageUp': 33,
33: 'pageUp',
'pageDown': 34,
34: 'pageDown',
'shift': 16,
16: 'shift',
'control': 17,
17: 'control',
'space': 32,
32: 'space',
't': 84,
84: 't',
'delete': 46,
46: 'delete'
},
ViewModes = ['times', 'days', 'months', 'years', 'decades'],
keyState = {},
keyPressHandled = {};
};

var MinViewModeNumber = 0;
// ReSharper restore InconsistentNaming

// ReSharper disable once DeclarationHides
Expand Down Expand Up @@ -850,9 +851,6 @@ var DateTimePicker = function ($, moment) {
};

DateTimePicker.prototype.format = function format(newFormat) {
///<summary>test su</summary>
///<param name="newFormat">info about para</param>
///<returns type="string|boolean">returns foo</returns>
if (arguments.length === 0) {
return this._options.format;
}
Expand Down Expand Up @@ -1572,6 +1570,9 @@ var DateTimePicker = function ($, moment) {
key: 'Default',
get: function get() {
return Default;
},
set: function set(value) {
Default = value;
}
}, {
key: 'ClassName',
Expand Down
4 changes: 2 additions & 2 deletions build/js/tempusdominus-bootstrap-4.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion component.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "tempusdominus-bootstrap-4",
"version": "5.0.0-alpha10",
"version": "5.0.0-alpha12",
"main": "build/js/tempusdominus-bootstrap-4.min.js",
"scripts": [ "build/js/tempusdominus-bootstrap-4.min.js" ],
"styles": [ "build/css/tempusdominus-bootstrap-4.min.css" ],
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "tempusdominus/bootstrap-4",
"type": "component",
"version": "5.0.0-alpha10",
"version": "5.0.0-alpha12",
"description": "Date/time picker widget based on twitter bootstrap",
"keywords": [
"bootstrap",
Expand Down
3 changes: 1 addition & 2 deletions docs/404.html
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/moment-timezone/0.5.14/moment-timezone-with-data-2012-2022.min.js"></script>
<script>var base_url = '';</script>
<!--<script data-main="/mkdocs/js/search.js" src="/mkdocs/js/require.js"></script>-->
<script src="//cdnjs.cloudflare.com/ajax/libs/moment.js/2.17.0/moment-with-locales.js"></script>
<script src="/theme/js/base.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.9.0/highlight.min.js"></script>
<script src="/theme/js/tempusdominus-bootstrap-4.js"></script>
Expand All @@ -43,7 +42,7 @@
<body>

<header class="navbar navbar-expand navbar-dark flex-column flex-md-row bd-navbar">
<a class="navbar-brand" href=""><img src="/favicon-32x32.png" alt="home" /></a>
<a class="navbar-brand" href="https://tempusdominus.github.io/bootstrap-4/"><img src="https://tempusdominus.github.io/bootstrap-4/favicon-32x32.png" alt="home" /></a>

<div class="navbar-nav-scroll">
<ul class="navbar-nav bd-navbar-nav flex-row">
Expand Down
4 changes: 2 additions & 2 deletions docs/Changelog/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/moment-timezone/0.5.14/moment-timezone-with-data-2012-2022.min.js"></script>
<script>var base_url = '..';</script>
<!--<script data-main="../mkdocs/js/search.js" src="../mkdocs/js/require.js"></script>-->
<script src="//cdnjs.cloudflare.com/ajax/libs/moment.js/2.17.0/moment-with-locales.js"></script>
<script src="../theme/js/base.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.9.0/highlight.min.js"></script>
<script src="../theme/js/tempusdominus-bootstrap-4.js"></script>
Expand All @@ -43,7 +42,7 @@
<body>

<header class="navbar navbar-expand navbar-dark flex-column flex-md-row bd-navbar">
<a class="navbar-brand" href=""><img src="/favicon-32x32.png" alt="home" /></a>
<a class="navbar-brand" href="https://tempusdominus.github.io/bootstrap-4/"><img src="https://tempusdominus.github.io/bootstrap-4/favicon-32x32.png" alt="home" /></a>

<div class="navbar-nav-scroll">
<ul class="navbar-nav bd-navbar-nav flex-row">
Expand Down Expand Up @@ -146,6 +145,7 @@ <h3 id="new-features">New Features</h3>
<li>Added a jquery no conflict option</li>
<li>Removed LESS files. Bootstrap 4 doesn't use LESS any more. Now using SASS to build CSS</li>
<li>Picker will also look for window.debug and will keep the picker from closing</li>
<li>Added support for setting global defaults</li>
</ul>
<h3 id="other-changes">Other changes</h3>
<ul>
Expand Down
3 changes: 1 addition & 2 deletions docs/ContributorsGuide/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/moment-timezone/0.5.14/moment-timezone-with-data-2012-2022.min.js"></script>
<script>var base_url = '..';</script>
<!--<script data-main="../mkdocs/js/search.js" src="../mkdocs/js/require.js"></script>-->
<script src="//cdnjs.cloudflare.com/ajax/libs/moment.js/2.17.0/moment-with-locales.js"></script>
<script src="../theme/js/base.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.9.0/highlight.min.js"></script>
<script src="../theme/js/tempusdominus-bootstrap-4.js"></script>
Expand All @@ -43,7 +42,7 @@
<body>

<header class="navbar navbar-expand navbar-dark flex-column flex-md-row bd-navbar">
<a class="navbar-brand" href=""><img src="/favicon-32x32.png" alt="home" /></a>
<a class="navbar-brand" href="https://tempusdominus.github.io/bootstrap-4/"><img src="https://tempusdominus.github.io/bootstrap-4/favicon-32x32.png" alt="home" /></a>

<div class="navbar-nav-scroll">
<ul class="navbar-nav bd-navbar-nav flex-row">
Expand Down
3 changes: 1 addition & 2 deletions docs/Events/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/moment-timezone/0.5.14/moment-timezone-with-data-2012-2022.min.js"></script>
<script>var base_url = '..';</script>
<!--<script data-main="../mkdocs/js/search.js" src="../mkdocs/js/require.js"></script>-->
<script src="//cdnjs.cloudflare.com/ajax/libs/moment.js/2.17.0/moment-with-locales.js"></script>
<script src="../theme/js/base.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.9.0/highlight.min.js"></script>
<script src="../theme/js/tempusdominus-bootstrap-4.js"></script>
Expand All @@ -43,7 +42,7 @@
<body>

<header class="navbar navbar-expand navbar-dark flex-column flex-md-row bd-navbar">
<a class="navbar-brand" href=""><img src="/favicon-32x32.png" alt="home" /></a>
<a class="navbar-brand" href="https://tempusdominus.github.io/bootstrap-4/"><img src="https://tempusdominus.github.io/bootstrap-4/favicon-32x32.png" alt="home" /></a>

<div class="navbar-nav-scroll">
<ul class="navbar-nav bd-navbar-nav flex-row">
Expand Down
3 changes: 1 addition & 2 deletions docs/Extras/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/moment-timezone/0.5.14/moment-timezone-with-data-2012-2022.min.js"></script>
<script>var base_url = '..';</script>
<!--<script data-main="../mkdocs/js/search.js" src="../mkdocs/js/require.js"></script>-->
<script src="//cdnjs.cloudflare.com/ajax/libs/moment.js/2.17.0/moment-with-locales.js"></script>
<script src="../theme/js/base.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.9.0/highlight.min.js"></script>
<script src="../theme/js/tempusdominus-bootstrap-4.js"></script>
Expand All @@ -43,7 +42,7 @@
<body>

<header class="navbar navbar-expand navbar-dark flex-column flex-md-row bd-navbar">
<a class="navbar-brand" href=""><img src="/favicon-32x32.png" alt="home" /></a>
<a class="navbar-brand" href="https://tempusdominus.github.io/bootstrap-4/"><img src="https://tempusdominus.github.io/bootstrap-4/favicon-32x32.png" alt="home" /></a>

<div class="navbar-nav-scroll">
<ul class="navbar-nav bd-navbar-nav flex-row">
Expand Down
3 changes: 1 addition & 2 deletions docs/FAQ/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/moment-timezone/0.5.14/moment-timezone-with-data-2012-2022.min.js"></script>
<script>var base_url = '..';</script>
<!--<script data-main="../mkdocs/js/search.js" src="../mkdocs/js/require.js"></script>-->
<script src="//cdnjs.cloudflare.com/ajax/libs/moment.js/2.17.0/moment-with-locales.js"></script>
<script src="../theme/js/base.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.9.0/highlight.min.js"></script>
<script src="../theme/js/tempusdominus-bootstrap-4.js"></script>
Expand All @@ -43,7 +42,7 @@
<body>

<header class="navbar navbar-expand navbar-dark flex-column flex-md-row bd-navbar">
<a class="navbar-brand" href=""><img src="/favicon-32x32.png" alt="home" /></a>
<a class="navbar-brand" href="https://tempusdominus.github.io/bootstrap-4/"><img src="https://tempusdominus.github.io/bootstrap-4/favicon-32x32.png" alt="home" /></a>

<div class="navbar-nav-scroll">
<ul class="navbar-nav bd-navbar-nav flex-row">
Expand Down
3 changes: 1 addition & 2 deletions docs/Functions/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/moment-timezone/0.5.14/moment-timezone-with-data-2012-2022.min.js"></script>
<script>var base_url = '..';</script>
<!--<script data-main="../mkdocs/js/search.js" src="../mkdocs/js/require.js"></script>-->
<script src="//cdnjs.cloudflare.com/ajax/libs/moment.js/2.17.0/moment-with-locales.js"></script>
<script src="../theme/js/base.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.9.0/highlight.min.js"></script>
<script src="../theme/js/tempusdominus-bootstrap-4.js"></script>
Expand All @@ -43,7 +42,7 @@
<body>

<header class="navbar navbar-expand navbar-dark flex-column flex-md-row bd-navbar">
<a class="navbar-brand" href=""><img src="/favicon-32x32.png" alt="home" /></a>
<a class="navbar-brand" href="https://tempusdominus.github.io/bootstrap-4/"><img src="https://tempusdominus.github.io/bootstrap-4/favicon-32x32.png" alt="home" /></a>

<div class="navbar-nav-scroll">
<ul class="navbar-nav bd-navbar-nav flex-row">
Expand Down
3 changes: 1 addition & 2 deletions docs/Installing/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/moment-timezone/0.5.14/moment-timezone-with-data-2012-2022.min.js"></script>
<script>var base_url = '..';</script>
<!--<script data-main="../mkdocs/js/search.js" src="../mkdocs/js/require.js"></script>-->
<script src="//cdnjs.cloudflare.com/ajax/libs/moment.js/2.17.0/moment-with-locales.js"></script>
<script src="../theme/js/base.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.9.0/highlight.min.js"></script>
<script src="../theme/js/tempusdominus-bootstrap-4.js"></script>
Expand All @@ -43,7 +42,7 @@
<body>

<header class="navbar navbar-expand navbar-dark flex-column flex-md-row bd-navbar">
<a class="navbar-brand" href=""><img src="/favicon-32x32.png" alt="home" /></a>
<a class="navbar-brand" href="https://tempusdominus.github.io/bootstrap-4/"><img src="https://tempusdominus.github.io/bootstrap-4/favicon-32x32.png" alt="home" /></a>

<div class="navbar-nav-scroll">
<ul class="navbar-nav bd-navbar-nav flex-row">
Expand Down
40 changes: 29 additions & 11 deletions docs/Options/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/moment-timezone/0.5.14/moment-timezone-with-data-2012-2022.min.js"></script>
<script>var base_url = '..';</script>
<!--<script data-main="../mkdocs/js/search.js" src="../mkdocs/js/require.js"></script>-->
<script src="//cdnjs.cloudflare.com/ajax/libs/moment.js/2.17.0/moment-with-locales.js"></script>
<script src="../theme/js/base.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.9.0/highlight.min.js"></script>
<script src="../theme/js/tempusdominus-bootstrap-4.js"></script>
Expand All @@ -43,7 +42,7 @@
<body>

<header class="navbar navbar-expand navbar-dark flex-column flex-md-row bd-navbar">
<a class="navbar-brand" href=""><img src="/favicon-32x32.png" alt="home" /></a>
<a class="navbar-brand" href="https://tempusdominus.github.io/bootstrap-4/"><img src="https://tempusdominus.github.io/bootstrap-4/favicon-32x32.png" alt="home" /></a>

<div class="navbar-nav-scroll">
<ul class="navbar-nav bd-navbar-nav flex-row">
Expand Down Expand Up @@ -192,6 +191,25 @@ <h2 id="options">Options</h2>
To get option value use <code>$('#datetimepicker').datetimepicker('sideBySide')</code>
</div>

<p>Global defaults can be get/set by <code>$.fn.datetimepicker.Constructor.Default</code></p>
<p>e.g. To set icons to use Font Awesome 5</p>
<pre><code>$.fn.datetimepicker.Constructor.Default = $.extend({}, $.fn.datetimepicker.Constructor.Default, {
icons: {
time: 'far fa-clock',
date: 'far fa-calendar',
up: 'far fa-arrow-up',
down: 'far fa-arrow-down',
previous: 'far fa-chevron-left',
next: 'far fa-chevron-right',
today: 'far fa-calendar-check-o',
clear: 'far fa-trash',
close: 'far fa-times'
} });
</code></pre>

<p>Do this <strong>before</strong> you init pickers.</p>
<hr/>

<h3 id="options_1">options</h3>
<p>Returns the components current options object. Note that the changing the values of the returned object does not change the components actual configuration. Use <code>options(options)</code> to set the components options massively or the other methods for setting config options individually.</p>
<h3 id="options-options">options, [options]</h3>
Expand Down Expand Up @@ -374,15 +392,15 @@ <h4 id="enableddates-dates">enabledDates, [dates]</h4>
<hr />
<h3 id="icons">icons</h3>
<pre><code>Default: {
time: 'glyphicon glyphicon-time',
date: 'glyphicon glyphicon-calendar',
up: 'glyphicon glyphicon-chevron-up',
down: 'glyphicon glyphicon-chevron-down',
previous: 'glyphicon glyphicon-chevron-left',
next: 'glyphicon glyphicon-chevron-right',
today: 'glyphicon glyphicon-screenshot',
clear: 'glyphicon glyphicon-trash',
close: 'glyphicon glyphicon-remove'
time: 'fa fa-clock-o',
date: 'fa fa-calendar',
up: 'fa fa-arrow-up',
down: 'fa fa-arrow-down',
previous: 'fa fa-chevron-left',
next: 'fa fa-chevron-right',
today: 'fa fa-calendar-check-o',
clear: 'fa fa-delete',
close: 'fa fa-times'
}
Accepts: object with all or some of the parameters above
</code></pre>
Expand Down
Loading

0 comments on commit fb2e58d

Please sign in to comment.