Skip to content

Commit 5832802

Browse files
localjolocaljo
committed
switch to single quotes, shorten some lines, improve readability and other JSHint suggestions
1 parent efac0d6 commit 5832802

5 files changed

Lines changed: 73 additions & 65 deletions

File tree

‎.jshintrc‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,6 @@
1010
"quotmark": true,
1111
"trailing": true,
1212
"undef": true,
13-
"unused": true
13+
"unused": true,
14+
"node": true
1415
}

‎background.js‎

Lines changed: 26 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -7,26 +7,26 @@
77
var tabInspected;
88
var ports = [];
99
chrome.runtime.onConnect.addListener(function (port) {
10-
if (port.name !== "devtools") return;
11-
ports.push(port);
12-
port.onDisconnect.addListener(function () {
13-
var i = ports.indexOf(port);
14-
if (i !== -1) ports.splice(i, 1);
15-
});
16-
port.onMessage.addListener(function (msg) {
17-
console.log("Background.js Recieved Message", msg);
18-
processBackgroundIncomingMessage(msg);
19-
});
10+
if (port.name !== 'devtools') return;
11+
ports.push(port);
12+
port.onDisconnect.addListener(function () {
13+
var i = ports.indexOf(port);
14+
if (i !== -1) ports.splice(i, 1);
15+
});
16+
port.onMessage.addListener(function (msg) {
17+
console.log('Background.js Recieved Message', msg);
18+
processBackgroundIncomingMessage(msg);
19+
});
2020
});
2121

