Skip to content

Commit

Permalink
Reverted #2811
Browse files Browse the repository at this point in the history
Fixed #2850
Fixed #2855
  • Loading branch information
Eonasdan committed Oct 6, 2023
1 parent ebd995d commit 6182900
Show file tree
Hide file tree
Showing 13 changed files with 31 additions and 18 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/R6R53OEFF)

# Tempus Dominus Date/Time Picker v6.7.13
# Tempus Dominus Date/Time Picker v6.7.16

Tempus Dominus is a powerful and robust date time picker for javascript. Version 6 is another major rewrite over the previous version. V6 is written with modern browsers in mind and is written in typescript. Bootstrap, momentjs and jQuery are no longer required dependencies. Popper2 is all that is required for the picker to position correctly. If you still require jQuery (seriously, you should move off that asap) there's a jQuery provider that wraps the native js functions.

Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"name": "Jonathan Peterson"
},
"name": "@eonasdan/tempus-dominus",
"version": "6.7.13",
"version": "6.7.16",
"style": "dist/css/tempus-dominus.css",
"sass": "scss/tempus-dominus.scss",
"main": "dist/js/tempus-dominus.js",
Expand Down
2 changes: 1 addition & 1 deletion sonar-project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ sonar.organization=eonasdan
sonar.projectKey=Eonasdan_tempus-dominus

sonar.projectName=tempus-dominus
sonar.projectVersion=6.7.13
sonar.projectVersion=6.7.16

sonar.sources = src/
sonar.tests = test/
10 changes: 10 additions & 0 deletions src/docs/partials/change-log.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,16 @@
<div id='change-log'>
<h1>Version 6</h1>

<div class='row'>
<h2>6.7.16</h2>
<h3>Bug fixes</h3>
<ul>
<li>Reverted #2811</li>
<li>Fixed #2850</li>
<li>Fixed #2855</li>
</ul>
</div>

<div class='row'>
<h2>6.7.13</h2>
<h3>Bug fixes</h3>
Expand Down
4 changes: 2 additions & 2 deletions src/docs/partials/installing.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ <h2 id='cdn'>Via CDN</h2>
<code class='language-html'>&lt;!-- Popperjs --&gt;
&lt;script src=&quot;https://cdn.jsdelivr.net/npm/@popperjs/[email protected]/dist/umd/popper.min.js&quot; crossorigin=&quot;anonymous&quot;&gt;&lt;/script&gt;
&lt;!-- Tempus Dominus JavaScript --&gt;
&lt;script src=&quot;https://cdn.jsdelivr.net/npm/@eonasdan/[email protected].13/dist/js/tempus-dominus.min.js&quot; crossorigin=&quot;anonymous&quot;&gt;&lt;/script&gt;
&lt;script src=&quot;https://cdn.jsdelivr.net/npm/@eonasdan/[email protected].16/dist/js/tempus-dominus.min.js&quot; crossorigin=&quot;anonymous&quot;&gt;&lt;/script&gt;

&lt;!-- Tempus Dominus Styles --&gt;
&lt;link rel=&quot;stylesheet&quot; href=&quot;https://cdn.jsdelivr.net/npm/@eonasdan/[email protected].13/dist/css/tempus-dominus.min.css&quot; crossorigin=&quot;anonymous&quot;&gt;</code>
&lt;link rel=&quot;stylesheet&quot; href=&quot;https://cdn.jsdelivr.net/npm/@eonasdan/[email protected].16/dist/css/tempus-dominus.min.css&quot; crossorigin=&quot;anonymous&quot;&gt;</code>
</pre>
</div>

Expand Down
6 changes: 3 additions & 3 deletions src/docs/templates/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ <h1 class='mb-3 fw-semibold'>Powerful and robust date and time picker</h1>
</div>
</div>
<p class='text-muted mb-0'>
Currently <strong>v6.7.13</strong>
Currently <strong>v6.7.16</strong>
<span class='px-1'>&middot;</span>
<a href='https://getdatepicker.com/5-4/' class='link-secondary'>v5 docs</a>
</p>
Expand Down Expand Up @@ -55,10 +55,10 @@ <h3 class='fw-semibold'>JsDelivr</h3>
<code class='language-html'>&lt;!-- Popperjs --&gt;
&lt;script src=&quot;https://cdn.jsdelivr.net/npm/@popperjs/[email protected]/dist/umd/popper.min.js&quot; integrity=&quot;sha256-BRqBN7dYgABqtY9Hd4ynE+1slnEw+roEPFzQ7TRRfcg=&quot; crossorigin=&quot;anonymous&quot;&gt;&lt;/script&gt;
&lt;!-- Tempus Dominus JavaScript --&gt;
&lt;script src=&quot;https://cdn.jsdelivr.net/npm/@eonasdan/[email protected].13/dist/js/tempus-dominus.min.js&quot; crossorigin=&quot;anonymous&quot;&gt;&lt;/script&gt;
&lt;script src=&quot;https://cdn.jsdelivr.net/npm/@eonasdan/[email protected].16/dist/js/tempus-dominus.min.js&quot; crossorigin=&quot;anonymous&quot;&gt;&lt;/script&gt;

