v0.46.54.1

andryou · andryou · commit 5c268dc9979b · 2016-05-19T15:14:06.000-04:00
- fixed issue where DP icon was showing it was enabled even when it
wasn't
- fixed situations where the default coffee cup DP icon would be shown
despite a custom icon being selected (e.g. creating a new tab)
diff --git a/changelog.txt b/changelog.txt
@@ -1,4 +1,6 @@
-v0.46.54 - Wednesday, May 18, 2016
+v0.46.54.1 - Thursday, May 19, 2016
+- 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)
 - improved whitelist/blacklist checks
 - tab cloak data now includes window IDs for guaranteed tab-specific cloaking
diff --git a/js/background.js b/js/background.js
@@ -292,25 +292,24 @@ function setDPIcon() {
 // ----- Request library to support content script communication
 chrome.tabs.onUpdated.addListener(function(tabid, changeinfo, tab) {
 	if (changeinfo.status == "loading") {
-		if (checkChrome(tab.url)) return;
 		dpTabId = tab.windowId+"|"+tabid;
 		dpcloakindex = cloakedTabs.indexOf(dpTabId);
-		dpuncloakindex = uncloakedTabs.indexOf(dpTabId);
 		enable = enabled(tab, dpcloakindex);
-		if (enable == "true") {
-			if (dpcloakindex == -1) cloakedTabs.push(dpTabId);
-			magician('true', tabid);
-			if (localStorage["global"] == "false" && localStorage["enable"] == "false") localStorage["enable"] = "true";
-		}
 		if (localStorage["showIcon"] == "true") {
-			if (enable) chrome.pageAction.setIcon({path: "img/addressicon/"+dpicon+".png", tabId: tabid});
+			if (enable == "true") chrome.pageAction.setIcon({path: "img/addressicon/"+dpicon+".png", tabId: tabid});
 			else chrome.pageAction.setIcon({path: "img/addressicon/"+dpicon+"-disabled.png", tabId: tabid});
 			chrome.pageAction.setTitle({title: dptitle, tabId: tabid});
 			chrome.pageAction.show(tabid);
 		} else chrome.pageAction.hide(tabid);
-		if (localStorage["enableStickiness"] == "true" && dpuncloakindex == -1) {
+		if (checkChrome(tab.url)) return;
+		if (enable == "true") {
+			if (dpcloakindex == -1) cloakedTabs.push(dpTabId);
+			magician('true', tabid);
+			if (localStorage["global"] == "false" && localStorage["enable"] == "false") localStorage["enable"] = "true";
+		}
+		if (localStorage["enableStickiness"] == "true") {
 			if (tab.openerTabId) {
-				if (cloakedTabs.indexOf(tab.windowId+"|"+tab.openerTabId) != -1) {
+				if (cloakedTabs.indexOf(tab.windowId+"|"+tab.openerTabId) != -1 && uncloakedTabs.indexOf(dpTabId) == -1) {
 					if (domainCheck(extractDomainFromURL(tab.url)) != '0') {
 						if (dpcloakindex == -1) cloakedTabs.push(dpTabId);
 						magician('true', tabid);
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"
+   "version": "0.46.54.1"
 }
diff --git a/updated.html b/updated.html
@@ -7,9 +7,11 @@
 <body id="updatepage">
 	<span id="title">Decreased Productivity</span> by Andrew Y.<br /><br />
 	<div id="main">
-	<h1>Updated to v0.46.54! (Wednesday, May 18, 2016)</h1>
+	<h1>Updated to v0.46.54.1! (Thursday, May 19, 2016)</h1>
 	<ul>
-		<li>v0.46.54:<ul>
+		<li>v0.46.54.1:<ul>
+			<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>
 			<li>improved whitelist/blacklist checks</li>
 			<li>tab cloak data now includes window IDs for guaranteed tab-specific cloaking</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"`
	`30`	`+ "version": "0.46.54.1"`
`31`	`31`	`}`