added exception handling for un-cooperative iframes/frames such as Google Plus 1 button and Facebook like buttons (and cross domain iframes in general)

1 files changed, 10 insertions, 1 deletions

diff --git a/contexts/data/fiveui/injected/prelude.js b/contexts/data/fiveui/injected/prelude.js
index 06ac9bf..d03eb5e 100644
--- a/contexts/data/fiveui/injected/prelude.js
+++ b/contexts/data/fiveui/injected/prelude.js
@@ -75,8 +75,17 @@ fiveui.query = function (sel, context) {
 
   jQuery('iframe, frame', ctx).each(
     function(idx, elt) {
+      var $tempResults;
       if (elt.contentDocument) {
-        $results = $results.add(fiveui.query(sel, elt.contentDocument));
+        try {
+          $tempResults = fiveui.query(sel, elt.contentDocument);
+        } catch (e) {
+          console.log("encoutered a non-cooperative iframe/frame at " + $(elt).attr("src"));
+          console.log(e.toString());
+          $tempResults = [];
+        }
+
+        $results = $results.add($tempResults);
       }
     }
   );