{{ __('name', cat) }}
{{ cat.count_plugins_active }} / {{ cat.count_plugins }}
diff --git a/app/popup/popup.js b/app/popup/popup.js
index d6a1b43..14663f4 100644
--- a/app/popup/popup.js
+++ b/app/popup/popup.js
@@ -99,7 +99,7 @@ chrome.storage.onChanged.addListener(function(changes, namespace) {
if (key === app.$data.channel+"_plugins") {
app.$data.categories = {};
app.$data.categories = changes[key].newValue;
- console.log('up cats');
+
let category_name = app.$data.category_name;
if (category_name !== '') {
if (app.$data.categories[category_name]) {
@@ -109,5 +109,8 @@ chrome.storage.onChanged.addListener(function(changes, namespace) {
}
}
}
+ if (key === "local_server_host") {
+ app.$data.localServerHost = changes[key].newValue;
+ }
}
});
\ No newline at end of file
diff --git a/assets/roboto/Roboto-Regular.woff2 b/assets/roboto/Roboto-Regular.woff2
new file mode 100644
index 0000000..6040102
Binary files /dev/null and b/assets/roboto/Roboto-Regular.woff2 differ
diff --git a/assets/roboto/roboto-font.css b/assets/roboto/roboto-font.css
new file mode 100644
index 0000000..7e7377b
--- /dev/null
+++ b/assets/roboto/roboto-font.css
@@ -0,0 +1,12 @@
+@font-face {
+ font-family: 'Roboto';
+ font-style: normal;
+ font-weight: 400;
+ src: local('Roboto'),
+ local('Roboto-Regular'),
+ url(Roboto-Regular.woff2) format('woff2');
+}
+
+body, input, select {
+ font-family: system-ui, "Roboto";
+}
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index fe509c8..a90e229 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
{
"name": "__MSG_extName__",
"description": "__MSG_extDescription__",
- "version": "1.2.0",
+ "version": "1.3.0",
"minimum_chrome_version": "61",
"applications": {
"gecko": {
diff --git a/scripts/background.js b/scripts/background.js
index 0b590f3..a3f3da2 100644
--- a/scripts/background.js
+++ b/scripts/background.js
@@ -32,13 +32,13 @@ async function onRequestOpenIntel() {
if (lastIITCTab) {
const tabInfo = await getTabInfo(lastIITCTab);
if (isIngressUrl(tabInfo.url)) {
- console.log('detected ingress.com/intel page on tab %d', lastIITCTab);
+ console.log('detected intel.ingress.com page on tab %d', lastIITCTab);
return setTabActive(lastIITCTab);
}
}
return chrome.tabs.create({
- url: 'https://intel.ingress.com/intel',
+ url: 'https://intel.ingress.com/',
pinned: true
}, function(tab) {
lastIITCTab = tab.id;
@@ -70,8 +70,7 @@ async function onUpdatedListener(tabId, status) {
if (status.status === 'complete') {
const tabInfo = await getTabInfo(tabId);
if (isIngressUrl(tabInfo.url)) {
- console.log('detected intel.ingress.com/intel page on tab %d', tabId);
- console.log('requested iitc launch');
+ console.log('detected intel.ingress.com page on tab %d', tabId);
initialize();
lastIITCTab = tabId;
}
@@ -148,7 +147,6 @@ function injectUserScript(code) {
}, function (tabs) {
for (let tab of Object.values(tabs)) {
- console.log(tab);
chrome.tabs.executeScript(tab.id, {
code: inject
}, () => {
diff --git a/scripts/helpers.js b/scripts/helpers.js
index cc45b50..807fc6b 100644
--- a/scripts/helpers.js
+++ b/scripts/helpers.js
@@ -34,20 +34,28 @@ function parse_meta(code) {
return data;
}
-const ajaxGet = (url, parseJSON) => new Promise(resolve => {
+const ajaxGet = (url, variant) => new Promise(resolve => {
+ let method = (variant === "Last-Modified") ? "HEAD" : "GET";
+
let xhr = null;
xhr = new XMLHttpRequest();
if (!xhr) return null;
xhr.timeout = 5000;
- xhr.open("GET", url+"?"+Date.now(),true);
+ xhr.open(method, url+"?"+Date.now(),true);
xhr.onreadystatechange = function() {
if (xhr.readyState === 4) {
if (xhr.status === 200) {
- let response = xhr.responseText;
- if (parseJSON) {
- response = JSON.parse(response);
+
+ if (variant === "Last-Modified") {
+ resolve(xhr.getResponseHeader('Last-Modified'))
+ } else {
+ let response = xhr.responseText;
+ if (variant === "parseJSON") {
+ response = JSON.parse(response);
+ }
+ resolve(response)
}
- resolve(response)
+
} else {
resolve(null)
}
@@ -69,7 +77,7 @@ const checkStatusLocalServer = (host) => new Promise(resolve => {
app.$data.localServerStatus = 'err';
let xhr = new XMLHttpRequest();
- xhr.open("GET", "http://"+host+"/meta.json", true);
+ xhr.open("GET", "http://"+host+"/meta.json?"+Date.now(), true);
xhr.timeout = 1000;
xhr.onreadystatechange = function() {
if (xhr.readyState === 4) {
diff --git a/scripts/updater.js b/scripts/updater.js
index 54cde9e..c9bf2a6 100644
--- a/scripts/updater.js
+++ b/scripts/updater.js
@@ -57,7 +57,7 @@ chrome.runtime.onMessage.addListener(function(request) {
const save = (options) => new Promise(resolve => {
let data = {};
Object.keys(options).forEach(function (key) {
- if (['iitc_version', 'iitc_code', 'plugins', 'plugins_local', 'plugins_user'].indexOf(key) !== -1) {
+ if (['iitc_version', 'last_modified', 'iitc_code', 'plugins', 'plugins_local', 'plugins_user'].indexOf(key) !== -1) {
console.log('save '+channel+'_'+key);
data[channel+'_'+key] = options[key];
} else {
@@ -68,10 +68,10 @@ const save = (options) => new Promise(resolve => {
});
-const ajaxGetWithProgress = (url, parseJSON) => new Promise(async resolve => {
+const ajaxGetWithProgress = (url, variant) => new Promise(async resolve => {
clearInterval(progressIntervalId);
progressIntervalId = setInterval(function() { showProgress(true) }, 300);
- let response = await ajaxGet(url, parseJSON);
+ let response = await ajaxGet(url, variant);
if (response) {
clearInterval(progressIntervalId);
showProgress(false);
@@ -93,7 +93,7 @@ function checkUpdates(force, retry) {
"last_check_update",
"local_server_host",
"release_update_check_interval", "test_update_check_interval", "local_update_check_interval",
- "release_iitc_version", "test_iitc_version", "local_iitc_version",
+ "release_last_modified", "test_last_modified", "local_last_modified",
"release_plugins", "test_plugins", "local_plugins",
"release_plugins_local", "test_plugins_local", "local_plugins_local",
"release_plugins_user", "test_plugins_user", "local_plugins_user"
@@ -111,22 +111,23 @@ function checkUpdates(force, retry) {
retry = 0;
}
- if (local[channel+'_iitc_version'] === undefined || local.last_check_update === undefined || channel === 'local') {
+ if (local[channel+'_last_modified'] === undefined || local.last_check_update === undefined) {
clearTimeout(update_timeout_id); update_timeout_id = null;
- await downloadMeta(local);
+ await downloadMeta(local, null);
} else {
let time_delta = Math.floor(Date.now() / 1000)-update_check_interval-local.last_check_update;
if (time_delta >= 0 || force) {
clearTimeout(update_timeout_id); update_timeout_id = null;
- let response = await ajaxGetWithProgress(network_host[channel]+"/.build-timestamp");
- if (response) {
- if (response[network_host[channel]] !== local[channel+'_iitc_version'] || force) {
- await downloadMeta(local);
+ let last_modified = await ajaxGetWithProgress(network_host[channel]+"/meta.json", "Last-Modified");
+ if (last_modified) {
+ if (last_modified !== local[channel+'_last_modified'] || force) {
+ await downloadMeta(local, last_modified);
}
} else {
retry += 1;
let seconds = retry*retry;
- chrome.runtime.sendMessage({'type': "showMessage", 'message': _('serverNotAvailableRetry', seconds)});
+ if (seconds > 60*60*24) seconds = 60*60*24;
+ chrome.runtime.sendMessage({'type': "showMessage", 'message': _('serverNotAvailableRetry', seconds.toString())});
update_timeout_id = setTimeout(function(){
checkUpdates(true, retry);
}, seconds*1000);
@@ -146,15 +147,15 @@ function checkUpdates(force, retry) {
});
}
-async function downloadMeta(local) {
- let response = await ajaxGetWithProgress(network_host[channel]+"/meta.json", true);
+async function downloadMeta(local, last_modified) {
+ let response = await ajaxGetWithProgress(network_host[channel]+"/meta.json", "parseJSON");
if (!response) return;
let plugins = response['categories'];
let plugins_local = local[channel+'_plugins_local'];
let plugins_user = local[channel+'_plugins_user'];
- let iitc_code = await ajaxGetWithProgress(network_host[channel]+"/total-conversion-build.user.js", false);
+ let iitc_code = await ajaxGetWithProgress(network_host[channel]+"/total-conversion-build.user.js");
if (iitc_code) {
await save({
'iitc_code': iitc_code
@@ -166,6 +167,7 @@ async function downloadMeta(local) {
plugins = rebuildingCategoriesPlugins(plugins, plugins_local, plugins_user);
await save({
'iitc_version': response['iitc_version'],
+ 'last_modified': last_modified,
'plugins': plugins,
'plugins_local': plugins_local,
'plugins_user': plugins_user
@@ -218,13 +220,13 @@ async function updateExternalPlugins(local) {
if (plugin['updateURL'] && plugin['downloadURL']) {
// download meta info
- let response_meta = await ajaxGetWithProgress(plugin['updateURL']+hash, false);
+ let response_meta = await ajaxGetWithProgress(plugin['updateURL']+hash);
if (response_meta) {
let meta = parse_meta(response_meta);
// if new version
if (meta && meta['version'] && meta['version'] !== plugin['version']) {
// download userscript
- let response_code = await ajaxGetWithProgress(plugin['updateURL']+hash, false);
+ let response_code = await ajaxGetWithProgress(plugin['updateURL']+hash);
if (response_code) {
exist_updates = true;
plugins_user[id] = meta;
@@ -263,7 +265,7 @@ async function updateLocalPlugins(plugins, plugins_local) {
});
if (filename && keep) {
- let code = await ajaxGetWithProgress(network_host[channel]+"/plugins/" + filename, false);
+ let code = await ajaxGetWithProgress(network_host[channel]+"/plugins/" + filename);
if (code) plugins_local[id]['code'] = code;
} else {
delete plugins_local[id];
@@ -307,7 +309,7 @@ function managePlugin(id, category, action) {
plugins_local = {};
}
let filename = plugins[category]['plugins'][id]['filename'];
- let response = await ajaxGetWithProgress(network_host[channel]+"/plugins/"+filename, false);
+ let response = await ajaxGetWithProgress(network_host[channel]+"/plugins/"+filename);
if (response) {
plugins[category]['plugins'][id]['status'] = 'on';
plugins[category]['count_plugins_active'] += 1;
@@ -410,7 +412,6 @@ function rebuildingCategoriesPlugins(raw_plugins, plugins_local, plugins_user) {
let plugins_user_length = Object.keys(plugins_user).length;
- // Placing the External plugins section in top
if (plugins_user_length) {
data['External'] = {
'name': 'External',
@@ -423,26 +424,28 @@ function rebuildingCategoriesPlugins(raw_plugins, plugins_local, plugins_user) {
if (raw_plugins["Obsolete"] !== undefined) delete raw_plugins["Obsolete"];
if (raw_plugins["Deleted"] !== undefined) delete raw_plugins["Deleted"];
- data = {...data, ...raw_plugins.sortByKey('name')};
+ data = {...data, ...raw_plugins};
// Prepare plugins
Object.keys(data).forEach(function (cat) {
let plugins = {};
let count_all = 0;
- Object.keys(data[cat]['plugins']).forEach(function (id) {
- let plugin = data[cat]['plugins'][id];
- if (plugins[plugin['id']] === undefined) {
- count_all += 1;
- plugin['status'] = 'off';
- plugins[plugin['id']] = plugin;
+ if ('plugins' in data[cat]) {
+ Object.keys(data[cat]['plugins']).forEach(function (id) {
+ let plugin = data[cat]['plugins'][id];
+ if (plugins[plugin['id']] === undefined) {
+ count_all += 1;
+ plugin['status'] = 'off';
+ plugins[plugin['id']] = plugin;
+ }
+ });
+ if (count_all > 0 || cat === 'External') {
+ data[cat]['plugins'] = plugins.sortByKey('name');
+ data[cat]['count_plugins'] = count_all;
+ data[cat]['count_plugins_active'] = 0;
+ } else {
+ delete data[cat];
}
- });
- if (count_all > 0 || cat === 'External') {
- data[cat]['plugins'] = plugins.sortByKey('name');
- data[cat]['count_plugins'] = count_all;
- data[cat]['count_plugins_active'] = 0;
- } else {
- delete data[cat];
}
});