@@ -178,7 +178,7 @@ class MainContainerController extends ComponentController {
178178 createPopupWindow ( containerReference , url , windowName ) {
179179 let me = this ;
180180
181- Neo . Main . getWindowData ( ) . then ( winData => {
181+ Neo . Main . getWindowData ( { windowId : me . windowId } ) . then ( winData => {
182182 me . component . getDomRect ( me . getReference ( containerReference ) . id ) . then ( data => {
183183 let { height, left, top, width} = data ;
184184
@@ -189,6 +189,7 @@ class MainContainerController extends ComponentController {
189189 Neo . Main . windowOpen ( {
190190 url : `../sharedcovid/childapps/${ url } /index.html` ,
191191 windowFeatures : `height=${ height } ,left=${ left } ,top=${ top } ,width=${ width } ` ,
192+ windowId : me . windowId ,
192193 windowName
193194 } )
194195 } )
@@ -267,8 +268,9 @@ class MainContainerController extends ComponentController {
267268 * @param {String } data.appName
268269 */
269270 onAppConnect ( data ) {
270- let me = this ,
271- name = data . appName ,
271+ let me = this ,
272+ name = data . appName ,
273+ { windowId} = me ,
272274 style , toolbar , view ;
273275
274276 switch ( name ) {
@@ -286,19 +288,19 @@ class MainContainerController extends ComponentController {
286288 view = me . getReference ( 'gallery-container' ) ;
287289 NeoArray . remove ( me . mainTabs , 'gallery' ) ;
288290 me . activeMainTabIndex -- ;
289- Neo . Main . editRoute ( { mainview : me . mainTabs [ me . activeMainTabIndex ] } ) ;
291+ Neo . Main . editRoute ( { mainview : me . mainTabs [ me . activeMainTabIndex ] , windowId } ) ;
290292 break ;
291293 case 'SharedCovidHelix' :
292294 view = me . getReference ( 'helix-container' ) ;
293295 NeoArray . remove ( me . mainTabs , 'helix' ) ;
294296 me . activeMainTabIndex -- ;
295- Neo . Main . editRoute ( { mainview : me . mainTabs [ me . activeMainTabIndex ] } ) ;
297+ Neo . Main . editRoute ( { mainview : me . mainTabs [ me . activeMainTabIndex ] , windowId } ) ;
296298 break ;
297299 case 'SharedCovidMap' :
298300 view = me . getReference ( 'mapbox-gl-container' ) ;
299301 NeoArray . remove ( me . mainTabs , 'mapboxglmap' ) ;
300302 me . activeMainTabIndex -- ;
301- Neo . Main . editRoute ( { mainview : me . mainTabs [ me . activeMainTabIndex ] } ) ;
303+ Neo . Main . editRoute ( { mainview : me . mainTabs [ me . activeMainTabIndex ] , windowId } ) ;
302304 break ;
303305 }
304306
@@ -328,7 +330,8 @@ class MainContainerController extends ComponentController {
328330 switch ( name ) {
329331 case 'SharedCovid' :
330332 Neo . Main . windowClose ( {
331- names : me . connectedApps ,
333+ names : me . connectedApps ,
334+ windowId : me . windowId
332335 } ) ;
333336 break ;
334337 case 'SharedCovidChart' :
@@ -682,7 +685,8 @@ class MainContainerController extends ComponentController {
682685 */
683686 updateCountryField ( data ) {
684687 Neo . Main . editRoute ( {
685- country : data . record . country
688+ country : data . record . country ,
689+ windowId : this . windowId
686690 } )
687691 }
688692}
0 commit comments