X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=popup.js;h=22c31604dccc3be9d89a189555ed4f36a887c637;hb=e09bdd59a2ee6ed310948665a41b9cdfa21990ea;hp=7ba21e2505df7cb947b21b1a30bb5e7b91871813;hpb=e981c8374cda5aef50354d7f4f3c7233ee0ffe7b;p=chrome-ext%2Fweb-power-switch.git
diff --git a/popup.js b/popup.js
index 7ba21e2..22c3160 100644
--- a/popup.js
+++ b/popup.js
@@ -14,8 +14,11 @@ function fetchpage(url, callback) {
callback(xhr, state);
} else {
xhr.setstatus = true;
- setstatus('Could not connect;
check your ' +
- 'settings');
+ setstatus(
+ 'Could not connect;
check your ' +
+ 'settings'
+ );
+ document.getElementById('open-settings').onclick = open_settings_page;
console.log('connect error', state);
}
}
@@ -88,6 +91,31 @@ function initpopup(xhr, state) {
// There is no clean API for extracting the current state.
// Example result:
+ /*
+
+
+ Controller: !!!Web Power Switch 6
+ |
+
+ */
+
+ var th, ths = state.currentTarget.responseXML.querySelectorAll('th');
+ for (var i = 0; th = ths[i]; ++i) {
+ if (th.bgColor != '#DDDDFF')
+ continue;
+
+ var controller_name = trim(th.innerText);
+ if (controller_name.slice(0, 12) != 'Controller: ')
+ continue;
+
+ row = tbl.insertRow(-1);
+ cell = row.insertCell(-1);
+ cell.colSpan = 2;
+ cell.align = 'center';
+ cell.innerText = controller_name.slice(12);
+ cell.innerHTML = '' + cell.innerHTML + ''
+ }
+
/*
1 |
Outlet 1 |
@@ -111,7 +139,10 @@ function initpopup(xhr, state) {
row = tbl.insertRow(-1);
cell = row.insertCell(-1);
- cell.innerText = outlet_name + ':';
+ if (outlet_name === '')
+ cell.innerHTML = 'unnamed';
+ else
+ cell.innerText = outlet_name + ':';
cell = row.insertCell(-1);
button = document.createElement('input');
button.type = 'button';
@@ -133,11 +164,34 @@ function setstatus(msg) {
status.style.position = msg ? '' : 'absolute';
}
+function open_settings_page() {
+ chrome.runtime.openOptionsPage();
+}
+
document.addEventListener('DOMContentLoaded', function() {
storage.get(settings_keys, function(settings) {
url_base = settings['url'] || settings_defaults['url'];
user = settings['user'] || settings_defaults['user'];
pass = settings['pass'] || settings_defaults['pass'];
- fetchpage('index.htm', initpopup);
+ chrome.permissions.contains({
+ origins: [url_base + '/*']
+ }, function(granted) {
+ if (granted) {
+ fetchpage('index.htm', initpopup);
+ } else {
+ setstatus(
+ 'Missing permissions; please visit the ' +
+ 'settings page' +
+ ' to grant access. ' +
+ ''
+ );
+ document.getElementById('open-settings').onclick = open_settings_page;
+ // Work around http://crbug.com/125706.
+ document.getElementById('retry').onclick = function() {
+ chrome.permissions.request({origins: [url_base + '/*']});
+ fetchpage('index.htm', initpopup);
+ };
+ }
+ });
});
});
|