From ae8683873a59d172dc96502f20b1955e6f7deff5 Mon Sep 17 00:00:00 2001
From: tophf <tophf@gmx.com>
Date: Sun, 26 Jul 2015 05:24:18 +0300
Subject: [PATCH] fixes for Chrome 31

---
 background.js   | 3 ++-
 edit.js         | 3 +++
 localization.js | 9 ++++++---
 storage.js      | 2 +-
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/background.js b/background.js
index 161b4221..655c52da 100644
--- a/background.js
+++ b/background.js
@@ -76,7 +76,7 @@ chrome.commands.onCommand.addListener(function(command) {
 
 // contextMenus API is present in ancient Chrome but it throws an exception
 // upon encountering the unsupported parameter value "browser_action", so we have to catch it.
-
+try {
 chrome.contextMenus.create({
 	id: "show-badge", title: chrome.i18n.getMessage("menuShowBadge"),
 	type: "checkbox", contexts: ["browser_action"], checked: prefs.getPref("show-badge")
@@ -85,6 +85,7 @@ chrome.contextMenus.create({
 	id: "disableAll", title: chrome.i18n.getMessage("disableAllStyles"),
 	type: "checkbox", contexts: ["browser_action"], checked: prefs.getPref("disableAll")
 }, function() { var clearError = chrome.runtime.lastError; });
+} catch(e) {}
 chrome.contextMenus.onClicked.addListener(function(info, tab) {
 	if (info.menuItemId == "disableAll") {
 		disableAllStylesToggle(info.checked);
diff --git a/edit.js b/edit.js
index 8e4b176e..d3c76588 100644
--- a/edit.js
+++ b/edit.js
@@ -58,6 +58,9 @@ var jumpToLineTemplate = t('editGotoLine') + ': <input class="CodeMirror-jump-fi
 	NodeList.prototype[method]= Array.prototype[method];
 });
 
+// Chrome pre-34
+Element.prototype.matches = Element.prototype.matches || Element.prototype.webkitMatchesSelector;
+
 // reroute handling to nearest editor when keypress resolves to one of these commands
 var commandsToReroute = {
 	save: true, jumpToLine: true, nextEditor: true, prevEditor: true,
diff --git a/localization.js b/localization.js
index 18fd9059..e758fdc2 100644
--- a/localization.js
+++ b/localization.js
@@ -35,13 +35,14 @@ function tNodeList(nodes) {
 		if (node.nodeType != 1) { // not an ELEMENT_NODE
 			continue;
 		}
-		for (var a = 0; a < node.attributes.length; a++) {
-			var name = node.attributes[a].nodeName;
+		for (var a = node.attributes.length - 1; a >= 0; a--) {
+			var attr = node.attributes[a];
+			var name = attr.nodeName;
 			if (name.indexOf("i18n-") != 0) {
 				continue;
 			}
 			name = name.substr(5); // "i18n-".length
-			var value = t(node.attributes[a].nodeValue);
+			var value = t(attr.nodeValue);
 			switch (name) {
 				case "text":
 					node.insertBefore(document.createTextNode(value), node.firstChild);
@@ -52,6 +53,7 @@ function tNodeList(nodes) {
 				default:
 					node.setAttribute(name, value);
 			}
+			node.removeAttributeNode(attr);
 		}
 	}
 }
@@ -69,5 +71,6 @@ function tDocLoader() {
 	observer.observe(document, {subtree: true, childList: true});
 	document.addEventListener("DOMContentLoaded", function() {
 		observer.disconnect();
+		tNodeList(document.querySelectorAll("*"));
 	});
 }
diff --git a/storage.js b/storage.js
index 44376022..62332718 100644
--- a/storage.js
+++ b/storage.js
@@ -271,7 +271,7 @@ function shallowCopy(obj) {
 }
 
 function equal(a, b) {
-	if (!a || !b || typeof a != "object") {
+	if (!a || !b || typeof a != "object" || typeof b != "object") {
 		return a === b;
 	}
 	if (Object.keys(a).length != Object.keys(b).length) {