#2685

Eonasdan · Nov 5, 2022 · 79f4b06 · 79f4b06
2 parents 2f6af52 + fc2a949
commit 79f4b06
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 12 deletions.
diff --git a/dist/js/tempus-dominus.esm.js b/dist/js/tempus-dominus.esm.js
diff --git a/dist/js/tempus-dominus.esm.js.map b/dist/js/tempus-dominus.esm.js.map
diff --git a/dist/js/tempus-dominus.esm.min.js b/dist/js/tempus-dominus.esm.min.js
diff --git a/dist/js/tempus-dominus.js b/dist/js/tempus-dominus.js
diff --git a/dist/js/tempus-dominus.js.map b/dist/js/tempus-dominus.js.map
diff --git a/dist/js/tempus-dominus.min.js b/dist/js/tempus-dominus.min.js
diff --git a/src/docs/partials/change-log.html b/src/docs/partials/change-log.html
@@ -2,17 +2,22 @@
   <div id='change-log'>
     <h1>Version 6</h1>
 
+    <div class='row'>
+      <h2>6.2.7</h2>
+      <h3>Bug fixes</h3>
+      <ul>
+        <li>Fixed calendar header not updating correctly #2685</li>
+        <li>Fixed clock components disappearing when using side by side #2684</li>
+      </ul>
+    </div>
+
     <div class='row'>
       <h2>6.2.6</h2>
       <h3>Bug fixes</h3>
       <ul>
         <li>Fixed disabled/enabled dates performance issue. This also should fix the next/previous month selection #2658</li>
         <li>Fixed view date syncing across options and not updating correctly #2611</li>
       </ul>
-      <h3>New</h3>
-      <ul>
-
-      </ul>
     </div>
 
     <div class='row'>

diff --git a/src/docs/templates/shell.html b/src/docs/templates/shell.html
@@ -238,6 +238,17 @@ <h5>Community</h5>
     'floating-chat.donateButton.text-color': '#fff'
   });
 </script>
+<!-- Google tag (gtag.js) -->
+<script async src="https://www.googletagmanager.com/gtag/js?id=G-CL5K7E80FB"></script>
+<script>
+  if (location.hostname === 'getdatepicker.com') {
+    window.dataLayer = window.dataLayer || [];
+    function gtag(){dataLayer.push(arguments);}
+    gtag('js', new Date());
+
+    gtag('config', 'G-CL5K7E80FB');
+  }
+</script>
 <link rel='stylesheet' href='/css/carbon.css' />
 </body>
 </html>
diff --git a/src/js/display/index.ts b/src/js/display/index.ts
@@ -339,6 +339,10 @@ export default class Display {
     }
 
     picker.style.display = 'grid';
+
+    if (this.optionsStore.options.display.sideBySide)
+      (<HTMLElement>(this.widget.querySelectorAll(`.${Namespace.css.clockContainer}`)[0])).style.display = 'grid';
+
     this._updateCalendarHeader();
     this._eventEmitters.viewUpdate.emit();
   }
@@ -452,9 +456,9 @@ export default class Display {
           'title',
           this.optionsStore.options.localization.nextMonth
         );
-        switcher.innerText = this.optionsStore.viewDate.format(
+        switcher.setAttribute(showing, this.optionsStore.viewDate.format(
           this.optionsStore.options.localization.dayViewHeaderFormat
-        );
+        ));
         break;
     }
     switcher.innerText = switcher.getAttribute(showing);