diff options
Diffstat (limited to 'html')
| -rw-r--r-- | html/display-panel.html | 23 | ||||
| -rw-r--r-- | html/display-panel.js | 35 | ||||
| -rw-r--r-- | html/options.html | 18 | ||||
| -rw-r--r-- | html/options_main.js | 33 |
4 files changed, 94 insertions, 15 deletions
diff --git a/html/display-panel.html b/html/display-panel.html index 9b6d619..d8d7f5d 100644 --- a/html/display-panel.html +++ b/html/display-panel.html @@ -21,6 +21,14 @@ display: none; } + .show_hide_next2:not(:checked)+* { + display: none; + } + + .show_hide_next2:checked+*+* { + display: none; + } + .hide { display: none; } @@ -34,10 +42,6 @@ #container_for_injected>#none_injected:not(:last-child) { display: none; } - - input#connected_chbx:checked+div+h3 { - display: none; - } </style> </head> <body> @@ -65,12 +69,19 @@ </label> <ul id="possible_patterns"></ul> - <input id="connected_chbx" type="checkbox" class="show_next"></input> + <input id="connected_chbx" type="checkbox" class="show_hide_next2"></input> <div> <h3> Matched pattern: <span id="pattern">...</span> <button id="view_pattern" class="hide"> - View in settings + View in settings + </button> + <input id="query_started_chbx" type="checkbox" class="show_hide_next2"></input> + <div id="container_for_repo_responses"> + <h3>Queried from repositories</h3> + </div> + <button id="query_pattern"> + Search for matching patterns </button> </h3> <h3> diff --git a/html/display-panel.js b/html/display-panel.js index 650c234..1693182 100644 --- a/html/display-panel.js +++ b/html/display-panel.js @@ -144,6 +144,7 @@ function handle_page_info(message) } const connected_chbx = by_id("connected_chbx"); +const query_pattern_but = by_id("query_pattern"); function try_to_connect(tab_id) { @@ -151,21 +152,35 @@ function try_to_connect(tab_id) const connect_info = {name: CONNECTION_TYPE.ACTIVITY_INFO, frameId: 0}; const port = browser.tabs.connect(tab_id, connect_info); - port.onDisconnect.addListener(port => handle_disconnect(tab_id)); + const button_cb = (e) => start_querying_repos(port); + + port.onDisconnect.addListener(port => handle_disconnect(tab_id, button_cb)); port.onMessage.addListener(handle_activity_report); + query_pattern_but.addEventListener("click", button_cb); + if (is_mozilla) setTimeout(() => monitor_connecting(port, tab_id), 1000); } +const query_started_chbx = by_id("query_started_chbx"); + +function start_querying_repos(port) +{ + port.postMessage("dummy (trigger repo querying)"); + query_started_chbx.checked = true; +} + const loading_chbx = by_id("loading_chbx"); -function handle_disconnect(tab_id) +function handle_disconnect(tab_id, button_cb) { + query_pattern_but.removeEventListener("click", button_cb); + if (is_chrome && !browser.runtime.lastError) return; - /* return if there was no connection initialization failure */ + /* return if error was not during connection initialization */ if (connected_chbx.checked) return; @@ -189,6 +204,7 @@ const blocked_span = by_id("blocked"); const payload_span = by_id("payload"); const view_payload_but = by_id("view_payload"); const container_for_injected = by_id("container_for_injected"); +const container_for_repo_responses = by_id("container_for_repo_responses"); function handle_activity_report(message) { @@ -197,7 +213,7 @@ function handle_activity_report(message) const [type, data] = message; if (type === "settings") { - let [pattern, settings] = data; + let [pattern, settings, repos] = data; settings = settings || {}; blocked_span.textContent = settings.allow ? "no" : "yes"; @@ -231,6 +247,17 @@ function handle_activity_report(message) container_for_injected.appendChild(h4); container_for_injected.appendChild(pre); } + if (type === "repo_query_result") { + const [repo_url, response_text] = data; + + const h4 = document.createElement("h4"); + const pre = document.createElement("pre"); + h4.textContent = repo_url; + pre.textContent = response_text; + + container_for_repo_responses.appendChild(h4); + container_for_repo_responses.appendChild(pre); + } } by_id("settings_but") diff --git a/html/options.html b/html/options.html index bfb9e52..a10b919 100644 --- a/html/options.html +++ b/html/options.html @@ -33,12 +33,14 @@ } /* tabbed view */ + #show_repos:not(:checked) ~ #repos, #show_pages:not(:checked) ~ #pages, #show_bags:not(:checked) ~ #bags, #show_scripts:not(:checked) ~ #scripts { display: none; } + #show_repos:checked ~ #repos_lbl, #show_pages:checked ~ #pages_lbl, #show_bags:checked ~ #bags_lbl, #show_scripts:checked ~ #scripts_lbl { @@ -124,9 +126,12 @@ </div> <!-- Mind the show_*s ids below - their format is assumed in js code --> + <input type="radio" name="tabs" id="show_repos"></input> <input type="radio" name="tabs" id="show_pages" checked></input> <input type="radio" name="tabs" id="show_bags"></input> <input type="radio" name="tabs" id="show_scripts"></input> + <label for="show_repos" id="repos_lbl" + class="tab_head"> Repos </label> <label for="show_pages" id="pages_lbl" class="tab_head"> Pages </label> <label for="show_bags" id="bags_lbl" @@ -134,6 +139,19 @@ <label for="show_scripts" id="scripts_lbl" class="tab_head"> Scripts </label> + <div id="repos"> + <ul id="repos_ul"> + <li id="work_repo_li" class="hide"> + <label for="repo_url_field">URL: </label> + <input id="repo_url_field"></input> + <br/> + <button id="save_repo_but" type="button"> Save </button> + <button id="discard_repo_but" type="button"> Cancel </button> + </li> + </ul> + <button id="add_repo_but" type="button"> Add repository </button> + </div> + <div id="pages"> <ul id="pages_ul"> <li id="work_page_li" class="hide"> diff --git a/html/options_main.js b/html/options_main.js index e1e6cbe..026b9ba 100644 --- a/html/options_main.js +++ b/html/options_main.js @@ -38,7 +38,7 @@ function item_li_id(prefix, item) return `li_${prefix}_${item}`; } -/* Insert into list of bags/pages/scripts */ +/* Insert into list of bags/pages/scripts/repos */ function add_li(prefix, item, at_the_end=false) { let ul = ul_by_prefix[prefix]; @@ -58,6 +58,8 @@ function add_li(prefix, item, at_the_end=false) let export_button = remove_button.nextElementSibling; export_button.addEventListener("click", () => export_item(prefix, item)); + if (prefix === TYPE_PREFIX.REPO) + export_button.remove(); if (!at_the_end) { for (let element of ul.ul.children) { @@ -89,7 +91,7 @@ function radio_li_id(prefix, item) function add_chbx_li(prefix, name) { - if (prefix === TYPE_PREFIX.PAGE) + if (![TYPE_PREFIX.BAG, TYPE_PREFIX.SCRIPT].includes(prefix)) return; let li = chbx_component_li_template.cloneNode(true); @@ -109,7 +111,7 @@ var radio_component_none_li = by_id("radio_component_none_li"); function add_radio_li(prefix, name) { - if (prefix === TYPE_PREFIX.PAGE) + if (![TYPE_PREFIX.BAG, TYPE_PREFIX.SCRIPT].includes(prefix)) return; let li = radio_component_li_template.cloneNode(true); @@ -125,6 +127,18 @@ function add_radio_li(prefix, name) radio_components_ul.insertBefore(li, radio_component_none_li); } +/* Used to reset edited repo. */ +function reset_work_repo_li(ul, item, _) +{ + ul.work_name_input.value = maybe_string(item); +} + +/* Used to get repo data for saving */ +function work_repo_li_data(ul) +{ + return [ul.work_name_input.value, {}]; +} + const page_payload_span = by_id("page_payload"); function set_page_components(components) @@ -461,6 +475,15 @@ const UL_STATE = { }; const ul_by_prefix = { + [TYPE_PREFIX.REPO] : { + ul : by_id("repos_ul"), + work_li : by_id("work_repo_li"), + work_name_input : by_id("repo_url_field"), + reset_work_li : reset_work_repo_li, + get_work_li_data : work_repo_li_data, + state : UL_STATE.IDLE, + edited_item : undefined, + }, [TYPE_PREFIX.PAGE] : { ul : by_id("pages_ul"), work_li : by_id("work_page_li"), @@ -727,7 +750,7 @@ async function main() discard_but.addEventListener("click", () => cancel_work(prefix)); save_but.addEventListener("click", () => save_work(prefix)); - if (prefix === TYPE_PREFIX.SCRIPT) + if ([TYPE_PREFIX.REPO, TYPE_PREFIX.SCRIPT].includes(prefix)) continue; let ul = ul_by_prefix[prefix]; @@ -772,7 +795,7 @@ function handle_change(change) let uls_creators = [[ul.ul, item_li_id]]; - if (change.prefix !== TYPE_PREFIX.PAGE) { + if ([TYPE_PREFIX.BAG, TYPE_PREFIX.SCRIPT].includes(change.prefix)) { uls_creators.push([chbx_components_ul, chbx_li_id]); uls_creators.push([radio_components_ul, radio_li_id]); } |