Merge branch 'master' into socketio

NON-STANDARD-APIS.md

@@ -162,12 +162,20 @@ import 'zone.js/dist/zone-patch-rxjs';
 
 * electron
 
+In electron, we patched the following APIs with `zone.js`
+
+1. Browser API
+2. NodeJS
+3. Electorn Native API
+
 ## Usage.
 
-add following line into `polyfill.ts` after load zone-mix.
+add/update following line into `polyfill.ts`.
 
 ```
-import 'zone.js/dist/zone-patch-electron';
+//import 'zone.js/dist/zone'; // originally added by angular-cli, comment it out
+import 'zone.js/dist/zone-mix'; // add zone-mix to patch both Browser and Nodejs
+import 'zone.js/dist/zone-patch-electron'; // add zone-patch-electron to patch Electron native API
 ```
 
 there is a sample repo [zone-electron](https://github.com/JiaLiPassion/zone-electron) here
@@ -189,4 +197,3 @@ user need to patch `io` themselves just like following code.
 
 please reference the sample repo [zone-socketio](https://github.com/JiaLiPassion/zone-socketio) about 
 detail usage.
-

lib/common/to-string.ts

@@ -9,15 +9,14 @@ import {zoneSymbol} from './utils';
 
 // override Function.prototype.toString to make zone.js patched function
 // look like native function
-Zone.__load_patch('toString', (global: any, Zone: ZoneType) => {
+Zone.__load_patch('toString', (global: any) => {
   // patch Func.prototype.toString to let them look like native
-  const originalFunctionToString = (Zone as any)['__zone_symbol__originalToString'] =
-      Function.prototype.toString;
+  const originalFunctionToString = Function.prototype.toString;
 
   const ORIGINAL_DELEGATE_SYMBOL = zoneSymbol('OriginalDelegate');
   const PROMISE_SYMBOL = zoneSymbol('Promise');
   const ERROR_SYMBOL = zoneSymbol('Error');
-  Function.prototype.toString = function() {
+  const newFunctionToString = function toString() {
     if (typeof this === 'function') {
       const originalDelegate = this[ORIGINAL_DELEGATE_SYMBOL];
       if (originalDelegate) {
@@ -42,6 +41,8 @@ Zone.__load_patch('toString', (global: any, Zone: ZoneType) => {
     }
     return originalFunctionToString.apply(this, arguments);
   };
+  (newFunctionToString as any)[ORIGINAL_DELEGATE_SYMBOL] = originalFunctionToString;
+  Function.prototype.toString = newFunctionToString;
 
 
   // patch Object.prototype.toString to let them look like native

test/common/toString.spec.ts

@@ -36,6 +36,10 @@ describe('global function patch', () => {
       expect(Function.prototype.toString.call(Error)).toContain('[native code]');
     });
 
+    it('Function toString should look like native', () => {
+      expect(Function.prototype.toString.call(Function.prototype.toString)).toContain('[native code]');
+    });
+
     it('EventTarget addEventListener should look like native', ifEnvSupports('HTMLElement', () => {
          expect(Function.prototype.toString.call(HTMLElement.prototype.addEventListener))
              .toContain('[native code]');