From 9e5617e41e222d29c3952ba71a401804030cd153 Mon Sep 17 00:00:00 2001
From: Dzmitry Shylovich <Dzmitry_Shylovich@epam.com>
Date: Sat, 3 Dec 2016 21:42:38 +0300
Subject: [PATCH] fix(http): remove dots from jsonp callback name (#13219)

PR Close #13219
---
 modules/@angular/http/src/backends/browser_jsonp.ts    | 10 +++++-----
 .../@angular/http/test/backends/jsonp_backend_spec.ts  |  5 +++++
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/modules/@angular/http/src/backends/browser_jsonp.ts b/modules/@angular/http/src/backends/browser_jsonp.ts
index 2734836afc..022431c136 100644
--- a/modules/@angular/http/src/backends/browser_jsonp.ts
+++ b/modules/@angular/http/src/backends/browser_jsonp.ts
@@ -32,23 +32,23 @@ export class BrowserJsonp {
 
   nextRequestID(): string { return `__req${_nextRequestId++}`; }
 
-  requestCallback(id: string): string { return `${JSONP_HOME}.${id}.finished`; }
+  requestCallback(id: string): string { return `${JSONP_HOME}${id}_finished`; }
 
-  exposeConnection(id: string, connection: any) {
+  exposeConnection(id: string, connection: any): void {
     const connections = _getJsonpConnections();
     connections[id] = connection;
   }
 
-  removeConnection(id: string) {
+  removeConnection(id: string): void {
     const connections = _getJsonpConnections();
     connections[id] = null;
   }
 
   // Attach the <script> element to the DOM
-  send(node: any) { document.body.appendChild(<Node>(node)); }
+  send(node: any): void { document.body.appendChild(<Node>(node)); }
 
   // Remove <script> element from the DOM
-  cleanup(node: any) {
+  cleanup(node: any): void {
     if (node.parentNode) {
       node.parentNode.removeChild(<Node>(node));
     }
diff --git a/modules/@angular/http/test/backends/jsonp_backend_spec.ts b/modules/@angular/http/test/backends/jsonp_backend_spec.ts
index 81b5ce6373..8a5c2b422e 100644
--- a/modules/@angular/http/test/backends/jsonp_backend_spec.ts
+++ b/modules/@angular/http/test/backends/jsonp_backend_spec.ts
@@ -70,6 +70,11 @@ export function main() {
       expect(instance).toBeAnInstanceOf(JSONPConnection);
     });
 
+    it('callback name should not contain dots', () => {
+      const domJsonp = new MockBrowserJsonp();
+      const callback: string = domJsonp.requestCallback(domJsonp.nextRequestID());
+      expect(callback.indexOf('.') === -1).toBeTruthy();
+    });
 
     describe('JSONPConnection', () => {
       it('should use the injected BaseResponseOptions to create the response',