Clean up JSHint errors and whitespace

Author: localjo

Gruntfile.js

@@ -15,7 +15,6 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-contrib-jshint');
   grunt.loadNpmTasks('grunt-contrib-nodeunit');
 
-  // Default task(s).
   grunt.registerTask('default', ['uglify']);
 
 };

background.js

@@ -3,6 +3,7 @@
 // Can use:
 // chrome.tabs.*
 // chrome.extension.*
+
 var tabInspected;
 var ports = [];
 chrome.runtime.onConnect.addListener(function (port) {
@@ -18,14 +19,14 @@ chrome.runtime.onConnect.addListener(function (port) {
     });
 });
 
-chrome.tabs.onUpdated.addListener(function (tabId, changes, tabObject) {
-  if (tabId == tabInspected && changes.status == "complete") {
+chrome.tabs.onUpdated.addListener(function (tabId, changes) {
+  if (tabId === tabInspected && changes.status === "complete") {
     getJsonResource(tabId);
   }
 });
 
 function processBackgroundIncomingMessage(msg) {
-  console.log("Processing Message in Background", msg)
+  console.log("Processing Message in Background", msg);
   if (msg.tabId) {
     tabInspected = msg.tabId;
     getJsonResource(tabInspected);
@@ -43,26 +44,26 @@ function notifyDevtools(msg) {
 }
 
 function getJsonResource(tabID) {
-  var pageContext;
   chrome.tabs.get(tabID, function(tab) {
     var jsonResourceURL = tab.url+".json";
     var xhr = new XMLHttpRequest();
     xhr.open("GET", jsonResourceURL, true);
     xhr.onreadystatechange = function() {
-      if (xhr.readyState === 4 && xhr.getResponseHeader("X-Powered-By").substring(0, 7) === "Solidus") {
-        if(xhr.status === 200){ //Check this separately so we can notify devtools if we don't get a 200 response.
+      var isSolidus = (xhr.getResponseHeader("X-Powered-By").substring(0, 7) === "Express");
+      if (xhr.readyState === 4 && isSolidus) { // Check for completed Solidus response
+        if(xhr.status !== 200){ // Check that Solidus response didn't fail
+          notifyDevtools(JSON.parse('{"error":"Failed to get Solidus page context."}'));
+        } else {
           try {
             notifyDevtools(JSON.parse(xhr.responseText));
           } catch  (e) {
             notifyDevtools(JSON.parse('{"error":"' + e + '"}'));
           }
-        } else {
-          notifyDevtools(JSON.parse('{"error":"Solidus Page Context Not Found!"}'));
         }
       } else {
         notifyDevtools(JSON.parse('{"error":"Looks like you\'re not inspecting a Solidus Page."}'));
       }
-    }
+    };
     xhr.send();
   });
 }

main.js

@@ -8,7 +8,7 @@ function(panel){
 
     var _window;
     var data = [];
-    var port = chrome.runtime.connect({name: 'devtools'});
+    var port = chrome.runtime.connect({name: "devtools"});
 
     port.onMessage.addListener(function(msg) {
 
@@ -27,14 +27,16 @@ function(panel){
       _window = panelWindow;
 
       var msg;
-      while (msg = data.shift()) {
+      while (msg === data) {
+        msg = data.shift();
         _window.processMainIncomingMessage(msg);
       }
       _window.respond = function(msg) {
         console.log("Main.js Sending Message", msg);
         port.postMessage(msg);
       };
 
+      //Tell background.js which tab is being inspected
       panelWindow.respond(chrome.devtools.inspectedWindow);
     });
 });

views/devpanel.js

@@ -1,5 +1,4 @@
 // Runs in the context of the DevTools panel
-//
 // Can use
 // chrome.devtools.*
 // chrome.extension.*
@@ -8,19 +7,18 @@ var inspector;
 
 function processMainIncomingMessage(msg) {
   console.log("Devpanel Processing Message", msg);
-  if (msg.hasOwnProperty('page')) {
+  if (msg.hasOwnProperty("page")) {
     displayMessage("Looks like a Solidus page!");
     //Check if there is an initialized InspectorJSON that hasn't been destroyed
     if ((inspector instanceof InspectorJSON) && (inspector.page)) {
       inspector.view(msg);
-    }
-    else {
+    } else {
       inspector = new InspectorJSON({
-        element: 'pagecontext',
+        element: "pagecontext",
         json: msg
       });
     }
-  } else if (msg.hasOwnProperty('error')) {
+  } else if (msg.hasOwnProperty("error")) {
     if (inspector instanceof InspectorJSON) {
       inspector.destroy();
     }
@@ -31,6 +29,6 @@ function processMainIncomingMessage(msg) {
 }
 
 function displayMessage(msg) {
-  document.querySelector('#messageholder').innerHTML = msg;
+  document.querySelector("#messageholder").innerHTML = msg;
   console.log("Updated Panel With Message", msg);
 }