From a9d2d949c19af9cd82dc64b8bf67da155065c686 Mon Sep 17 00:00:00 2001
From: David Guilherme <davidlguilherme@gmail.com>
Date: Fri, 25 Sep 2015 16:11:53 -0300
Subject: [PATCH] Fixes a little bug

---
 safari.safariextension/Info.plist    |  6 +-----
 safari.safariextension/background.js | 11 +++++++----
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/safari.safariextension/Info.plist b/safari.safariextension/Info.plist
index afd7c2e..e17c777 100644
--- a/safari.safariextension/Info.plist
+++ b/safari.safariextension/Info.plist
@@ -19,7 +19,7 @@
 	<key>Chrome</key>
 	<dict>
 		<key>Database Quota</key>
-		<real>5242880</real>
+		<real>52428800</real>
 		<key>Global Page</key>
 		<string>global.html</string>
 	</dict>
@@ -27,10 +27,6 @@
 	<dict>
 		<key>Scripts</key>
 		<dict>
-			<key>End</key>
-			<array>
-				<string>scripts/delegator.js</string>
-			</array>
 			<key>Start</key>
 			<array>
 				<string>scripts/contextmenu.js</string>
diff --git a/safari.safariextension/background.js b/safari.safariextension/background.js
index b3466c0..55e13e6 100644
--- a/safari.safariextension/background.js
+++ b/safari.safariextension/background.js
@@ -1,5 +1,6 @@
 var popup = null;
 var selectedText = undefined;
+var appURL = safari.extension.baseURI + 'app/player/window.html';
 
 safari.application.addEventListener('contextmenu', function (event){
   var selectedText = event.userInfo;
@@ -21,14 +22,16 @@ safari.application.addEventListener('command', function (event){
     
     if (popup === null) {
       popup = safari.application.openBrowserWindow().activeTab;
-      popup.url = safari.extension.baseURI + 'app/player/window.html';
+      popup.url = appURL;
 
       popup.addEventListener('close', function () {
         popup = null;
       });
 
-      popup.addEventListener('navigate', function () {
-        popup = null;
+      popup.addEventListener('navigate', function (event) {
+        if (event.target.url !== appURL) {
+          popup = null;
+        }
       });
 
       popup.addEventListener('message', function (request) {
@@ -43,4 +46,4 @@ safari.application.addEventListener('command', function (event){
       selectedText = undefined;
     }
   }
-}, false);
\ No newline at end of file
+}, false);
--
libgit2 0.21.2