Merge pull request #4367 from matrix-org/t3chguy/app_load2
App load tweaks, i18n and localStorage
This commit is contained in:
+1
-1
@@ -237,7 +237,7 @@ const walkOpts = {
|
|||||||
const fullPath = path.join(root, fileStats.name);
|
const fullPath = path.join(root, fileStats.name);
|
||||||
|
|
||||||
let trs;
|
let trs;
|
||||||
if (fileStats.name.endsWith('.js') || fileStats.name.endsWith('.tsx')) {
|
if (fileStats.name.endsWith('.js') || fileStats.name.endsWith('.ts') || fileStats.name.endsWith('.tsx')) {
|
||||||
trs = getTranslationsJs(fullPath);
|
trs = getTranslationsJs(fullPath);
|
||||||
} else if (fileStats.name.endsWith('.html')) {
|
} else if (fileStats.name.endsWith('.html')) {
|
||||||
trs = getTranslationsOther(fullPath);
|
trs = getTranslationsOther(fullPath);
|
||||||
|
|||||||
+9
-7
@@ -123,8 +123,8 @@ const LAST_VISIT_TS_KEY = "mx_Riot_Analytics_lvts";
|
|||||||
|
|
||||||
function getUid() {
|
function getUid() {
|
||||||
try {
|
try {
|
||||||
let data = localStorage.getItem(UID_KEY);
|
let data = localStorage && localStorage.getItem(UID_KEY);
|
||||||
if (!data) {
|
if (!data && localStorage) {
|
||||||
localStorage.setItem(UID_KEY, data = [...Array(16)].map(() => Math.random().toString(16)[2]).join(''));
|
localStorage.setItem(UID_KEY, data = [...Array(16)].map(() => Math.random().toString(16)[2]).join(''));
|
||||||
}
|
}
|
||||||
return data;
|
return data;
|
||||||
@@ -145,14 +145,16 @@ class Analytics {
|
|||||||
this.firstPage = true;
|
this.firstPage = true;
|
||||||
this._heartbeatIntervalID = null;
|
this._heartbeatIntervalID = null;
|
||||||
|
|
||||||
this.creationTs = localStorage.getItem(CREATION_TS_KEY);
|
this.creationTs = localStorage && localStorage.getItem(CREATION_TS_KEY);
|
||||||
if (!this.creationTs) {
|
if (!this.creationTs && localStorage) {
|
||||||
localStorage.setItem(CREATION_TS_KEY, this.creationTs = new Date().getTime());
|
localStorage.setItem(CREATION_TS_KEY, this.creationTs = new Date().getTime());
|
||||||
}
|
}
|
||||||
|
|
||||||
this.lastVisitTs = localStorage.getItem(LAST_VISIT_TS_KEY);
|
this.lastVisitTs = localStorage && localStorage.getItem(LAST_VISIT_TS_KEY);
|
||||||
this.visitCount = localStorage.getItem(VISIT_COUNT_KEY) || 0;
|
this.visitCount = localStorage && localStorage.getItem(VISIT_COUNT_KEY) || 0;
|
||||||
localStorage.setItem(VISIT_COUNT_KEY, parseInt(this.visitCount, 10) + 1);
|
if (localStorage) {
|
||||||
|
localStorage.setItem(VISIT_COUNT_KEY, parseInt(this.visitCount, 10) + 1);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
get disabled() {
|
get disabled() {
|
||||||
|
|||||||
Reference in New Issue
Block a user