Merge branch 'master' into dev-600

Author: tombrunet

accessibility-checker-extension/src/ts/background/helper/engineCache.ts

@@ -37,10 +37,10 @@ export default class EngineCache {
             let archiveInfo = ((await chrome.storage.local.get(['archiveInfo'])) || {}).archiveInfo || { archives: [], ts: 0 };
             // If archive info is older than 30 minutes, or not there at all
             let archives : IArchiveDefinition[] = archiveInfo.archives;
-            if (archives.length === 0 || new Date().getTime()-new Date(archiveInfo.ts).getTime() >= 30*60*1000) {
+            if (archives.length === 0 || !archiveInfo.ts || new Date().getTime()-new Date(archiveInfo.ts).getTime() >= 30*60*1000) {
                 archives = <IArchiveDefinition[]>await Fetch.json(chrome.runtime.getURL("archives.json"));
             }
-            await chrome.storage.local.set({ archiveInfo: { archives }, ts: new Date().getTime() });
+            await chrome.storage.local.set({ archiveInfo: { archives, ts: new Date().getTime() }});
             return archives;
         } catch (err) {
             console.error(err);