From a0353477d5bc1d99c32922dac4f67d14367e2981 Mon Sep 17 00:00:00 2001
From: darlin <duxiaodong@darlin.me>
Date: Fri, 3 Feb 2017 18:08:49 +0800
Subject: [PATCH 1/2] fix(http):fix jsonp callbackname is undefined

---
 .../http/src/backends/browser_jsonp.ts        | 20 +++++++------------
 modules/playground/src/jsonp/people.json      |  2 +-
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/modules/@angular/http/src/backends/browser_jsonp.ts b/modules/@angular/http/src/backends/browser_jsonp.ts
index 022431c13678..8deeb98b22d5 100644
--- a/modules/@angular/http/src/backends/browser_jsonp.ts
+++ b/modules/@angular/http/src/backends/browser_jsonp.ts
@@ -12,12 +12,10 @@ let _nextRequestId = 0;
 export const JSONP_HOME = '__ng_jsonp__';
 let _jsonpConnections: {[key: string]: any} = null;
 
-function _getJsonpConnections(): {[key: string]: any} {
-  const w: {[key: string]: any} = typeof window == 'object' ? window : {};
-  if (_jsonpConnections === null) {
-    _jsonpConnections = w[JSONP_HOME] = {};
-  }
-  return _jsonpConnections;
+const _global: {[key: string]: any} = typeof window == 'object' ? window : {};
+
+function _getJsonpCallbackName(id: string): string {
+  return `${JSONP_HOME}${id}_finished`;
 }
 
 // Make sure not to evaluate this in a non-browser environment!
@@ -32,17 +30,13 @@ export class BrowserJsonp {
 
   nextRequestID(): string { return `__req${_nextRequestId++}`; }
 
-  requestCallback(id: string): string { return `${JSONP_HOME}${id}_finished`; }
+  requestCallback(id: string): string { return _getJsonpCallbackName(id); }
 
   exposeConnection(id: string, connection: any): void {
-    const connections = _getJsonpConnections();
-    connections[id] = connection;
+    _global[_getJsonpCallbackName(id)] = connection.finished.bind(connection);
   }
 
-  removeConnection(id: string): void {
-    const connections = _getJsonpConnections();
-    connections[id] = null;
-  }
+  removeConnection(id: string): void { _global[_getJsonpCallbackName(id)] = null; }
 
   // Attach the <script> element to the DOM
   send(node: any): void { document.body.appendChild(<Node>(node)); }
diff --git a/modules/playground/src/jsonp/people.json b/modules/playground/src/jsonp/people.json
index 764beb25d73d..4206eb17cb16 100644
--- a/modules/playground/src/jsonp/people.json
+++ b/modules/playground/src/jsonp/people.json
@@ -1,2 +1,2 @@
 // This can only be requested once due to constant method name :(
-__ng_jsonp__.__req0.finished([{"name":"caitp"}])
+__ng_jsonp____req0_finished([{"name":"caitp"}])

From 4a7e6277ec0a5086834447cb4067a2de91693a06 Mon Sep 17 00:00:00 2001
From: darlin <duxiaodong@darlin.me>
Date: Fri, 3 Feb 2017 22:00:30 +0800
Subject: [PATCH 2/2] http: add jsonp callback name test

---
 modules/@angular/http/test/backends/jsonp_backend_spec.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/@angular/http/test/backends/jsonp_backend_spec.ts b/modules/@angular/http/test/backends/jsonp_backend_spec.ts
index 8a5c2b422eef..2d4dc1f7bd1e 100644
--- a/modules/@angular/http/test/backends/jsonp_backend_spec.ts
+++ b/modules/@angular/http/test/backends/jsonp_backend_spec.ts
@@ -70,10 +70,11 @@ export function main() {
       expect(instance).toBeAnInstanceOf(JSONPConnection);
     });
 
-    it('callback name should not contain dots', () => {
+    it('callback name should be a function name', () => {
+      const funcNameReg = /^[$A-Za-z_][$A-Za-z_\d]*$/i;
       const domJsonp = new MockBrowserJsonp();
       const callback: string = domJsonp.requestCallback(domJsonp.nextRequestID());
-      expect(callback.indexOf('.') === -1).toBeTruthy();
+      expect(funcNameReg.test(callback)).toBeTruthy();
     });
 
     describe('JSONPConnection', () => {