version bump, fixed .wider, fixed packagejson

tempusdominus · Jul 4, 2018 · 634eefc · 634eefc
1 parent b83f657
commit 634eefc
Show file tree

Hide file tree

Showing 20 changed files with 110 additions and 58 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -1,3 +1,5 @@
+const sass = require('node-sass');
+
 module.exports = function (grunt) {
     grunt.initConfig({
         pkg: grunt.file.readJSON('package.json'),
@@ -97,6 +99,7 @@ module.exports = function (grunt) {
                 options: {
                     cleancss: true,
                     compress: true,
+                    implementation: sass,
                     includePaths: ['node_modules']
                 },
                 files: {
@@ -105,7 +108,8 @@ module.exports = function (grunt) {
             },
             development: {
                 options: {
-                    includePaths: ['node_modules']
+                    includePaths: ['node_modules'],
+                    implementation: sass
                 },
                 files: {
                     'build/css/<%= pkg.name %>.css': 'src/sass/<%= pkg.name %>-build.scss'
@@ -148,7 +152,6 @@ module.exports = function (grunt) {
     });
 
     grunt.loadTasks('tasks');
-    grunt.loadNpmTasks('grunt-nuget');
     grunt.loadNpmTasks('grunt-mkdocs');
 
     require('load-grunt-tasks')(grunt);
@@ -163,7 +166,7 @@ module.exports = function (grunt) {
     grunt.registerTask('build:js', ['babel:dev', 'concat', 'eslint', 'babel:dist', 'stamp:bootstrap', 'uglify', 'copy']);
 
     grunt.registerTask('build:style', ['sass', 'stamp:css', 'copy']);
-    
+
     grunt.registerTask('copy', 'Generate docs', function () {
         grunt.file.copy('build/js/tempusdominus-bootstrap-4.js', 'src/docs/theme/js/tempusdominus-bootstrap-4.js');
         grunt.file.copy('build/css/tempusdominus-bootstrap-4.css', 'src/docs/theme/css/tempusdominus-bootstrap-4.css');
@@ -179,8 +182,7 @@ module.exports = function (grunt) {
         grunt.task.run([
             'bump_version:' + version,
             'build:travis',
-            'docs'//,
-            //'nugetpack' //todo not ready
+            'docs'
         ]);
     });
 };
diff --git a/build/css/tempusdominus-bootstrap-4.css b/build/css/tempusdominus-bootstrap-4.css
@@ -1,5 +1,5 @@
 /*@preserve
- * Tempus Dominus Bootstrap4 v5.0.0 (https://tempusdominus.github.io/bootstrap-4/)
+ * Tempus Dominus Bootstrap4 v5.0.1 (https://tempusdominus.github.io/bootstrap-4/)
  * Copyright 2016-2018 Jonathan Peterson
  * Licensed under MIT (https://github.com/tempusdominus/bootstrap-3/blob/master/LICENSE)
  */
@@ -66,6 +66,8 @@
     .bootstrap-datetimepicker-widget.dropdown-menu.float-right:after {
       left: auto;
       right: 7px; }
+    .bootstrap-datetimepicker-widget.dropdown-menu.wider {
+      width: 16rem; }
   .bootstrap-datetimepicker-widget .list-unstyled {
     margin: 0; }
   .bootstrap-datetimepicker-widget a[data-action] {

diff --git a/build/css/tempusdominus-bootstrap-4.min.css b/build/css/tempusdominus-bootstrap-4.min.css
@@ -1,5 +1,5 @@
 /*@preserve
- * Tempus Dominus Bootstrap4 v5.0.0 (https://tempusdominus.github.io/bootstrap-4/)
+ * Tempus Dominus Bootstrap4 v5.0.1 (https://tempusdominus.github.io/bootstrap-4/)
  * Copyright 2016-2018 Jonathan Peterson
  * Licensed under MIT (https://github.com/tempusdominus/bootstrap-3/blob/master/LICENSE)
  */
@@ -66,6 +66,8 @@
     .bootstrap-datetimepicker-widget.dropdown-menu.float-right:after {
       left: auto;
       right: 7px; }
+    .bootstrap-datetimepicker-widget.dropdown-menu.wider {
+      width: 16rem; }
   .bootstrap-datetimepicker-widget .list-unstyled {
     margin: 0; }
   .bootstrap-datetimepicker-widget a[data-action] {

diff --git a/build/js/tempusdominus-bootstrap-4.js b/build/js/tempusdominus-bootstrap-4.js
@@ -1,5 +1,5 @@
 /*@preserve
- * Tempus Dominus Bootstrap4 v5.0.0 (https://tempusdominus.github.io/bootstrap-4/)
+ * Tempus Dominus Bootstrap4 v5.0.1 (https://tempusdominus.github.io/bootstrap-4/)
  * Copyright 2016-2018 Jonathan Peterson
  * Licensed under MIT (https://github.com/tempusdominus/bootstrap-3/blob/master/LICENSE)
  */
@@ -1754,12 +1754,21 @@ var TempusDominusBootstrap4 = function ($) {
                 }).append($('<span>').addClass(this._options.icons.today))));
             }
             if (!this._options.sideBySide && this._hasDate() && this._hasTime()) {
+                var title = void 0,
+                    icon = void 0;
+                if (this._options.viewMode === 'times') {
+                    title = this._options.tooltips.selectDate;
+                    icon = this._options.icons.date;
+                } else {
+                    title = this._options.tooltips.selectTime;
+                    icon = this._options.icons.time;
+                }
                 row.push($('<td>').append($('<a>').attr({
                     href: '#',
                     tabindex: '-1',
                     'data-action': 'togglePicker',
-                    'title': this._options.tooltips.selectTime
-                }).append($('<span>').addClass(this._options.icons.time))));
+                    'title': title
+                }).append($('<span>').addClass(icon))));
             }
             if (this._options.buttons.showClear) {
                 row.push($('<td>').append($('<a>').attr({
@@ -1814,13 +1823,13 @@ var TempusDominusBootstrap4 = function ($) {
                 content.append(toolbar);
             }
             if (this._hasDate()) {
-                content.append($('<li>').addClass(this._options.collapse && this._hasTime() ? 'collapse' : '').addClass(this._options.collapse && this._hasTime() && this._options.viewMode === 'time' ? '' : 'show').append(dateView));
+                content.append($('<li>').addClass(this._options.collapse && this._hasTime() ? 'collapse' : '').addClass(this._options.collapse && this._hasTime() && this._options.viewMode === 'times' ? '' : 'show').append(dateView));
             }
             if (this._options.toolbarPlacement === 'default') {
                 content.append(toolbar);
             }
             if (this._hasTime()) {
-                content.append($('<li>').addClass(this._options.collapse && this._hasDate() ? 'collapse' : '').addClass(this._options.collapse && this._hasDate() && this._options.viewMode === 'time' ? 'show' : '').append(timeView));
+                content.append($('<li>').addClass(this._options.collapse && this._hasDate() ? 'collapse' : '').addClass(this._options.collapse && this._hasDate() && this._options.viewMode === 'times' ? 'show' : '').append(timeView));
             }
             if (this._options.toolbarPlacement === 'bottom') {
                 content.append(toolbar);

diff --git a/build/js/tempusdominus-bootstrap-4.min.js b/build/js/tempusdominus-bootstrap-4.min.js
diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
   "name": "tempusdominus/bootstrap-4",
   "type": "component",
-  "version": "5.0.0",
+  "version": "5.0.1",
   "description": "Date/time picker widget based on twitter bootstrap",
   "keywords": [
     "bootstrap",

diff --git a/docs/Installing/index.html b/docs/Installing/index.html
@@ -182,7 +182,7 @@ <h3 id="django">Django</h3>
 <li><a href="https://pypi.org/project/django-tempus-dominus/">Full examples are available with Django Forms, Widgets, and Templates</a>.</li>
 </ol>
 <h3 id="angular-wrapper">Angular Wrapper</h3>
-<p>Need new wrapper for this version.</p>
+<p>Follow instructions at <a href="https://github.com/fetrarij/ngx-tempusdominus-bootstrap">ngx-tempusdominus-bootstrap</a> </p>
 <h3 id="meteorjs">Meteor.js</h3>
 <p>Need new wrapper for this version.</p>
 <h2 id="manual">Manual</h2>

diff --git a/docs/Options/index.html b/docs/Options/index.html
@@ -466,7 +466,7 @@ <h4 id="calendarweeks-boolean">calendarWeeks, [boolean]</h4>
 <hr />
 <h3 id="viewmode">viewMode</h3>
 <pre><code>Default: 'days'
-Accepts: 'decades','years','months','days'
+Accepts: 'decades','years','months','days', 'times'
 </code></pre>
 <p>The default view to display when the picker is shown.</p>
 <p><strong>Note</strong>: To limit the picker to selecting, for instance the year and month, use <code>format: MM/YYYY</code>.</p>

diff --git a/docs/css/tempusdominus-bootstrap-4.css b/docs/css/tempusdominus-bootstrap-4.css
@@ -1,5 +1,5 @@
 /*@preserve
- * Tempus Dominus Bootstrap4 v5.0.0 (https://tempusdominus.github.io/bootstrap-4/)
+ * Tempus Dominus Bootstrap4 v5.0.1 (https://tempusdominus.github.io/bootstrap-4/)
  * Copyright 2016-2018 Jonathan Peterson
  * Licensed under MIT (https://github.com/tempusdominus/bootstrap-3/blob/master/LICENSE)
  */
@@ -66,6 +66,8 @@
     .bootstrap-datetimepicker-widget.dropdown-menu.float-right:after {
       left: auto;
       right: 7px; }
+    .bootstrap-datetimepicker-widget.dropdown-menu.wider {
+      width: 16rem; }
   .bootstrap-datetimepicker-widget .list-unstyled {
     margin: 0; }
   .bootstrap-datetimepicker-widget a[data-action] {

diff --git a/docs/index.html b/docs/index.html
@@ -140,7 +140,7 @@ <h1 class="mb-3">Tempus Dominus</h1>
           <a href="Installing/" class="btn btn-lg btn-outline-secondary">Download</a>
         </div>
         <p class="text-muted mb-0">
-         Currently v5.0.0
+         Currently v5.0.1
         </p>
       </div>
     </div>
@@ -168,8 +168,8 @@ <h3>CDNJS</h3>
 <code>
 &lt;script type=&quot;text/javascript&quot; src=&quot;https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.min.js&quot;&gt;&lt;/script&gt;
 &lt;script type=&quot;text/javascript&quot; src=&quot;https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.22.2/moment.min.js&quot;&gt;&lt;/script&gt;
-&lt;script type=&quot;text/javascript&quot; src=&quot;https://cdnjs.cloudflare.com/ajax/libs/tempusdominus-bootstrap-4/5.0.0/js/tempusdominus-bootstrap-4.min.js&quot;&gt;&lt;/script&gt;
-&lt;link rel=&quot;stylesheet&quot; href=&quot;https://cdnjs.cloudflare.com/ajax/libs/tempusdominus-bootstrap-4/5.0.0/css/tempusdominus-bootstrap-4.min.css&quot; /&gt;
+&lt;script type=&quot;text/javascript&quot; src=&quot;https://cdnjs.cloudflare.com/ajax/libs/tempusdominus-bootstrap-4/5.0.1/js/tempusdominus-bootstrap-4.min.js&quot;&gt;&lt;/script&gt;
+&lt;link rel=&quot;stylesheet&quot; href=&quot;https://cdnjs.cloudflare.com/ajax/libs/tempusdominus-bootstrap-4/5.0.1/css/tempusdominus-bootstrap-4.min.css&quot; /&gt;
 </code>
         </pre>
         <hr class="half-rule"/>

diff --git a/docs/js/tempusdominus-bootstrap-4.js b/docs/js/tempusdominus-bootstrap-4.js
@@ -1,5 +1,5 @@
 /*@preserve
- * Tempus Dominus Bootstrap4 v5.0.0 (https://tempusdominus.github.io/bootstrap-4/)
+ * Tempus Dominus Bootstrap4 v5.0.1 (https://tempusdominus.github.io/bootstrap-4/)
  * Copyright 2016-2018 Jonathan Peterson
  * Licensed under MIT (https://github.com/tempusdominus/bootstrap-3/blob/master/LICENSE)
  */
@@ -1754,12 +1754,21 @@ var TempusDominusBootstrap4 = function ($) {
                 }).append($('<span>').addClass(this._options.icons.today))));
             }
             if (!this._options.sideBySide && this._hasDate() && this._hasTime()) {
+                var title = void 0,
+                    icon = void 0;
+                if (this._options.viewMode === 'times') {
+                    title = this._options.tooltips.selectDate;
+                    icon = this._options.icons.date;
+                } else {
+                    title = this._options.tooltips.selectTime;
+                    icon = this._options.icons.time;
+                }
                 row.push($('<td>').append($('<a>').attr({
                     href: '#',
                     tabindex: '-1',
                     'data-action': 'togglePicker',
-                    'title': this._options.tooltips.selectTime
-                }).append($('<span>').addClass(this._options.icons.time))));
+                    'title': title
+                }).append($('<span>').addClass(icon))));
             }
             if (this._options.buttons.showClear) {
                 row.push($('<td>').append($('<a>').attr({
@@ -1814,13 +1823,13 @@ var TempusDominusBootstrap4 = function ($) {
                 content.append(toolbar);
             }
             if (this._hasDate()) {
-                content.append($('<li>').addClass(this._options.collapse && this._hasTime() ? 'collapse' : '').addClass(this._options.collapse && this._hasTime() && this._options.viewMode === 'time' ? '' : 'show').append(dateView));
+                content.append($('<li>').addClass(this._options.collapse && this._hasTime() ? 'collapse' : '').addClass(this._options.collapse && this._hasTime() && this._options.viewMode === 'times' ? '' : 'show').append(dateView));
             }
             if (this._options.toolbarPlacement === 'default') {
                 content.append(toolbar);
             }
             if (this._hasTime()) {
-                content.append($('<li>').addClass(this._options.collapse && this._hasDate() ? 'collapse' : '').addClass(this._options.collapse && this._hasDate() && this._options.viewMode === 'time' ? 'show' : '').append(timeView));
+                content.append($('<li>').addClass(this._options.collapse && this._hasDate() ? 'collapse' : '').addClass(this._options.collapse && this._hasDate() && this._options.viewMode === 'times' ? 'show' : '').append(timeView));
             }
             if (this._options.toolbarPlacement === 'bottom') {
                 content.append(toolbar);

diff --git a/docs/search/search_index.json b/docs/search/search_index.json
diff --git a/docs/sitemap.xml b/docs/sitemap.xml
@@ -4,79 +4,79 @@
 
     <url>
      <loc>/</loc>
-     <lastmod>2018-06-05</lastmod>
+     <lastmod>2018-07-04</lastmod>
      <changefreq>daily</changefreq>
     </url>
 
 
 
     <url>
      <loc>/Usage/</loc>
-     <lastmod>2018-06-05</lastmod>
+     <lastmod>2018-07-04</lastmod>
      <changefreq>daily</changefreq>
     </url>
 
 
 
     <url>
      <loc>/Installing/</loc>
-     <lastmod>2018-06-05</lastmod>
+     <lastmod>2018-07-04</lastmod>
      <changefreq>daily</changefreq>
     </url>
 
 
 
     <url>
      <loc>/Functions/</loc>
-     <lastmod>2018-06-05</lastmod>
+     <lastmod>2018-07-04</lastmod>
      <changefreq>daily</changefreq>
     </url>
 
 
 
     <url>
      <loc>/Options/</loc>
-     <lastmod>2018-06-05</lastmod>
+     <lastmod>2018-07-04</lastmod>
      <changefreq>daily</changefreq>
     </url>
 
 
 
     <url>
      <loc>/Events/</loc>
-     <lastmod>2018-06-05</lastmod>
+     <lastmod>2018-07-04</lastmod>
      <changefreq>daily</changefreq>
     </url>
 
 
 
     <url>
      <loc>/Changelog/</loc>
-     <lastmod>2018-06-05</lastmod>
+     <lastmod>2018-07-04</lastmod>
      <changefreq>daily</changefreq>
     </url>
 
 
 
     <url>
      <loc>/ContributorsGuide/</loc>
-     <lastmod>2018-06-05</lastmod>
+     <lastmod>2018-07-04</lastmod>
      <changefreq>daily</changefreq>
     </url>
 
 
 
     <url>
      <loc>/Extras/</loc>
-     <lastmod>2018-06-05</lastmod>
+     <lastmod>2018-07-04</lastmod>
      <changefreq>daily</changefreq>
     </url>
 
 
 
     <url>
      <loc>/FAQ/</loc>
-     <lastmod>2018-06-05</lastmod>
+     <lastmod>2018-07-04</lastmod>
      <changefreq>daily</changefreq>
     </url>
 

diff --git a/docs/theme/css/tempusdominus-bootstrap-4.css b/docs/theme/css/tempusdominus-bootstrap-4.css
@@ -1,5 +1,5 @@
 /*@preserve
- * Tempus Dominus Bootstrap4 v5.0.0 (https://tempusdominus.github.io/bootstrap-4/)
+ * Tempus Dominus Bootstrap4 v5.0.1 (https://tempusdominus.github.io/bootstrap-4/)
  * Copyright 2016-2018 Jonathan Peterson
  * Licensed under MIT (https://github.com/tempusdominus/bootstrap-3/blob/master/LICENSE)
  */
@@ -66,6 +66,8 @@
     .bootstrap-datetimepicker-widget.dropdown-menu.float-right:after {
       left: auto;
       right: 7px; }
+    .bootstrap-datetimepicker-widget.dropdown-menu.wider {
+      width: 16rem; }
   .bootstrap-datetimepicker-widget .list-unstyled {
     margin: 0; }
   .bootstrap-datetimepicker-widget a[data-action] {

diff --git a/docs/theme/js/tempusdominus-bootstrap-4.js b/docs/theme/js/tempusdominus-bootstrap-4.js
@@ -1,5 +1,5 @@
 /*@preserve
- * Tempus Dominus Bootstrap4 v5.0.0 (https://tempusdominus.github.io/bootstrap-4/)
+ * Tempus Dominus Bootstrap4 v5.0.1 (https://tempusdominus.github.io/bootstrap-4/)
  * Copyright 2016-2018 Jonathan Peterson
  * Licensed under MIT (https://github.com/tempusdominus/bootstrap-3/blob/master/LICENSE)
  */
@@ -1754,12 +1754,21 @@ var TempusDominusBootstrap4 = function ($) {
                 }).append($('<span>').addClass(this._options.icons.today))));
             }
             if (!this._options.sideBySide && this._hasDate() && this._hasTime()) {
+                var title = void 0,
+                    icon = void 0;
+                if (this._options.viewMode === 'times') {
+                    title = this._options.tooltips.selectDate;
+                    icon = this._options.icons.date;
+                } else {
+                    title = this._options.tooltips.selectTime;
+                    icon = this._options.icons.time;
+                }
                 row.push($('<td>').append($('<a>').attr({
                     href: '#',
                     tabindex: '-1',
                     'data-action': 'togglePicker',
-                    'title': this._options.tooltips.selectTime
-                }).append($('<span>').addClass(this._options.icons.time))));
+                    'title': title
+                }).append($('<span>').addClass(icon))));
             }
             if (this._options.buttons.showClear) {
                 row.push($('<td>').append($('<a>').attr({
@@ -1814,13 +1823,13 @@ var TempusDominusBootstrap4 = function ($) {
                 content.append(toolbar);
             }
             if (this._hasDate()) {
-                content.append($('<li>').addClass(this._options.collapse && this._hasTime() ? 'collapse' : '').addClass(this._options.collapse && this._hasTime() && this._options.viewMode === 'time' ? '' : 'show').append(dateView));
+                content.append($('<li>').addClass(this._options.collapse && this._hasTime() ? 'collapse' : '').addClass(this._options.collapse && this._hasTime() && this._options.viewMode === 'times' ? '' : 'show').append(dateView));
             }
             if (this._options.toolbarPlacement === 'default') {
                 content.append(toolbar);
             }
             if (this._hasTime()) {
-                content.append($('<li>').addClass(this._options.collapse && this._hasDate() ? 'collapse' : '').addClass(this._options.collapse && this._hasDate() && this._options.viewMode === 'time' ? 'show' : '').append(timeView));
+                content.append($('<li>').addClass(this._options.collapse && this._hasDate() ? 'collapse' : '').addClass(this._options.collapse && this._hasDate() && this._options.viewMode === 'times' ? 'show' : '').append(timeView));
             }
             if (this._options.toolbarPlacement === 'bottom') {
                 content.append(toolbar);