Skip to content
Snippets Groups Projects
Verified Commit ad08b042 authored by Thomas Rientjes's avatar Thomas Rientjes
Browse files

Optimize environment update mechanism

parent 17319c69
No related branches found
No related tags found
No related merge requests found
......@@ -41,10 +41,10 @@ main._initializeSettings = function () {
items = settingDefaults; // Restore setting defaults.
}
if (items.blockMissing === true) {
stateManager.setExtensionEnvironment('staging');
if (items.blockMissing === true || items.enforceStaging === true) {
stateManager.updateEnvironment('staging');
} else {
stateManager.setExtensionEnvironment('stable');
stateManager.updateEnvironment('stable');
}
if (items.disablePrefetch !== false) {
......
......@@ -68,25 +68,44 @@ stateManager.registerInjection = function (tabIdentifier, injection) {
}
};
stateManager.setExtensionEnvironment = function (environment) {
stateManager.setEnvironment = function (environment) {
if (environment === 'stable') {
// Strike a balance between coverage and website stability.
files.active = files.stable;
} else if (environment === 'staging') {
// Improve coverage at the expense of website stability.
files.active = Object.assign({}, files.stable, files.staging);
}
};
stateManager.updateEnvironment = function (preferredEnvironment) {
return new Promise((resolve) => {
chrome.storage.local.get(Setting.ENFORCE_STAGING, function (items) {
if (preferredEnvironment === 'stable') {
let requiredItems = [Setting.BLOCK_MISSING, Setting.ENFORCE_STAGING];
if (environment === 'staging' || items.enforceStaging === true) {
chrome.storage.local.get(requiredItems, function (items) {
// Improve coverage at the expense of website stability.
files.active = Object.assign({}, files.stable, files.staging);
if (items.blockMissing === true || items.enforceStaging === true) {
stateManager.setEnvironment('staging');
} else {
stateManager.setEnvironment('stable');
}
} else {
resolve();
});
// Find a balance between coverage and website stability.
files.active = files.stable;
}
} else if (preferredEnvironment === 'staging') {
stateManager.setEnvironment('staging');
resolve();
});
}
});
};
......@@ -186,27 +205,19 @@ stateManager._handleStorageChanged = function (changes) {
if (Setting.BLOCK_MISSING in changes) {
if (changes.blockMissing.newValue === true) {
stateManager.setExtensionEnvironment('staging');
stateManager.updateEnvironment('staging');
} else {
stateManager.setExtensionEnvironment('stable');
stateManager.updateEnvironment('stable');
}
}
if (Setting.ENFORCE_STAGING in changes) {
chrome.storage.local.get(Setting.BLOCK_MISSING, function (items) {
if (changes.enforceStaging.newValue === true) {
stateManager.setExtensionEnvironment('staging');
} else {
if (items.blockMissing === true) {
stateManager.setExtensionEnvironment('staging');
} else {
stateManager.setExtensionEnvironment('stable');
}
}
});
if (changes.enforceStaging.newValue === true) {
stateManager.updateEnvironment('staging');
} else {
stateManager.updateEnvironment('stable');
}
}
if (Setting.SHOW_ICON_BADGE in changes) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment