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

Jump to bottom

Fix auth dialog sizing error #5314

Merged
merged 4 commits into from
Dec 18, 2019
Merged

Fix auth dialog sizing error #5314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
41ac93f
Merge pull request #5113 from nightscout/dev
sulkaharo Dec 17, 2019
98a153a
Fix auth dialog sizing error
Dec 17, 2019
872d802
Fix Client Init After Auth
Dec 18, 2019
1ee7979
update NS minor version
Dec 18, 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
2 changes: 1 addition & 1 deletion lib/client/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ client.init = function init (callback) {
// auth failed, hide loader and request for key
$('#centerMessagePanel').hide();
client.hashauth.requestAuthentication(function afterRequest () {
client.init(null, callback);
client.init(callback);
});
}
});
Expand Down
7 changes: 6 additions & 1 deletion lib/hashauth.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,12 @@ hashauth.init = function init(client, $) {
hashauth.requestAuthentication = function requestAuthentication (eventOrNext) {
var translate = client.translate;
hashauth.injectHtml();
var clientWidth = Math.min(400, $( '#container')[0].clientWidth);

var clientWidth = window.innerWidth
|| document.documentElement.clientWidth
|| document.body.clientWidth;

clientWidth = Math.min(400, clientWidth);

$( '#requestauthenticationdialog' ).dialog({
width: clientWidth
Expand Down
2 changes: 1 addition & 1 deletion npm-shrinkwrap.json
View file
Open in desktop

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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "nightscout",
"version": "13.0.0",
"version": "13.0.1",
"description": "Nightscout acts as a web-based CGM (Continuous Glucose Montinor) to allow multiple caregivers to remotely view a patients glucose data in realtime.",
"license": "AGPL-3.0",
"author": "Nightscout Team",
Expand Down
2 changes: 1 addition & 1 deletion swagger.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"info": {
"title": "Nightscout API",
"description": "Own your DData with the Nightscout API",
"version": "13.0.0",
"version": "13.0.1",
"license": {
"name": "AGPL 3",
"url": "https://www.gnu.org/licenses/agpl.txt"
Expand Down
2 changes: 1 addition & 1 deletion swagger.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ servers:
info:
title: Nightscout API
description: Own your DData with the Nightscout API
version: 13.0.0
version: 13.0.1
license:
name: AGPL 3
url: 'https://www.gnu.org/licenses/agpl.txt'
Expand Down