Skip to content

Commit 5c268dc

Browse files
committed
v0.46.54.1
- 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)
1 parent 3ac76ce commit 5c268dc

File tree

4 files changed

+17
-14
lines changed

4 files changed

+17
-14
lines changed

changelog.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
v0.46.54 - Wednesday, May 18, 2016
1+
v0.46.54.1 - Thursday, May 19, 2016
2+
- v0.46.54.1 - fixed issue where DP icon was showing it was enabled even when it wasn't
3+
- 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)
24
- optimized foundation code (this is a significant update, too many to list: below are some of the major improvements)
35
- improved whitelist/blacklist checks
46
- tab cloak data now includes window IDs for guaranteed tab-specific cloaking

js/background.js

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -292,25 +292,24 @@ function setDPIcon() {
292292
// ----- Request library to support content script communication
293293
chrome.tabs.onUpdated.addListener(function(tabid, changeinfo, tab) {
294294
if (changeinfo.status == "loading") {
295-
if (checkChrome(tab.url)) return;
296295
dpTabId = tab.windowId+"|"+tabid;
297296
dpcloakindex = cloakedTabs.indexOf(dpTabId);
298-
dpuncloakindex = uncloakedTabs.indexOf(dpTabId);
299297
enable = enabled(tab, dpcloakindex);
300-
if (enable == "true") {
301-
if (dpcloakindex == -1) cloakedTabs.push(dpTabId);
302-
magician('true', tabid);
303-
if (localStorage["global"] == "false" && localStorage["enable"] == "false") localStorage["enable"] = "true";
304-
}
305298
if (localStorage["showIcon"] == "true") {
306-
if (enable) chrome.pageAction.setIcon({path: "img/addressicon/"+dpicon+".png", tabId: tabid});
299+
if (enable == "true") chrome.pageAction.setIcon({path: "img/addressicon/"+dpicon+".png", tabId: tabid});
307300
else chrome.pageAction.setIcon({path: "img/addressicon/"+dpicon+"-disabled.png", tabId: tabid});
308301
chrome.pageAction.setTitle({title: dptitle, tabId: tabid});
309302
chrome.pageAction.show(tabid);
310303
} else chrome.pageAction.hide(tabid);
311-
if (localStorage["enableStickiness"] == "true" && dpuncloakindex == -1) {
304+
if (checkChrome(tab.url)) return;
305+
if (enable == "true") {
306+
if (dpcloakindex == -1) cloakedTabs.push(dpTabId);
307+
magician('true', tabid);
308+
if (localStorage["global"] == "false" && localStorage["enable"] == "false") localStorage["enable"] = "true";
309+
}
310+
if (localStorage["enableStickiness"] == "true") {
312311
if (tab.openerTabId) {
313-
if (cloakedTabs.indexOf(tab.windowId+"|"+tab.openerTabId) != -1) {
312+
if (cloakedTabs.indexOf(tab.windowId+"|"+tab.openerTabId) != -1 && uncloakedTabs.indexOf(dpTabId) == -1) {
314313
if (domainCheck(extractDomainFromURL(tab.url)) != '0') {
315314
if (dpcloakindex == -1) cloakedTabs.push(dpTabId);
316315
magician('true', tabid);

manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,5 @@
2727
},
2828
"permissions": [ "http://*/*", "https://*/*", "contextMenus", "tabs" ],
2929
"update_url": "http://clients2.google.com/service/update2/crx",
30-
"version": "0.46.54"
30+
"version": "0.46.54.1"
3131
}

updated.html

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,11 @@
77
<body id="updatepage">
88
<span id="title">Decreased Productivity</span> by Andrew Y.<br /><br />
99
<div id="main">
10-
<h1>Updated to v0.46.54! (Wednesday, May 18, 2016)</h1>
10+
<h1>Updated to v0.46.54.1! (Thursday, May 19, 2016)</h1>
1111
<ul>
12-
<li>v0.46.54:<ul>
12+
<li>v0.46.54.1:<ul>
13+
<li>v0.46.54.1 - fixed issue where DP icon was showing it was enabled even when it wasn't</li>
14+
<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>
1315
<li>optimized foundation code (this is a significant update, too many to list: below are some of the major improvements)</li>
1416
<li>improved whitelist/blacklist checks</li>
1517
<li>tab cloak data now includes window IDs for guaranteed tab-specific cloaking</li>

0 commit comments

Comments
 (0)