Fixed #1050.

YePpHa · Oct 24, 2014 · fb2ffb7 · fb2ffb7
1 parent ab186f3
commit fb2ffb7
Show file tree

Hide file tree

Showing 15 changed files with 21 additions and 15 deletions.
diff --git a/devbuild.number b/devbuild.number
@@ -1,3 +1,3 @@
 #Build Number for ANT. Do not edit!
-#Fri Oct 24 14:00:04 CEST 2014
-build.number=411
+#Fri Oct 24 14:24:38 CEST 2014
+build.number=412
diff --git a/dist/YouTubeCenter-webstore.zip b/dist/YouTubeCenter-webstore.zip
diff --git a/dist/YouTubeCenter.crx b/dist/YouTubeCenter.crx
diff --git a/dist/YouTubeCenter.meta.js b/dist/YouTubeCenter.meta.js
@@ -1,7 +1,7 @@
 // ==UserScript==
 // @name            YouTube Center Developer Build
 // @namespace       http://www.facebook.com/YouTubeCenter
-// @version         411
+// @version         412
 // @author          Jeppe Rune Mortensen (YePpHa)
 // @description     YouTube Center contains all kind of different useful functions which makes your visit on YouTube much more entertaining.
 // @icon            https://raw.github.com/YePpHa/YouTubeCenter/master/assets/logo-48x48.png

diff --git a/dist/YouTubeCenter.mxaddon b/dist/YouTubeCenter.mxaddon
diff --git a/dist/YouTubeCenter.oex b/dist/YouTubeCenter.oex
diff --git a/dist/YouTubeCenter.safariextension/Info.plist b/dist/YouTubeCenter.safariextension/Info.plist
@@ -13,7 +13,7 @@
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleShortVersionString</key>
-	<string>411</string>
+	<string>412</string>
 	<key>CFBundleVersion</key>
 	<string>116</string>
 	<key>Chrome</key>

diff --git a/dist/YouTubeCenter.safariextension/YouTubeCenter.user.js b/dist/YouTubeCenter.safariextension/YouTubeCenter.user.js
diff --git a/dist/YouTubeCenter.safariextz b/dist/YouTubeCenter.safariextz
diff --git a/dist/YouTubeCenter.user.js b/dist/YouTubeCenter.user.js
diff --git a/dist/YouTubeCenter.xpi b/dist/YouTubeCenter.xpi
diff --git a/dist/chrome-update.xml b/dist/chrome-update.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gupdate xmlns="http://www.google.com/update2/response" protocol="2.0">
   <app appid="ajijnmbjgaeekdpmpohgppkckmnagimk">
-    <updatecheck codebase="https://raw.github.com/YePpHa/YouTubeCenter/master/dist/YouTubeCenter.crx" version="411" />
+    <updatecheck codebase="https://raw.github.com/YePpHa/YouTubeCenter/master/dist/YouTubeCenter.crx" version="412" />
   </app>
 </gupdate>
diff --git a/dist/firefox-update.rdf b/dist/firefox-update.rdf
@@ -5,7 +5,7 @@
       <rdf:Seq>
         <rdf:li>
           <rdf:Description>
-            <em:version>411</em:version>
+            <em:version>412</em:version>
             <em:targetApplication>
               <rdf:Description>
                 <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>

diff --git a/src/.firefox/lib/request.js b/src/.firefox/lib/request.js
@@ -1,4 +1,4 @@
-var {callUnsafeJSObject} = require("utils");
+var {callUnsafeJSObject, isWindowClosed} = require("utils");
 
 function sendRequest(wrappedContentWin, chromeWin, sandbox, details) {
   let req = new chromeWin.XMLHttpRequest();
@@ -115,7 +115,13 @@ function addEventListener(wrappedContentWin, req, event, details){
         responseState.finalUrl = req.channel.URI.spec;
         break;
     }
-    callUnsafeJSObject(wrappedContentWin, details["on" + event], responseState);
+
+    if (isWindowClosed(wrappedContentWin)) return; /* The window is closed and therefore it should not be called! */
+
+    var eventCallback = details["on" + event];
+
+    new XPCNativeWrapper(wrappedContentWin, "setTimeout()")
+        .setTimeout(function(){ eventCallback.call(details, responseState) }, 0);
   }, false);
 }
 

diff --git a/src/YouTubeCenter.user.js b/src/YouTubeCenter.user.js
@@ -25002,7 +25002,7 @@
         addWindowListener(bind(null, callUnsafeWindow, data.id));
         break;
       case "firefox_windowLinkerFireRegisteredEvent":
-        windowLinkerFireRegisteredEvent.apply(null, data.arguments);
+        windowLinkerFireRegisteredEvent(data.arguments[0], data.arguments[1]);
         break;
       case "GM_registerMenuCommand":
         if (support.Greasemonkey) {