&lt;!-- Tempus Dominus Styles --&gt;
&lt;link rel=&quot;stylesheet&quot; href=&quot;https://cdn.jsdelivr.net/npm/@eonasdan/[email protected].13/dist/css/tempus-dominus.min.css&quot; crossorigin=&quot;anonymous&quot;&gt;</code>
&lt;link rel=&quot;stylesheet&quot; href=&quot;https://cdn.jsdelivr.net/npm/@eonasdan/[email protected].16/dist/css/tempus-dominus.min.css&quot; crossorigin=&quot;anonymous&quot;&gt;</code>
</pre>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions src/docs/templates/shell.html
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@
<span class='d-none d-lg-inline'>Tempus Dominus</span> v6.0
</button>
<ul class='dropdown-menu dropdown-menu-end' aria-labelledby='bd-versions'>
<li><a class='dropdown-item current' aria-current='true' href='/6/'>Latest (6.7.13)</a></li>
<li><a class='dropdown-item current' aria-current='true' href='/6/'>Latest (6.7.16)</a></li>
<li>
<hr class='dropdown-divider'>
</li>
Expand Down Expand Up @@ -181,7 +181,7 @@
target='_blank' rel='license noopener'>MIT</a>, docs <a
href='https://creativecommons.org/licenses/by/3.0/' target='_blank' rel='license noopener'>CC BY 3.0</a>.
</li>
<li class='mb-2'>Currently v6.7.13</li>
<li class='mb-2'>Currently v6.7.16</li>
</ul>
</div>
<div class='col-6 col-lg-2 offset-lg-1 mb-3'>
Expand Down
7 changes: 5 additions & 2 deletions src/js/actions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -256,12 +256,15 @@ export default class Actions {
break;
}

this.dates.setValue(this.optionsStore.viewDate, this.dates.lastPickedIndex);

if (
this.optionsStore.currentCalendarViewMode ===
this.optionsStore.minimumCalendarViewMode
) {
this.dates.setValue(
this.optionsStore.viewDate,
this.dates.lastPickedIndex
);

if (!this.optionsStore.options.display.inline) {
this.display.hide();
}
Expand Down
2 changes: 1 addition & 1 deletion src/js/jQuery-provider.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/*global $, tempusDominus */

/*!
* Tempus Dominus v6.7.13 (https://getdatepicker.com/)
* Tempus Dominus v6.7.16 (https://getdatepicker.com/)
* Copyright 2013-2021 Jonathan Peterson
* Licensed under MIT (https://github.com/Eonasdan/tempus-dominus/blob/master/LICENSE)
*/
Expand Down
2 changes: 1 addition & 1 deletion src/js/tempus-dominus.ts
Original file line number Diff line number Diff line change
Expand Up @@ -643,7 +643,7 @@ const extend = function (plugin, option = undefined) {
return tempusDominus;
};

const version = '6.7.13';
const version = '6.7.16';

const tempusDominus = {
TempusDominus,
Expand Down
2 changes: 1 addition & 1 deletion src/nuget/TempusDominus.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata>
<id>TempusDominus</id>
<version>6.7.13</version>
<version>6.7.16</version>
<title>Tempus Dominus</title>
<authors>Eonasdan</authors>
<owners>Eonasdan</owners>
Expand Down
2 changes: 1 addition & 1 deletion src/nuget/TempusDominus.scss.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata>
<id>TempusDominus.scss</id>
<version>6.7.13</version>
<version>6.7.16</version>
<title>Tempus Dominus</title>
<authors>Eonasdan</authors>
<owners>Eonasdan</owners>
Expand Down

0 comments on commit 6182900

Please sign in to comment.