Fixed bug with multiple instances of button bar visible

Added icons and screen shots used for submissions to apple for directory
deasmi · Aug 23, 2010 · aada109 · aada109
1 parent ab3f112
commit aada109
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 5 deletions.
diff --git a/Builds/GoogleApps-2.1.1.safariextz b/Builds/GoogleApps-2.1.1.safariextz
diff --git a/GoogleApps.safariextension/100x100_logo.png b/GoogleApps.safariextension/100x100_logo.png
diff --git a/GoogleApps.safariextension/100x100_logo.pxm b/GoogleApps.safariextension/100x100_logo.pxm
diff --git a/GoogleApps.safariextension/Info.plist b/GoogleApps.safariextension/Info.plist
@@ -11,9 +11,9 @@
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.1</string>
+	<string>2.1.1</string>
 	<key>CFBundleVersion</key>
-	<string>2.1</string>
+	<string>2.1.1</string>
 	<key>Chrome</key>
 	<dict>
 		<key>Bars</key>

diff --git a/GoogleApps.safariextension/ScreenShot_425x275.png b/GoogleApps.safariextension/ScreenShot_425x275.png
diff --git a/GoogleApps.safariextension/global.html b/GoogleApps.safariextension/global.html
@@ -12,10 +12,14 @@
 function findBar()
 {
 	var bars = safari.extension.bars;
+	const activeBrowserWindow = safari.application.activeBrowserWindow;
+
     for (var i = 0; i < bars.length; ++i) {
-        if (bars[i].identifier !== "googleappsbar")
-            continue;
-		return bars[i];
+		var bar = bars[i];
+        if (bar.identifier === "googleappsbar" && bar.browserWindow === activeBrowserWindow)
+		{
+				return bars[i];
+		}
 	}
 	return 0;
 }

diff --git a/GoogleApps.safariextz b/GoogleApps.safariextz