fix(AppBridge): Packet should only inherit value when sending to parent

bullhorn · Feb 16, 2018 · 95735cb · 95735cb
1 parent fa1adf8
commit 95735cb
Showing 1 changed file with 18 additions and 18 deletions.
diff --git a/src/AppBridge.ts b/src/AppBridge.ts
@@ -255,8 +255,6 @@ export class AppBridge {
      * @param packet any - packet of data to send with the open event
      */
     public openList(packet: Partial<IAppBridgeOpenListEvent>): Promise<boolean> {
-        let openListPacket = {};
-        Object.assign(openListPacket, { type: 'List', entityType: packet.type, keywords: packet.keywords, criteria: packet.criteria });
         return new Promise<boolean>((resolve, reject) => {
             if (this._handlers[AppBridgeHandler.OPEN_LIST]) {
                 this._handlers[AppBridgeHandler.OPEN_LIST](packet, (success: boolean) => {
@@ -267,6 +265,8 @@ export class AppBridge {
                     }
                 });
             } else {
+                let openListPacket = {};
+                Object.assign(openListPacket, { type: 'List', entityType: packet.type, keywords: packet.keywords, criteria: packet.criteria });        
                 postRobot.sendToParent(MESSAGE_TYPES.OPEN_LIST, packet).then((event) => {
                     this._trace(`${MESSAGE_TYPES.OPEN_LIST} (callback)`, event);
                     if (event.data) {
@@ -287,7 +287,6 @@ export class AppBridge {
      * @param packet any - packet of data to send with the close event
      */
     public update(packet: Partial<{ entityType: string, entityId: string, title: string, titleKey: string, color: string }>): Promise<boolean> {
-        Object.assign(packet, { id: this.id, windowName: this.windowName });
         return new Promise<boolean>((resolve, reject) => {
             if (this._handlers[AppBridgeHandler.UPDATE]) {
                 this._handlers[AppBridgeHandler.UPDATE](packet, (success: boolean) => {
@@ -298,6 +297,7 @@ export class AppBridge {
                     }
                 });
             } else {
+                Object.assign(packet, { id: this.id, windowName: this.windowName });
                 postRobot.sendToParent(MESSAGE_TYPES.UPDATE, packet).then((event) => {
                     this._trace(`${MESSAGE_TYPES.UPDATE} (callback)`, event);
                     if (event.data) {
@@ -316,20 +316,20 @@ export class AppBridge {
      * Fires or responds to an close event
      */
     public close(packet?: object): Promise<boolean> {
-        if (packet) {
-            console.info('[AppBridge] - close(packet) is deprecated! Please just use close()!'); // tslint:disable-line
-        }
-        let realPacket = { id: this.id, windowName: this.windowName };
         return new Promise<boolean>((resolve, reject) => {
             if (this._handlers[AppBridgeHandler.CLOSE]) {
-                this._handlers[AppBridgeHandler.CLOSE](realPacket, (success: boolean) => {
+                this._handlers[AppBridgeHandler.CLOSE](packet, (success: boolean) => {
                     if (success) {
                         resolve(true);
                     } else {
                         reject(false);
                     }
                 });
             } else {
+                if (packet) {
+                    console.info('[AppBridge] - close(packet) is deprecated! Please just use close()!'); // tslint:disable-line
+                }
+                let realPacket = { id: this.id, windowName: this.windowName };        
                 postRobot.sendToParent(MESSAGE_TYPES.CLOSE, realPacket).then((event) => {
                     this._trace(`${MESSAGE_TYPES.CLOSE} (callback)`, event);
                     if (event.data) {
@@ -348,20 +348,20 @@ export class AppBridge {
      * Fires or responds to an close event
      */
     public refresh(packet?: object): Promise<boolean> {
-        if (packet) {
-            console.info('[AppBridge] - refresh(packet) is deprecated! Please just use refresh()!'); // tslint:disable-line
-        }
-        let realPacket = { id: this.id, windowName: this.windowName };
         return new Promise<boolean>((resolve, reject) => {
             if (this._handlers[AppBridgeHandler.REFRESH]) {
-                this._handlers[AppBridgeHandler.REFRESH](realPacket, (success: boolean) => {
+                this._handlers[AppBridgeHandler.REFRESH](packet, (success: boolean) => {
                     if (success) {
                         resolve(true);
                     } else {
                         reject(false);
                     }
                 });
             } else {
+                if (packet) {
+                    console.info('[AppBridge] - refresh(packet) is deprecated! Please just use refresh()!'); // tslint:disable-line
+                }
+                let realPacket = { id: this.id, windowName: this.windowName };
                 postRobot.sendToParent(MESSAGE_TYPES.REFRESH, realPacket).then((event) => {
                     this._trace(`${MESSAGE_TYPES.REFRESH} (callback)`, event);
                     if (event.data) {
@@ -380,20 +380,20 @@ export class AppBridge {
      * Fires or responds to a pin event
      */
     public pin(packet?: object): Promise<boolean> {
-        if (packet) {
-            console.info('[AppBridge] - pin(packet) is deprecated! Please just use pin()!'); // tslint:disable-line
-        }
-        let realPacket = { id: this.id, windowName: this.windowName };
         return new Promise<boolean>((resolve, reject) => {
             if (this._handlers[AppBridgeHandler.PIN]) {
-                this._handlers[AppBridgeHandler.PIN](realPacket, (success: boolean) => {
+                this._handlers[AppBridgeHandler.PIN](packet, (success: boolean) => {
                     if (success) {
                         resolve(true);
                     } else {
                         reject(false);
                     }
                 });
             } else {
+                if (packet) {
+                    console.info('[AppBridge] - pin(packet) is deprecated! Please just use pin()!'); // tslint:disable-line
+                }
+                let realPacket = { id: this.id, windowName: this.windowName };        
                 postRobot.sendToParent(MESSAGE_TYPES.PIN, realPacket).then((event) => {
                     this._trace(`${MESSAGE_TYPES.PIN} (callback)`, event);
                     if (event.data) {