Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix clock if authentication is enabled #4860

Closed
wants to merge 10 commits into from
Closed

Fix clock if authentication is enabled #4860

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
3c25914
Fix clock if authentication is enabled
GermanBluefox Aug 6, 2019
366d10c
Add time to clock view back
GermanBluefox Aug 6, 2019
3a52cac
Formatting
GermanBluefox Aug 6, 2019
d61e8f9
Select browser language for authentication dialog
GermanBluefox Aug 7, 2019
050808d
Update hashauth.js
GermanBluefox Aug 7, 2019
ccad081
Update hashauth.js
GermanBluefox Aug 7, 2019
293ac55
Update hashauth.js
GermanBluefox Aug 7, 2019
afbe6a3
Update hashauth.js
GermanBluefox Aug 7, 2019
d361a72
Select language from localStorage
GermanBluefox Aug 10, 2019
bd42ad8
Merge branch 'dev' into dev
GermanBluefox Aug 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Formatting
  • Loading branch information
@GermanBluefox
GermanBluefox committed Aug 6, 2019
commit 3a52cacadc49fe4026b14ecd7799073c012ddf25
2 changes: 1 addition & 1 deletion lib/client/clock-client.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ client.render = function render (xhr) {
// Generate and insert the clock.
let timeDivisor = parseInt(client.settings.timeFormat ? client.settings.timeFormat : 12, 10);
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just number validation.

let today = new Date()
, h = today.getHours() % timeDivisor;
, h = today.getHours() % timeDivisor;
if (timeDivisor === 12) {
h = h || 12; // In the case of 00:xx, change to 12:xx for 12h time
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Formatting

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not only formatting. For h == 4 this will be changed to h==12. Please restore old behaviour, perhaps with === instead of ==

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed on my branch

}
Expand Down