2222
chrome.tabs.onUpdated.addListener(function (tabId, changes) {
23-
if (tabId === tabInspected && changes.status === "complete") {
23+
if (tabId === tabInspected && changes.status === 'complete') {
2424
getJsonResource(tabId);
2525
}
2626
});
2727

2828
function processBackgroundIncomingMessage(msg) {
29-
console.log("Processing Message in Background", msg);
29+
console.log('Processing Message in Background', msg);
3030
if (msg.tabId) {
3131
tabInspected = msg.tabId;
3232
getJsonResource(tabInspected);
@@ -37,31 +37,35 @@ function processBackgroundIncomingMessage(msg) {
3737

3838
// Function to send a message to main.js
3939
function notifyDevtools(msg) {
40-
console.log("Background.js Sending Message", msg);
41-
ports.forEach(function (port) {
42-
port.postMessage(msg);
43-
});
40+
console.log('Background.js Sending Message', msg);
41+
ports.forEach(function (port) {
42+
port.postMessage(msg);
43+
});
4444
}
4545

4646
function getJsonResource(tabID) {
4747
chrome.tabs.get(tabID, function(tab) {
48-
var jsonResourceURL = tab.url+".json";
48+
var jsonResourceURL = tab.url+'.json';
4949
var xhr = new XMLHttpRequest();
50-
xhr.open("GET", jsonResourceURL, true);
50+
xhr.open('GET', jsonResourceURL, true);
5151
xhr.onreadystatechange = function() {
52-
var isSolidus = (xhr.getResponseHeader("X-Powered-By").substring(0, 7) === "Express");
53-
if (xhr.readyState === 4 && isSolidus) { // Check for completed Solidus response
52+
var isSolidus, errMsg;
53+
isSolidus = (xhr.getResponseHeader('X-Powered-By').match(/Express/i));
54+
if (xhr.readyState === 4 && isSolidus) { // Is complete Solidus response?
5455
if(xhr.status !== 200){ // Check that Solidus response didn't fail
55-
notifyDevtools(JSON.parse('{"error":"Failed to get Solidus page context."}'));
56+
errMsg = 'Failed to get Solidus context. Status: ' + xhr.status;
57+
notifyDevtools(JSON.parse('{"error":"' + errMsg + '"}'));
5658
} else {
5759
try {
60+
// Send Solidus JSON to devpanel
5861
notifyDevtools(JSON.parse(xhr.responseText));
5962
} catch (e) {
6063
notifyDevtools(JSON.parse('{"error":"' + e + '"}'));
6164
}
6265
}
6366
} else {
64-
notifyDevtools(JSON.parse('{"error":"Looks like you\'re not inspecting a Solidus Page."}'));
67+
errMsg = 'Looks like you\'re not inspecting a Solidus Page.';
68+
notifyDevtools(JSON.parse('{"error":"' + errMsg + '"}'));
6569
}
6670
};
6771
xhr.send();

‎main.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<!doctype html>
22
<html>
3-
<head>
4-
<script src="main.js"></script>
5-
</head>
6-
<body>
7-
</body>
3+
<head>
4+
<script src="main.js"></script>
5+
</head>
6+
<body>
7+
</body>
88
</html>

‎main.js‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -3,40 +3,40 @@
33
// chrome.devtools.*
44
// chrome.extension.*
55

6-
chrome.devtools.panels.create("Solidus", "solidus.png", "views/devpanel.html",
6+
chrome.devtools.panels.create('Solidus', 'solidus.png', 'views/devpanel.html',
77
function(panel){
88

9-
var _window;
10-
var data = [];
11-
var port = chrome.runtime.connect({name: "devtools"});
9+
var _window;
10+
var data = [];
11+
var port = chrome.runtime.connect({name: 'devtools'});
1212

13-
port.onMessage.addListener(function(msg) {
13+
port.onMessage.addListener(function(msg) {
1414

15-
console.log("Main.js Recieved Message", msg);
16-
// Send message to devpanel, if it exists.
17-
// If there is no panel yet, queue messages for later.
18-
if (_window) {
19-
_window.processMainIncomingMessage(msg);
20-
} else {
21-
data.push(msg);
22-
}
23-
});
15+
console.log('Main.js Recieved Message', msg);
16+
// Send message to devpanel, if it exists.
17+
// If there is no panel yet, queue messages for later.
18+
if (_window) {
19+
_window.processMainIncomingMessage(msg);
20+
} else {
21+
data.push(msg);
22+
}
23+
});
2424

25-
panel.onShown.addListener(function tmp(panelWindow) {
26-
panel.onShown.removeListener(tmp); // Only run first time
27-
_window = panelWindow;
25+
panel.onShown.addListener(function tmp(panelWindow) {
26+
panel.onShown.removeListener(tmp); // Only run first time
27+
_window = panelWindow;
2828

29-
var msg;
30-
while (msg === data) {
31-
msg = data.shift();
32-
_window.processMainIncomingMessage(msg);
33-
}
34-
_window.respond = function(msg) {
35-
console.log("Main.js Sending Message", msg);
36-
port.postMessage(msg);
37-
};
29+
var msg;
30+
while (msg === data) {
31+
msg = data.shift();
32+
_window.processMainIncomingMessage(msg);
33+
}
34+
_window.respond = function(msg) {
35+
console.log('Main.js Sending Message', msg);
36+
port.postMessage(msg);
37+
};
3838

39-
//Tell background.js which tab is being inspected
40-
panelWindow.respond(chrome.devtools.inspectedWindow);
41-
});
39+
//Tell background.js which tab is being inspected
40+
panelWindow.respond(chrome.devtools.inspectedWindow);
41+
});
4242
});

‎views/devpanel.js‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,32 +3,35 @@
33
// chrome.devtools.*
44
// chrome.extension.*
55

6+
// Tell JSHint that processMainIncomingMessage is definedhere but used elsewhere
7+
/* exported processMainIncomingMessage */
8+
69
var inspector;
710

811
function processMainIncomingMessage(msg) {
9-
console.log("Devpanel Processing Message", msg);
10-
if (msg.hasOwnProperty("page")) {
11-
displayMessage("Looks like a Solidus page!");
12+
console.log('Devpanel Processing Message', msg);
13+
if (msg.hasOwnProperty('page')) {
14+
displayMessage('Looks like a Solidus page!');
1215
//Check if there is an initialized InspectorJSON that hasn't been destroyed
1316
if ((inspector instanceof InspectorJSON) && (inspector.page)) {
1417
inspector.view(msg);
1518
} else {
1619
inspector = new InspectorJSON({
17-
element: "pagecontext",
20+
element: 'pagecontext',
1821
json: msg
1922
});
2023
}
21-
} else if (msg.hasOwnProperty("error")) {
24+
} else if (msg.hasOwnProperty('error')) {
2225
if (inspector instanceof InspectorJSON) {
2326
inspector.destroy();
2427
}
2528
displayMessage(msg.error);
2629
} else {
27-
console.log("Message Not Processed", msg);
30+
console.log('Message Not Processed', msg);
2831
}
2932
}
3033

3134
function displayMessage(msg) {
32-
document.querySelector("#messageholder").innerHTML = msg;
33-
console.log("Updated Panel With Message", msg);
35+
document.querySelector('#messageholder').innerHTML = msg;
36+
console.log('Updated Panel With Message', msg);
3437
}

0 commit comments

Comments
 (0)