Revert "Prevent postmessage from trapping exceptions. Fixes #9"

This reverts commit 74619a6.
daepark · Nov 10, 2011 · c7deb35 · c7deb35
1 parent 1989f6f
commit c7deb35
Showing 1 changed file with 34 additions and 18 deletions.
diff --git a/postmessage.js b/postmessage.js
@@ -237,16 +237,24 @@ var NO_JQUERY = {};
                          }
                          continue;
                      }
-                     function sendReply ( data ) {
-                       if (msg.callback) {
-                           pm.send({target:e.source, data:data, type:msg.callback});
-                       }
+                     try {
+                         function sendReply ( data ) {
+                           if (msg.callback) {
+                               pm.send({target:e.source, data:data, type:msg.callback});
+                           }
+                         }
+
+                         if ( o.callback ) {
+                           o.fn(msg.data, sendReply, e);
+                         } else {
+                           sendReply ( o.fn(msg.data, e) );
+                         }
                      }
-
-                     if ( o.callback ) {
-                       o.fn(msg.data, sendReply, e);
-                     } else {
-                       sendReply ( o.fn(msg.data, e) );
+                     catch (ex) {
+                         if (msg.errback) {
+                             // notify post message errback
+                             pm.send({target:e.source, data:ex, type:msg.errback});
+                         }
                      }
                  };
              }
@@ -373,16 +381,24 @@ var NO_JQUERY = {};
                              continue;
                          }
                      }
-                     function sendReply ( data ) {
-                       if (msg.callback) {
-                         pm.send({target:source_window, data:data, type:msg.callback, hash:true, url:hash.source.url});
-                       }
+                     try {
+                         function sendReply ( data ) {
+                           if (msg.callback) {
+                             pm.send({target:source_window, data:data, type:msg.callback, hash:true, url:hash.source.url});
+                           }
+                         }
+
+                         if ( o.callback ) {
+                           o.fn(msg.data, sendReply);
+                         } else {
+                           sendReply ( o.fn(msg.data) );
+                         }
                      }
-
-                     if ( o.callback ) {
-                       o.fn(msg.data, sendReply);
-                     } else {
-                       sendReply ( o.fn(msg.data) );
+                     catch (ex) {
+                         if (msg.errback) {
+                             // notify post message errback
+                             pm.send({target:source_window, data:ex, type:msg.errback, hash:true, url:hash.source.url});
+                         }
                      }
                  };
              }