Tweaked stickiness

andryou · andryou · commit e96085db313f · 2016-05-19T18:27:17.000-04:00
diff --git a/changelog.txt b/changelog.txt
@@ -1,5 +1,5 @@
-v0.46.54.3 - Thursday, May 19, 2016
-- v0.46.54.3 - "Stickiness" feature now applies when a bookmark is opened in the background while viewing a currently cloaked tab
+v0.46.54.4 - Thursday, May 19, 2016
+- v0.46.54.2-4 - "Stickiness" feature now applies when a bookmark is opened in the background while viewing a currently cloaked tab
 - v0.46.54.1 - fixed issue where DP icon was showing it was enabled even when it wasn't
 - v0.46.54.1 - fixed situations where the default coffee cup DP icon would be shown despite a custom icon being selected (e.g. creating a new tab)
 - optimized foundation code (this is a significant update, too many to list: below are some of the major improvements)
diff --git a/js/background.js b/js/background.js
@@ -308,21 +308,26 @@ chrome.tabs.onUpdated.addListener(function(tabid, changeinfo, tab) {
 			if (localStorage["global"] == "false" && localStorage["enable"] == "false") localStorage["enable"] = "true";
 		} else {
 			if (localStorage["enableStickiness"] == "true") {
+				dpuncloakindex = uncloakedTabs.indexOf(dpTabId);
 				if (tab.openerTabId) {
-					if (cloakedTabs.indexOf(tab.windowId+"|"+tab.openerTabId) != -1 && uncloakedTabs.indexOf(dpTabId) == -1) {
+					if (cloakedTabs.indexOf(tab.windowId+"|"+tab.openerTabId) != -1 && dpuncloakindex == -1) {
 						if (domainCheck(extractDomainFromURL(tab.url)) != '0') {
 							cloakedTabs.push(dpTabId);
 							magician('true', tabid);
-						} else uncloakedTabs.push(dpTabId);
+							return;
+						}
 					}
+					uncloakedTabs.push(dpTabId);
 				} else {
 					chrome.tabs.query({active: true, currentWindow: true}, function(tabs) {
-						if (tabs[0].windowId == tab.windowId && cloakedTabs.indexOf(tabs[0].windowId+"|"+tabs[0].id) != -1 && uncloakedTabs.indexOf(dpTabId) == -1) {
+						if (tabs[0].windowId == tab.windowId && cloakedTabs.indexOf(tabs[0].windowId+"|"+tabs[0].id) != -1 && dpuncloakindex == -1) {
 							if (domainCheck(extractDomainFromURL(tab.url)) != '0') {
 								cloakedTabs.push(dpTabId);
 								magician('true', tabid);
-							} else uncloakedTabs.push(dpTabId);
+								return;
+							}
 						}
+						uncloakedTabs.push(dpTabId);
 					});
 				}
 			}
diff --git a/manifest.json b/manifest.json
@@ -27,5 +27,5 @@
    },
    "permissions": [ "http://*/*", "https://*/*", "contextMenus", "tabs" ],
    "update_url": "http://clients2.google.com/service/update2/crx",
-   "version": "0.46.54.3"
+   "version": "0.46.54.4"
 }
diff --git a/updated.html b/updated.html
@@ -7,10 +7,10 @@
 <body id="updatepage">
 	<span id="title">Decreased Productivity</span> by Andrew Y.<br /><br />
 	<div id="main">
-	<h1>Updated to v0.46.54.3! (Thursday, May 19, 2016)</h1>
+	<h1>Updated to v0.46.54.4! (Thursday, May 19, 2016)</h1>
 	<ul>
-		<li>v0.46.54.2:<ul>
-			<li>v0.46.54.3 - "Stickiness" feature now applies when a bookmark is opened in the background while viewing a currently cloaked tab</li>
+		<li>v0.46.54.4:<ul>
+			<li>v0.46.54.2-4 - "Stickiness" feature now applies when a bookmark is opened in the background while viewing a currently cloaked tab</li>
 			<li>v0.46.54.1 - fixed issue where DP icon was showing it was enabled even when it wasn't</li>
 			<li>v0.46.54.1 - fixed situations where the default coffee cup DP icon would be shown despite a custom icon being selected (e.g. creating a new tab)</li>
 			<li>optimized foundation code (this is a significant update, too many to list: below are some of the major improvements)</li>

Original file line number	Diff line number	Diff line change
`@@ -27,5 +27,5 @@`
`27`	`27`	`},`
`28`	`28`	`"permissions": [ "http:///", "https:///", "contextMenus", "tabs" ],`
`29`	`29`	`"update_url": "http://clients2.google.com/service/update2/crx",`
`30`		`- "version": "0.46.54.3"`
	`30`	`+ "version": "0.46.54.4"`
`31`	`31`	`}`