github-mirror/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2026-04-05 12:26:15 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

js: some speed improvements on page load

Browse Source
This commit is contained in:
Katharina Bogad 2021-06-21 00:16:05 +02:00
parent 7f598058bf
commit b7a1c870f0
3 changed files with 42 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
js/grocy.js
View File

@ -61,14 +61,40 @@ class GrocyClass
Object.assign(strings.messages[""], config.GettextPo.messages[""]);
this.Translator = new Translator(strings);
this.FrontendHelpers = new GrocyFrontendHelpers(this, this.Api);
this.WakeLock = new WakeLock(this);
this.UISound = new UISound(this);
this.Nightmode = new Nightmode(this);
this.Nightmode.StartWatchdog();
this.HeaderClock = new HeaderClock(this);
var self = this;
// defer some stuff until DOM content has loaded
document.addEventListener("DOMContentLoaded", function()
{
self.Nightmode.Initialize();
self.Nightmode.StartWatchdog();
// DB Changed Handling
if (self.UserId !== -1)
{
self.Api.Get('system/db-changed-time',
function(result)
{
self.DatabaseChangedTime = moment(result.changed_time);
setInterval(self.CheckDatabase(), 60000);
// Increase the idle time once every second
// On any interaction it will be reset to 0 (see above)
setInterval(self.IncrementIdleTime(), 1000);
},
function(xhr)
{
console.error(xhr);
}
);
}
});
// save the config
this.config = config;
@ -81,22 +107,6 @@ class GrocyClass
}
});
}
// DB Changed Handling
if (this.UserId !== -1)
{
var self = this;
this.Api.Get('system/db-changed-time',
function(result)
{
self.DatabaseChangedTime = moment(result.changed_time);
},
function(xhr)
{
console.error(xhr);
}
);
}
}
static createSingleton(config)
@ -106,11 +116,6 @@ class GrocyClass
var grocy = new GrocyClass(config);
window.Grocy = grocy;
// Check if the database has changed once a minute
setInterval(grocy.CheckDatabase(), 60000);
// Increase the idle time once every second
// On any interaction it will be reset to 0 (see above)
setInterval(grocy.IncrementIdleTime(), 1000);
window.onmousemove = grocy.ResetIdleTime;
window.onmousedown = grocy.ResetIdleTime;
window.onclick = grocy.ResetIdleTime;

15
js/helpers/numberdisplay.js
View File

@ -4,38 +4,41 @@ function RefreshLocaleNumberDisplay(rootSelector = "#page-content")
{
$(rootSelector + " .locale-number.locale-number-currency").each(function()
{
var text = $(this).text();
var elem = $(this);
var text = elem.text();
if (isNaN(text) || text.isEmpty())
{
return;
}
var value = parseFloat(text);
$(this).text(value.toLocaleString(undefined, { style: "currency", currency: Grocy.Currency, minimumFractionDigits: Grocy.UserSettings.stock_decimal_places_prices, maximumFractionDigits: Grocy.UserSettings.stock_decimal_places_prices }));
elem.text(value.toLocaleString(undefined, { style: "currency", currency: Grocy.Currency, minimumFractionDigits: Grocy.UserSettings.stock_decimal_places_prices, maximumFractionDigits: Grocy.UserSettings.stock_decimal_places_prices }));
});
$(rootSelector + " .locale-number.locale-number-quantity-amount").each(function()
{
var text = $(this).text();
var elem = $(this);
var text = elem.text();
if (isNaN(text) || text.isEmpty())
{
return;
}
var value = parseFloat(text);
$(this).text(value.toLocaleString(undefined, { minimumFractionDigits: 0, maximumFractionDigits: Grocy.UserSettings.stock_decimal_places_amounts }));
elem.text(value.toLocaleString(undefined, { minimumFractionDigits: 0, maximumFractionDigits: Grocy.UserSettings.stock_decimal_places_amounts }));
});
$(rootSelector + " .locale-number.locale-number-generic").each(function()
{
var text = $(this).text();
var elem = $(this);
var text = elem.text();
if (isNaN(text) || text.isEmpty())
{
return;
}
var value = parseFloat(text);
$(this).text(value.toLocaleString(undefined, { minimumFractionDigits: 0, maximumFractionDigits: 2 }));
elem.text(value.toLocaleString(undefined, { minimumFractionDigits: 0, maximumFractionDigits: 2 }));
});
}

5
js/lib/nightmode.js
View File

@ -4,9 +4,12 @@ class Nightmode
{
constructor(Grocy)
{
var self = this;
this.Grocy = Grocy;
}
Initialize()
{
var self = this;
$("#night-mode-enabled").on("change", function()
{
var value = $(this).is(":checked");