Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Delta Between Two Patch Sets: devtools-panel.js

Issue 5646124035604480: Issue 154 - Added UI for devtools panel on Chrome (Closed)
Left Patch Set: Rebased and adapted for API changes Created March 12, 2015, 4:08 p.m.
Right Patch Set: Added new request types Created Jan. 28, 2016, 7:37 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « devtools-panel.html ('k') | ext/background.js » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 /* 1 /*
2 * This file is part of Adblock Plus <https://adblockplus.org/>, 2 * This file is part of Adblock Plus <https://adblockplus.org/>,
3 * Copyright (C) 2006-2015 Eyeo GmbH 3 * Copyright (C) 2006-2016 Eyeo GmbH
4 * 4 *
5 * Adblock Plus is free software: you can redistribute it and/or modify 5 * Adblock Plus is free software: you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License version 3 as 6 * it under the terms of the GNU General Public License version 3 as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
8 * 8 *
9 * Adblock Plus is distributed in the hope that it will be useful, 9 * Adblock Plus is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 * GNU General Public License for more details. 12 * GNU General Public License for more details.
13 * 13 *
14 * You should have received a copy of the GNU General Public License 14 * You should have received a copy of the GNU General Public License
15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. 15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>.
16 */ 16 */
17
18 "use strict";
17 19
18 function generateFilter(request) 20 function generateFilter(request)
19 { 21 {
20 var filter = request.url.replace(/^[\w\-]+:\/+(?:www\.)?/, "||"); 22 var filter = request.url.replace(/^[\w\-]+:\/+(?:www\.)?/, "||");
21 23
22 if (request.type == "POPUP") 24 if (request.type == "POPUP")
23 { 25 {
24 filter += "$popup"; 26 filter += "$popup";
25 27
26 if (request.url == "about:blank") 28 if (request.url == "about:blank")
27 filter += ",domain=" + request.docDomain; 29 filter += ",domain=" + request.docDomain;
28 } 30 }
29 31
30 return filter; 32 return filter;
31 } 33 }
32 34
33 function createActionButton(action, label, filter) 35 function createActionButton(action, label, filter)
34 { 36 {
35 var button = document.createElement("span"); 37 var button = document.createElement("span");
36 38
37 button.textContent = label; 39 button.textContent = label;
38 button.classList.add("action"); 40 button.classList.add("action");
39 41
40 button.addEventListener("click", function() 42 button.addEventListener("click", function()
41 { 43 {
42 ext.backgroundPage.sendMessage({ 44 ext.backgroundPage.sendMessage({
43 type: "filters." + action, 45 type: "filters." + action,
44 filter: filter 46 text: filter
45 }); 47 });
46 }); 48 }, false);
Thomas Greiner 2015/03/13 11:11:05 We always explicitly set the third parameter when
Sebastian Noack 2015/03/13 13:07:38 Well, not always. And frankly, I personally find c
47 49
48 return button; 50 return button;
49 } 51 }
50 52
51 function createRecord(request, filter, template) 53 function createRecord(request, filter, template)
52 { 54 {
53 var row = document.importNode(template, true); 55 var row = document.importNode(template, true);
54 row.dataset.type = request.type; 56 row.dataset.type = request.type;
55 57
56 row.querySelector(".domain").textContent = request.docDomain; 58 row.querySelector(".domain").textContent = request.docDomain;
57 row.querySelector(".type" ).textContent = request.type; 59 row.querySelector(".type").textContent = request.type;
58 60
59 var urlElement = row.querySelector(".url"); 61 var urlElement = row.querySelector(".url");
Thomas Greiner 2015/03/13 11:11:05 There's no added value in having those extra space
Sebastian Noack 2015/03/13 13:07:38 IMO it is. Code reads quicker and typos become mor
60 var actionWrapper = row.querySelector(".action-wrapper"); 62 var actionWrapper = row.querySelector(".action-wrapper");
61 63
62 if (request.url) 64 if (request.url)
63 { 65 {
64 urlElement.textContent = request.url; 66 urlElement.textContent = request.url;
65 67
66 if ("openResource" in ext.devtools.panels && request.type != "POPUP") 68 if ("openResource" in ext.devtools.panels && request.type != "POPUP")
67 { 69 {
68 urlElement.classList.add("resourceLink"); 70 urlElement.classList.add("resourceLink");
69 urlElement.addEventListener("click", function() 71 urlElement.addEventListener("click", function()
70 { 72 {
71 ext.devtools.panels.openResource(request.url); 73 ext.devtools.panels.openResource(request.url);
72 }); 74 }, false);
73 } 75 }
74 } 76 }
75 77
76 if (filter) 78 if (filter)
77 { 79 {
78 var filterElement = row.querySelector(".filter"); 80 var filterElement = row.querySelector(".filter");
79 var originElement = row.querySelector(".origin"); 81 var originElement = row.querySelector(".origin");
80 82
81 filterElement.textContent = filter.text; 83 filterElement.textContent = filter.text;
82 row.dataset.state = filter.whitelisted ? "whitelisted" : "blocked"; 84 row.dataset.state = filter.whitelisted ? "whitelisted" : "blocked";
(...skipping 19 matching lines...) Expand all
102 else 104 else
103 actionWrapper.appendChild(createActionButton("add", "Block item", generateFi lter(request))); 105 actionWrapper.appendChild(createActionButton("add", "Block item", generateFi lter(request)));
104 106
105 return row; 107 return row;
106 } 108 }
107 109
108 document.addEventListener("DOMContentLoaded", function() 110 document.addEventListener("DOMContentLoaded", function()
109 { 111 {
110 var container = document.getElementById("items"); 112 var container = document.getElementById("items");
111 var table = container.querySelector("tbody"); 113 var table = container.querySelector("tbody");
112 var template = document.querySelector("template").content.firstElementChild; 114 var template = document.querySelector("template").content.firstElementChild;
Thomas Greiner 2015/03/13 11:11:05 According to https://developer.mozilla.org/en-US/d
Sebastian Noack 2015/03/13 13:07:38 Again, with this change we drop support for Chrome
113 115
114 document.getElementById("reload").addEventListener("click", function() 116 document.getElementById("reload").addEventListener("click", function()
115 { 117 {
116 ext.devtools.inspectedWindow.reload(); 118 ext.devtools.inspectedWindow.reload();
117 }); 119 }, false);
118 120
119 document.getElementById("filter-state").addEventListener("change", function(ev ent) 121 document.getElementById("filter-state").addEventListener("change", function(ev ent)
120 { 122 {
121 container.dataset.filterState = event.target.value; 123 container.dataset.filterState = event.target.value;
122 }); 124 }, false);
123 125
124 document.getElementById("filter-type").addEventListener("change", function(eve nt) 126 document.getElementById("filter-type").addEventListener("change", function(eve nt)
125 { 127 {
126 container.dataset.filterType = event.target.value; 128 container.dataset.filterType = event.target.value;
127 }); 129 }, false);
128 130
129 ext.onMessage.addListener(function(message) 131 ext.onMessage.addListener(function(message)
130 { 132 {
131 switch (message.type) 133 switch (message.type)
132 { 134 {
133 case "add-record": 135 case "add-record":
134 table.appendChild(createRecord(message.request, message.filter, template )); 136 table.appendChild(createRecord(message.request, message.filter, template ));
135 break; 137 break;
136 138
137 case "update-record": 139 case "update-record":
138 var oldRow = table.getElementsByTagName("tr")[message.index]; 140 var oldRow = table.getElementsByTagName("tr")[message.index];
139 var newRow = createRecord(message.request, message.filter, template); 141 var newRow = createRecord(message.request, message.filter, template);
140 oldRow.parentNode.replaceChild(newRow, oldRow); 142 oldRow.parentNode.replaceChild(newRow, oldRow);
141 newRow.classList.add("changed"); 143 newRow.classList.add("changed");
142 container.classList.add("has-changes"); 144 container.classList.add("has-changes");
143 break; 145 break;
144 146
145 case "remove-record": 147 case "remove-record":
146 var row = table.getElementsByTagName("tr")[message.index]; 148 var row = table.getElementsByTagName("tr")[message.index];
147 row.parentNode.removeChild(row); 149 row.parentNode.removeChild(row);
148 container.classList.add("has-changes"); 150 container.classList.add("has-changes");
149 break; 151 break;
150 152
151 case "reset": 153 case "reset":
152 table.innerHTML = ""; 154 table.innerHTML = "";
153 container.classList.remove("has-changes"); 155 container.classList.remove("has-changes");
154 break; 156 break;
155 } 157 }
156 }); 158 });
157 }); 159 }, false);
Thomas Greiner 2015/03/13 11:11:05 We always explicitly set the third parameter when
Sebastian Noack 2015/03/13 13:07:38 Done.
LEFTRIGHT

Powered by Google App Engine
This is Rietveld