[jsfm] add try catch for callback function and event handler (#1373)

apache · Jul 25, 2018 · cb22b8a · cb22b8a
1 parent a45c0ce
commit cb22b8a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/runtime/bridge/CallbackManager.js b/runtime/bridge/CallbackManager.js
@@ -76,7 +76,11 @@ export default class CallbackManager {
       delete this.callbacks[callbackId]
     }
     if (typeof callback === 'function') {
-      return callback(data)
+      try {
+        return callback.call(null, data)
+      } catch (error) {
+        console.error(`[JS Framework] Failed to execute the callback function:\n + ${error.toString()}`)
+      }
     }
     return new Error(`invalid callback id "${callbackId}"`)
   }

diff --git a/runtime/vdom/Element.js b/runtime/vdom/Element.js
@@ -450,11 +450,16 @@ export default class Element extends Node {
       event.stopPropagation = () => {
         isStopPropagation = true
       }
-      if (options && options.params) {
-        result = handler.call(this, ...options.params, event)
-      }
-      else {
-        result = handler.call(this, event)
+      try {
+        if (options && options.params) {
+          result = handler.call(this, ...options.params, event)
+        }
+        else {
+          result = handler.call(this, event)
+        }
+      } catch (error) {
+        console.error(`[JS Framework] Failed to invoke the event handler of "${type}" `
+          + `on ${this.type} (${this.ref}):\n ${error.toString()}`)
       }
     }