Merge branch 'release/3.5.4'

This commit is contained in:
Baptiste Grob
2020-11-04 16:13:38 +01:00
4 changed files with 13 additions and 11 deletions

View File

@@ -4,17 +4,19 @@ export function getPlatformString() {
try {
const platform = navigator.platform.toLowerCase();
let trimmed = '';
if (platform.indexOf('mac') !== -1) {
if (platform.includes('mac')) {
trimmed = 'mac';
} else if (platform.indexOf('win') !== -1) {
} else if (platform.includes('win')) {
trimmed = 'windows';
}
if (platform.indexOf('linux') !== -1) {
} else if (platform.includes('linux')) {
trimmed = 'linux';
} else {
/** Treat other platforms as linux */
trimmed = 'linux';
}
return trimmed + (isDesktopApplication() ? '-desktop' : '-web');
} catch (e) {
return 'unknown-platform';
return 'linux-web';
}
}

View File

@@ -34,7 +34,7 @@ export class WebDeviceInterface extends DeviceInterface {
}
async getRawStorageValue(key: string) {
return localStorage.getItem(key);
return localStorage.getItem(key) as any;
}
async getAllRawStorageKeyValues() {

6
package-lock.json generated
View File

@@ -1,6 +1,6 @@
{
"name": "standard-notes-web",
"version": "3.5.3",
"version": "3.5.4",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@@ -11028,8 +11028,8 @@
"from": "github:standardnotes/sncrypto#8794c88daa967eaae493cd5fdec7506d52b257ad"
},
"snjs": {
"version": "github:standardnotes/snjs#5757198630342821fdb0e8133b1597a39e0502ad",
"from": "github:standardnotes/snjs#5757198630342821fdb0e8133b1597a39e0502ad"
"version": "github:standardnotes/snjs#b07f37232029056699e7eae9af0820ca7cf536d1",
"from": "github:standardnotes/snjs#b07f37232029056699e7eae9af0820ca7cf536d1"
},
"sockjs": {
"version": "0.3.20",

View File

@@ -1,6 +1,6 @@
{
"name": "standard-notes-web",
"version": "3.5.3",
"version": "3.5.4",
"license": "AGPL-3.0-or-later",
"repository": {
"type": "git",
@@ -72,6 +72,6 @@
"@bugsnag/js": "^7.5.1",
"mobx": "^6.0.1",
"sncrypto": "github:standardnotes/sncrypto#8794c88daa967eaae493cd5fdec7506d52b257ad",
"snjs": "github:standardnotes/snjs#5757198630342821fdb0e8133b1597a39e0502ad"
"snjs": "github:standardnotes/snjs#b07f37232029056699e7eae9af0820ca7cf536d1"
}
}