fixup! Fix nwjs#7593: nw2 Window removing listeners on 'loaded' event

rogerwang · rogerwang · commit bf12d58458ab · 2020-10-17T20:55:18.000-06:00
diff --git a/src/resources/api_nw_newwin.js b/src/resources/api_nw_newwin.js
@@ -149,6 +149,7 @@ NWWindow.prototype.on = function (event, callback, record) {
   function wrap(cb) {
     var fn = (cb || callback).bind(self);
     fn.listener = callback;
+    fn.c_win_id = self.cWindow.id;
     callback.__nw_cb = fn;
     return fn;
   }
@@ -323,13 +324,17 @@ NWWindow.prototype.removeAllListeners = function (event) {
   }
   if (wrapEventsMapNewWin.hasOwnProperty(event)) {
     for (let l of chrome.windows[wrapEventsMapNewWin[event]].getListeners()) {
-      chrome.windows[wrapEventsMapNewWin[event]].removeListener(l);
+      if (l.c_win_id === this.cWindow.id) {
+        chrome.windows[wrapEventsMapNewWin[event]].removeListener(l);
+      }
     }
     return this;
   }
   if (event === 'loaded') {
     for (let l of chrome.tabs.onUpdated.getListeners()) {
-      chrome.tabs.onUpdated.removeListener(l);
+      if (l.c_win_id === this.cWindow.id) {
+        chrome.tabs.onUpdated.removeListener(l);
+      }
     }
     return this;
   }

Original file line number	Diff line number	Diff line change
`@@ -149,6 +149,7 @@ NWWindow.prototype.on = function (event, callback, record) {`
`149`	`149`	`function wrap(cb) {`
`150`	`150`	`var fn = (cb \|\| callback).bind(self);`
`151`	`151`	`fn.listener = callback;`
	`152`	`+ fn.c_win_id = self.cWindow.id;`
`152`	`153`	`callback.__nw_cb = fn;`
`153`	`154`	`return fn;`
`154`	`155`	`}`
`@@ -323,13 +324,17 @@ NWWindow.prototype.removeAllListeners = function (event) {`
`323`	`324`	`}`
`324`	`325`	`if (wrapEventsMapNewWin.hasOwnProperty(event)) {`
`325`	`326`	`for (let l of chrome.windows[wrapEventsMapNewWin[event]].getListeners()) {`
`326`		`- chrome.windows[wrapEventsMapNewWin[event]].removeListener(l);`
	`327`	`+ if (l.c_win_id === this.cWindow.id) {`
	`328`	`+ chrome.windows[wrapEventsMapNewWin[event]].removeListener(l);`
	`329`	`+ }`
`327`	`330`	`}`
`328`	`331`	`return this;`
`329`	`332`	`}`
`330`	`333`	`if (event === 'loaded') {`
`331`	`334`	`for (let l of chrome.tabs.onUpdated.getListeners()) {`
`332`		`- chrome.tabs.onUpdated.removeListener(l);`
	`335`	`+ if (l.c_win_id === this.cWindow.id) {`
	`336`	`+ chrome.tabs.onUpdated.removeListener(l);`
	`337`	`+ }`
`333`	`338`	`}`
`334`	`339`	`return this;`
`335`	`340`	`}`