Some small improvements for buildbot extension

BUG=none
TEST=none

Patch from bmcquade@google.com
Original codereview: http://codereview.chromium.org/5707010/


Review URL: http://codereview.chromium.org/5953001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69415 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 23 insertions, 10 deletions

diff --git a/chrome/common/extensions/docs/examples/extensions/buildbot.zip b/chrome/common/extensions/docs/examples/extensions/buildbot.zip
index 1f738a4..a164605 100644
--- a/chrome/common/extensions/docs/examples/extensions/buildbot.zip
+++ b/chrome/common/extensions/docs/examples/extensions/buildbot.zip
diff --git a/chrome/common/extensions/docs/examples/extensions/buildbot/bg.html b/chrome/common/extensions/docs/examples/extensions/buildbot/bg.html
index 39dd344..dda276e 100644
--- a/chrome/common/extensions/docs/examples/extensions/buildbot/bg.html
+++ b/chrome/common/extensions/docs/examples/extensions/buildbot/bg.html
@@ -49,9 +49,14 @@ function requestURL(url, callback) {
   try {
     xhr.onreadystatechange = function(state) {
       if (xhr.readyState == 4) {
-        var text = xhr.responseText;
-        //console.log(text);
-        callback(text);
+        if (xhr.status == 200) {
+          var text = xhr.responseText;
+          //console.log(text);
+          callback(text);
+        } else {
+          chrome.browserAction.setBadgeText({text:"?"});
+          chrome.browserAction.setBadgeBackgroundColor({color:[0,0,255,255]});
+        }
       }
     }
 
diff --git a/chrome/common/extensions/docs/examples/extensions/buildbot/manifest.json b/chrome/common/extensions/docs/examples/extensions/buildbot/manifest.json
index 1acb250..baeca6d 100644
--- a/chrome/common/extensions/docs/examples/extensions/buildbot/manifest.json
+++ b/chrome/common/extensions/docs/examples/extensions/buildbot/manifest.json
@@ -1,6 +1,6 @@
 {
   "name": "Chromium Buildbot Monitor",
-  "version": "0.7.5",
+  "version": "0.7.6",
   "description": "Displays the status of the Chromium buildbot in the toolbar.  Click to see more detailed status in a popup.",
   "icons": { "128": "icon.png" },
   "background_page": "bg.html",
diff --git a/chrome/common/extensions/docs/examples/extensions/buildbot/popup.html b/chrome/common/extensions/docs/examples/extensions/buildbot/popup.html
index bc84d09..f89511a 100644
--- a/chrome/common/extensions/docs/examples/extensions/buildbot/popup.html
+++ b/chrome/common/extensions/docs/examples/extensions/buildbot/popup.html
@@ -17,7 +17,11 @@ function updateBotList(text) {
   }
   var data;
   try {
-    data = JSON.parse(results[1]);
+    // The build bot returns invalid JSON. Namely it uses single
+    // quotes and includes commas in some invalid locations. We have to
+    // run some regexps across the text to fix it up.
+    var jsonString = results[1].replace(/'/g, '"').replace(/},]/g,'}]');
+    data = JSON.parse(jsonString);
   } catch (e) {
     console.dir(e);
     console.log(text);
@@ -104,9 +108,13 @@ function requestURL(url, callback) {
   try {
     xhr.onreadystatechange = function(state) {
       if (xhr.readyState == 4) {
-        var text = xhr.responseText;
-        //console.log(text);
-        callback(text);
+        if (xhr.status == 200) {
+          var text = xhr.responseText;
+          //console.log(text);
+          callback(text);
+        } else {
+          bots.innerText = "Error.";
+        }
       }
     }
 
diff --git a/chrome/common/extensions/docs/examples/extensions/imageinfo.zip b/chrome/common/extensions/docs/examples/extensions/imageinfo.zip
index 1794d9c..cec9f93 100644
--- a/chrome/common/extensions/docs/examples/extensions/imageinfo.zip
+++ b/chrome/common/extensions/docs/examples/extensions/imageinfo.zip
diff --git a/chrome/common/extensions/docs/samples.json b/chrome/common/extensions/docs/samples.json
index 449046b..ede0c87 100644
--- a/chrome/common/extensions/docs/samples.json
+++ b/chrome/common/extensions/docs/samples.json
@@ -373,7 +373,7 @@
         "options.html", 
         "popup.html"
       ], 
-      "source_hash": "0cdd7f644ec0a3aa6eb46dc61f5c692762381b63", 
+      "source_hash": "c5bdc5d71550f76aeec82386e79a9da0fb267c42", 
       "zip_path": "examples/extensions/buildbot.zip"
     }, 
     {
@@ -913,7 +913,7 @@
         "info.html", 
         "manifest.json"
       ], 
-      "source_hash": "c746d9114348f4b414c1ec05e988e2807feb963a", 
+      "source_hash": "672f49ed8edbe0829c7ba5a1d890b4440b157991", 
       "zip_path": "examples/extensions/imageinfo.zip"
     }, 
     {