3 Commits

Author SHA1 Message Date
20xd6 004fe37680 Merge pull request 'Resolution for #1' (#2) from timefix into master
Reviewed-on: #2
2020-09-27 17:17:30 -04:00
20xd6 7e3cf8ccd6 Fix #1
This should reslove the issue with the time not updating.
It appears that an issue with conflicting options for the time
formatting has been introduced.
2020-09-27 16:58:10 -04:00
20xd6 05a1f50ce0 Rebase master as true master.
I had started a new feature on master. This is not how it should be done
and I am now atoning for my mistakes.
2020-09-27 16:37:52 -04:00
2 changed files with 2 additions and 6 deletions
-3
View File
@@ -18,14 +18,12 @@ function startTime(){
+ current_time.toLocaleString('en-US',
{timeZone: current_tz,
hourCycle:'h24',
timeStyle:'long',
hour: '2-digit',
minute:'2-digit',
second:'2-digit',
timeZoneName:'short'});
document.getElementById('time_body').innerHTML = current_time.toLocaleString('en-EN' ,{
timeZone: current_tz,
dateStyle:'long',
hourCycle:'h24',
weekday:'short',
month:'short',
@@ -37,7 +35,6 @@ function startTime(){
if(original_tz){//Test if there is a non-null value for original_tz. If True then the part of the page this pertains to is being displayed.
document.getElementById('time_original').innerHTML = current_time.toLocaleString('en-EN' ,{
timeZone: original_tz,
dateStyle:'long',
hourCycle:'h24',
weekday:'short',
month:'short',
+2 -3
View File
@@ -109,14 +109,13 @@
<br/>
<label for="originalTZ">Display original timezone</label>
<input type="checkbox" name="originalTZ" value="origTZ">
<span class="chkbox>
<span class="chkbox">
<label for="displayOffset">Display offset of selected timezones</label>
<input type="checkbox" name="displayOffset" value="disOS"/>
</span>
</form>
<p id="JStz"><?php echo date("e");?></p>
<h3>Timer</h3>
<a href="timer/" title="The timer page">Timer</a>
</div><!--end of "body" div-->
</body>
</html>