fix issue Tencent#40, empty stack in window.onerror

stenders · Jun 20, 2016 · 5f866d4 · 5f866d4
1 parent ae5d4af
commit 5f866d4
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 14 deletions.
diff --git a/dist/vconsole.min.js b/dist/vconsole.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vconsole",
-  "version": "2.0.1",
+  "version": "2.0.2-pre",
   "description": "A lightweight, extendable front-end developer tool for mobile web page.",
   "homepage": "https://github.com/WechatFE/vConsole",
   "main": "dist/vconsole.min.js",

diff --git a/src/log/default.js b/src/log/default.js
@@ -15,6 +15,7 @@ class VConsoleDefaultTab extends VConsoleLogTab {
   constructor(...args) {
     super(...args);
     this.tplTabbox = tplTabbox;
+    this.windowOnError = null;
   }
 
   onReady() {
@@ -32,6 +33,31 @@ class VConsoleDefaultTab extends VConsoleLogTab {
     });
   }
 
+  /**
+   * replace window.console & window.onerror with vConsole method
+   * @private
+   */
+  mockConsole() {
+    super.mockConsole();
+    var that = this;
+    if (tool.isFunction(window.onerror)) {
+      this.windowOnError = window.onerror;
+    }
+    window.onerror = function(message, source, lineNo, colNo, error) {
+      let msg = message;
+      if (source) {
+        msg += "\n" + source.replace(location.origin, '');
+      }
+      if (lineNo || colNo) {
+        msg += ':' + lineNo + ':' + colNo;
+      }
+      that.printLog({logType:'error', logs:[msg], noOrigin:true});
+      if (tool.isFunction(that.windowOnError)) {
+        that.windowOnError.apply(window, message, source, lineNo, colNo, error);
+      }
+    };
+  }
+
   /**
    * 
    * @private

diff --git a/src/log/log.js b/src/log/log.js
@@ -83,7 +83,7 @@ class VConsoleLogTab extends VConsolePlugin {
   }
 
   /**
-   * replace window.console & window.onerror with vConsole method
+   * replace window.console with vConsole method
    * @private
    */
   mockConsole() {
@@ -102,13 +102,6 @@ class VConsoleLogTab extends VConsolePlugin {
     window.console.warn = function() { that.printLog({logType:'warn', logs:arguments}); };
     window.console.debug = function() { that.printLog({logType:'debug', logs:arguments}); };
     window.console.error = function() { that.printLog({logType:'error', logs:arguments}); };
-
-    window.onerror = function(message, source, lineNo, colNo, error) {
-      let stack = error.stack.split('at');
-      stack = stack[0] + ' ' + stack[1];
-      stack = stack.replace(location.origin, '');
-      console.error(stack);
-    };
   }
 
   clearLog() {
@@ -159,7 +152,9 @@ class VConsoleLogTab extends VConsolePlugin {
 
     if (!shouldBeHere) {
       // ignore this log and throw it to origin console
-      this.printOriginLog(item);
+      if (!item.noOrigin) {
+        this.printOriginLog(item);
+      }
       return;
     }
 
@@ -214,7 +209,9 @@ class VConsoleLogTab extends VConsolePlugin {
     });
 
     // print log to origin console
-    this.printOriginLog(item);
+    if (!item.noOrigin) {
+      this.printOriginLog(item);
+    }
   }
 
   /**

diff --git a/test/log.html b/test/log.html
@@ -19,6 +19,7 @@
     <a onclick="circularObject()" href="javascript:;" class="weui_btn weui_btn_default">circularObject</a>
     <a onclick="circularArray()" href="javascript:;" class="weui_btn weui_btn_default">circularArray</a>
     <a onclick="largeObject()" href="javascript:;" class="weui_btn weui_btn_default">largeObject</a>
+    <a onclick="windowError()" href="javascript:;" class="weui_btn weui_btn_default">window.error</a>
   </div>
 </body>
 </html>
@@ -79,4 +80,10 @@
   console.info('largeObject() End');
 }
 
+function windowError() {
+  console.info('windowError() Start');
+  a.b = 1;
+  console.info('windowError() End');
+}
+
 </script>