@@ -55,9 +55,7 @@ var appWinEventsMap = {
55
55
'maximize' : 'onMaximized' ,
56
56
'restore' : 'onRestored' ,
57
57
'enter-fullscreen' : 'onFullscreened' ,
58
- 'closed' : 'onClosed' ,
59
- 'move' : 'onMoved' ,
60
- 'resize' : 'onResized'
58
+ 'closed' : 'onClosed'
61
59
} ;
62
60
63
61
var nwWinEventsMap = {
@@ -72,8 +70,10 @@ var nwWrapEventsMap = {
72
70
} ;
73
71
74
72
var wrapEventsMapNewWin = {
75
- 'focus' : 'onFocusChanged' ,
76
- 'blur' : 'onFocusChanged'
73
+ 'resize' : 'onResize' ,
74
+ 'move' : 'onMove' ,
75
+ 'focus' : 'onFocusChanged' ,
76
+ 'blur' : 'onFocusChanged'
77
77
} ;
78
78
79
79
nw_internal . registerCustomHook ( function ( bindingsAPI ) {
@@ -239,17 +239,21 @@ NWWindow.prototype.on = function (event, callback, record) {
239
239
this . onNavigation . addListener ( j ) ;
240
240
break ;
241
241
case 'move' :
242
- var k = wrap ( function ( ) {
243
- callback . call ( self , self . x , self . y ) ;
242
+ var k = wrap ( function ( w ) {
243
+ if ( w . id != self . cWindow . id )
244
+ return ;
245
+ callback . call ( self , w . left , w . top ) ;
244
246
} ) ;
245
- this . appWindow . onMoved . addListener ( k ) ;
247
+ chrome . windows . onMove . addListener ( k ) ;
246
248
return this ; //return early
247
249
break ;
248
250
case 'resize' :
249
- var l = wrap ( function ( ) {
250
- callback . call ( self , self . width , self . height ) ;
251
+ var l = wrap ( function ( w ) {
252
+ if ( w . id != self . cWindow . id )
253
+ return ;
254
+ callback . call ( self , w . width , w . height ) ;
251
255
} ) ;
252
- this . appWindow . onResized . addListener ( l ) ;
256
+ chrome . windows . onResize . addListener ( l ) ;
253
257
return this ; //return early
254
258
break ;
255
259
}
0 commit comments