From 3fddfae15a7e34d2f8c32c0d58a5e644a4dc97e4 Mon Sep 17 00:00:00 2001 From: Jason Barnabe Date: Wed, 8 May 2013 22:10:08 -0500 Subject: [PATCH] issue 87 Update styles directly from userstyles.org --- install.js | 70 ++++++++++++++++++++++++++++++++++++++++++++++++--- manifest.json | 2 +- 2 files changed, 67 insertions(+), 5 deletions(-) diff --git a/install.js b/install.js index d44324e4..e82460c0 100644 --- a/install.js +++ b/install.js @@ -2,10 +2,53 @@ chrome.extension.sendMessage({method: "getStyles", url: getMeta("stylish-id-url" if (response.length == 0) { sendEvent("styleCanBeInstalledChrome"); } else { - sendEvent("styleAlreadyInstalledChrome"); + var installedStyle = response[0]; + // maybe an update is needed + getResource(getMeta("stylish-code-chrome"), function(code) { + // this would indicate a failure (a style with settings?). + if (code == null) { + sendEvent("styleCanBeUpdatedChrome"); + } + var json = JSON.parse(code); + if (json.sections.length == installedStyle.sections.length) { + if (json.sections.every(function(section) { + return installedStyle.sections.some(function(installedSection) { + return sectionsAreEqual(section, installedSection); + }); + })) { + // everything's the same + sendEvent("styleAlreadyInstalledChrome"); + return; + }; + } + sendEvent("styleCanBeUpdatedChrome"); + }); } }); +function sectionsAreEqual(a, b) { + if (a.code != b.code) { + return false; + } + return ["urls", "urlPrefixes", "domains", "regexps"].every(function(attribute) { + return arraysAreEqual(a[attribute], b[attribute]); + }); +} + +function arraysAreEqual(a, b) { + // treat empty array and undefined as equivalent + if (typeof a == "undefined") + return (typeof b == "undefined") || (b.length == 0); + if (typeof b == "undefined") + return (typeof a == "undefined") || (a.length == 0); + if (a.length != b.length) { + return false; + } + return a.every(function(entry) { + return b.indexOf(entry) != -1; + }); +} + function sendEvent(type) { var stylishEvent = document.createEvent("Events"); stylishEvent.initEvent(type, false, false, document.defaultView, null); @@ -28,6 +71,21 @@ document.addEventListener("stylishInstallChrome", function() { }); }, false); +document.addEventListener("stylishUpdateChrome", function() { + chrome.extension.sendMessage({method: "getStyles", url: getMeta("stylish-id-url") || location.href}, function(response) { + var style = response[0]; + if (confirm(chrome.i18n.getMessage('styleUpdate', [style.name]))) { + getResource(getMeta("stylish-code-chrome"), function(code) { + var json = JSON.parse(code); + chrome.extension.sendMessage({method: "saveStyle", id: style.id, sections: json.sections}, function() { + sendEvent("styleInstalledChrome"); + }); + }); + } + }); +}, false); + + function getMeta(name) { var e = document.querySelector("link[rel='" + name + "']"); return e ? e.getAttribute("href") : null; @@ -42,9 +100,13 @@ function getResource(url, callback) { } var xhr = new XMLHttpRequest(); xhr.onreadystatechange = function() { - if (xhr.readyState == 4 && callback) { - callback(xhr.responseText); - } + if (xhr.readyState == 4 && callback) { + if (xhr.status >= 400) { + callback(null); + } else { + callback(xhr.responseText); + } + } } if (url.length > 2000) { var parts = url.split("?"); diff --git a/manifest.json b/manifest.json index 4b7be8d0..e52c9e5e 100644 --- a/manifest.json +++ b/manifest.json @@ -24,7 +24,7 @@ "js": ["apply.js"] }, { - "matches": ["http://userstyles.org/*"], + "matches": ["http://userstyles.org/*", "http://userstyles.local/*"], "run_at": "document_end", "all_frames": false, "js": ["install.js"]