Merge pull request #87 from tophf/disable-all-styles-fix

Disable all styles fix
This commit is contained in:
Jason Barnabe 2015-03-25 09:33:42 -05:00
commit 94b586a243
6 changed files with 59 additions and 9 deletions

View File

@ -112,6 +112,10 @@
"message": "Restyle the web with Stylish, a user styles manager. Stylish lets you easily install themes and skins for many popular sites.", "message": "Restyle the web with Stylish, a user styles manager. Stylish lets you easily install themes and skins for many popular sites.",
"description": "Extension description" "description": "Extension description"
}, },
"disableAllStyles": {
"message": "Turn all styles off",
"description": "Label for the checkbox that turns all enabled styles off."
},
"disableStyleLabel": { "disableStyleLabel": {
"message": "Disable", "message": "Disable",
"description": "Label for the button to disable a style" "description": "Label for the button to disable a style"

View File

@ -14,9 +14,7 @@ chrome.extension.onMessage.addListener(function(request, sender, sendResponse) {
} }
break; break;
case "styleApply": case "styleApply":
for (var styleId in request.styles) { applyStyles(request.styles);
applySections(styleId, request.styles[styleId]);
}
break; break;
case "styleReplaceAll": case "styleReplaceAll":
replaceAll(request.styles, document); replaceAll(request.styles, document);
@ -24,9 +22,30 @@ chrome.extension.onMessage.addListener(function(request, sender, sendResponse) {
case "realURL": case "realURL":
sendResponse(location.href); sendResponse(location.href);
break; break;
case "styleDisableAll":
disableAll(request.disableAll);
break;
} }
}); });
var g_disableAll = false;
function disableAll(disable) {
if (!disable === !g_disableAll) return;
g_disableAll = disable;
disableSheets(g_disableAll, document);
function disableSheets(disable, doc) {
Array.prototype.forEach.call(doc.styleSheets, function(stylesheet) {
if (stylesheet.ownerNode.classList.contains("stylish")) {
stylesheet.disabled = disable;
}
});
getDynamicIFrames(doc).forEach(function(iframe) {
disableSheets(disable, iframe.contentDocument);
});
}
}
function removeStyle(id, doc) { function removeStyle(id, doc) {
var e = doc.getElementById("stylish-" + id); var e = doc.getElementById("stylish-" + id);
if (e) { if (e) {
@ -38,6 +57,11 @@ function removeStyle(id, doc) {
} }
function applyStyles(styleHash) { function applyStyles(styleHash) {
if ("disableAll" in styleHash) {
disableAll(styleHash.disableAll);
delete styleHash.disableAll;
}
for (var styleId in styleHash) { for (var styleId in styleHash) {
applySections(styleId, styleHash[styleId]); applySections(styleId, styleHash[styleId]);
} }
@ -66,7 +90,8 @@ function applySections(styleId, sections) {
} }
function addStyleElement(styleElement, doc) { function addStyleElement(styleElement, doc) {
doc.documentElement.appendChild(doc.importNode(styleElement, true)); doc.documentElement.appendChild(doc.importNode(styleElement, true))
.disabled = g_disableAll;
getDynamicIFrames(doc).forEach(function(iframe) { getDynamicIFrames(doc).forEach(function(iframe) {
addStyleElement(styleElement, iframe.contentDocument); addStyleElement(styleElement, iframe.contentDocument);
}); });
@ -110,7 +135,8 @@ var iframeObserver = new MutationObserver(function(mutations) {
Array.prototype.filter.call(mutation.addedNodes, function(node) { return "IFRAME" === node.tagName; }).filter(iframeIsDynamic).forEach(function(iframe) { Array.prototype.filter.call(mutation.addedNodes, function(node) { return "IFRAME" === node.tagName; }).filter(iframeIsDynamic).forEach(function(iframe) {
var doc = iframe.contentDocument; var doc = iframe.contentDocument;
styles.forEach(function(style) { styles.forEach(function(style) {
doc.documentElement.appendChild(doc.importNode(style, true)); doc.documentElement.appendChild(doc.importNode(style, true))
.disabled = g_disableAll;
}); });
}); });
}); });

View File

@ -14,6 +14,7 @@ function webNavigationListener(method, data) {
chrome.tabs.sendMessage(data.tabId, {method: method, styles: styleHash}); chrome.tabs.sendMessage(data.tabId, {method: method, styles: styleHash});
// Don't show the badge for frames // Don't show the badge for frames
if (data.frameId == 0 && prefs.getPref("show-badge")) { if (data.frameId == 0 && prefs.getPref("show-badge")) {
delete styleHash.disableAll;
chrome.browserAction.setBadgeText({text: getBadgeText(Object.keys(styleHash)), tabId: data.tabId}); chrome.browserAction.setBadgeText({text: getBadgeText(Object.keys(styleHash)), tabId: data.tabId});
} }
}); });
@ -49,7 +50,7 @@ function getStyles(options, callback) {
var asHash = "asHash" in options ? options.asHash : false; var asHash = "asHash" in options ? options.asHash : false;
var callCallback = function() { var callCallback = function() {
var styles = asHash ? {} : []; var styles = asHash ? {disableAll: prefs.getPref("disableAll", false)} : [];
cachedStyles.forEach(function(style) { cachedStyles.forEach(function(style) {
if (enabled != null && fixBoolean(style.enabled) != enabled) { if (enabled != null && fixBoolean(style.enabled) != enabled) {
return; return;

View File

@ -42,6 +42,9 @@
#installed { #installed {
margin-top: 0.5em; margin-top: 0.5em;
} }
#installed.disabled {
opacity: 0.5;
}
body > .actions { body > .actions {
margin-top: 0.5em; margin-top: 0.5em;
} }
@ -49,6 +52,9 @@
.actions > div, #unavailable { .actions > div, #unavailable {
margin-bottom: 0.75em; margin-bottom: 0.75em;
} }
.actions input, .actions label {
vertical-align: middle;
}
#unavailable { #unavailable {
border: none; border: none;
@ -120,6 +126,10 @@
<div id="installed"></div> <div id="installed"></div>
<div class="actions"> <div class="actions">
<div id="disable-all-wrapper">
<input id="disableAll" type="checkbox">
<label id="disableAll-label" for="disableAll"></label>
</div>
<div id="find-styles"><a id="find-styles-link" href="#"></a></div> <div id="find-styles"><a id="find-styles-link" href="#"></a></div>
<div id="manage-styles"><a id="open-manage-link" href="manage.html"></a></div> <div id="manage-styles"><a id="open-manage-link" href="manage.html"></a></div>
<div id="write-style"><span id="write-style-for"></span></div> <div id="write-style"><span id="write-style-for"></span></div>

View File

@ -25,6 +25,7 @@ function updatePopUp(url) {
if (!urlWillWork) { if (!urlWillWork) {
document.body.classList.add("blocked"); document.body.classList.add("blocked");
tE("unavailable", "stylishUnavailableForURL"); tE("unavailable", "stylishUnavailableForURL");
return;
} }
chrome.extension.sendMessage({method: "getStyles", matchUrl: url}, showStyles); chrome.extension.sendMessage({method: "getStyles", matchUrl: url}, showStyles);
@ -184,7 +185,14 @@ function handleDelete(id) {
tE("open-manage-link", "openManage"); tE("open-manage-link", "openManage");
tE("write-style-for", "writeStyleFor"); tE("write-style-for", "writeStyleFor");
tE("find-styles-link", "findStylesForSite"); tE("find-styles-link", "findStylesForSite");
tE("disableAll-label", "disableAllStyles");
["find-styles-link", "open-manage-link"].forEach(function(id) { ["find-styles-link", "open-manage-link"].forEach(function(id) {
document.getElementById(id).addEventListener("click", openLink, false); document.getElementById(id).addEventListener("click", openLink, false);
}); });
loadPrefs({"disableAll": false})
document.getElementById("disableAll").addEventListener("change", function(event) {
document.getElementById("installed").classList.toggle("disabled", event.target.checked);
notifyAllTabs({method: "styleDisableAll", disableAll: event.target.checked});
});

View File

@ -162,6 +162,7 @@ var prefs = {
// defaults // defaults
"openEditInWindow": false, // new editor opens in a own browser window "openEditInWindow": false, // new editor opens in a own browser window
"show-badge": true, // display text on popup menu icon "show-badge": true, // display text on popup menu icon
"disableAll": false, // boss key
"popup.breadcrumbs": true, // display "New style" links as URL breadcrumbs "popup.breadcrumbs": true, // display "New style" links as URL breadcrumbs
"popup.breadcrumbs.usePath": false, // use URL path for "this URL" "popup.breadcrumbs.usePath": false, // use URL path for "this URL"