Use JSON Resource to Determine if Page is Solidus

localjo · localjo · commit 5b2761fe2962 · 2014-06-24T11:44:39.000-04:00
If not a Solidus page, InspectorJSON will not be initialized and any
existing InspectorJSON instances are destroyed.
diff --git a/background.js b/background.js
@@ -42,17 +42,22 @@ function notifyDevtools(msg) {
 }
 
 function getJsonResource(tabID) {
+  var pageContext;
   chrome.tabs.get(tabID, function(tab) {
-    //Before doing this, we should check if it is a Solidus tab
     var jsonResourceURL = tab.url+".json";
     var xhr = new XMLHttpRequest();
     xhr.open("GET", jsonResourceURL, true);
     xhr.onreadystatechange = function() {
       if (xhr.readyState === 4){
         if(xhr.status === 200){
-          notifyDevtools(xhr.responseText);
-        } else { //This isn't quite right, because it fires when it shouldnt
-          notifyDevtools("Bad Response");
+          try {
+            pageContext = JSON.parse(xhr.responseText);
+            notifyDevtools(pageContext);
+          } catch  (e) {
+            notifyDevtools(JSON.parse('{"error":"' + e + '"}'));
+          }
+        } else {
+          notifyDevtools(JSON.parse('{"error":"No Solidus Page Context Found"}'));
         }
       }
     }
diff --git a/views/devpanel.html b/views/devpanel.html
@@ -6,8 +6,7 @@
   <link href="../inspector-json/inspector-json.css" media="all" rel="stylesheet" type="text/css">
 </head>
 <body>
-  <h2>Page Context</h2>
-  <div id="pagecontext"></div>
   <div id="messageholder"></div>
+  <div id="pagecontext"></div>
 </body>
 </html>
diff --git a/views/devpanel.js b/views/devpanel.js
@@ -4,32 +4,30 @@
 // chrome.devtools.*
 // chrome.extension.*
 
+var inspector;
+
 function processMainIncomingMessage(msg) {
   console.log("Devpanel Processing Message", msg);
-  var msgJson = 0;
-  try {
-    msgJson = JSON.parse(msg); //This doesn't work if it's not a JSON string
-  } catch  (e) {
-    console.log("Ooops, the message wasnt a JSON string");
-  }
- if (msgJson.hasOwnProperty('page')) {
-    console.log("Message contains page object!");
-    updateInspectorJSON(msg);
-  } else if (msg === "Bad Response") {
-    displayMessage("This isnt what we need");
-  } else {
-    console.log("Ooops!", msg.page);
-  }
-}
-
-function updateInspectorJSON(msg) {
-    if(!inspector) {
-        var inspector = new InspectorJSON({
-          element: 'pagecontext',
-          json: '{"hello":"world"}'
+  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 {
+      inspector = new InspectorJSON({
+        element: 'pagecontext',
+        json: msg
       });
     }
-    inspector.view(msg);
+  } else if (msg.hasOwnProperty('error')) {
+    if (inspector instanceof InspectorJSON) {
+      inspector.destroy();
+    }
+    displayMessage(msg.error);
+  } else {
+    console.log("Message Not Processed", msg);
+  }
 }
 
 function displayMessage(msg) {
