[Pkg-mozext-commits] [wot] 72/226: fixed #26 Don't mark-up links in editable content

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository wot.

commit 164811271658b59fc151d44b69137112a3559db5
Author: Sergey Andryukhin <sorgoz at yandex.com>
Date:   Tue Jan 29 16:47:49 2013 +0200

    fixed #26 Don't mark-up links in editable content
---
 content/config.js               |  2 +-
 content/injections/wot_proxy.js |  2 +-
 content/search.js               | 13 +++++++------
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/content/config.js b/content/config.js
index 5536111..d7232f8 100644
--- a/content/config.js
+++ b/content/config.js
@@ -19,7 +19,7 @@
 */
 
 const WOT_PLATFORM = "firefox";
-const WOT_VERSION  = "20130116";
+const WOT_VERSION  = "20130129";
 
 /*
  * Constants
diff --git a/content/injections/wot_proxy.js b/content/injections/wot_proxy.js
index 8102b44..67d690b 100644
--- a/content/injections/wot_proxy.js
+++ b/content/injections/wot_proxy.js
@@ -24,7 +24,7 @@
 * */
 
 var wot = {
-	version: "20130116",    // TODO: init this value from the add-on core code
+	version: "20130129",    // TODO: init this value from the add-on core code
 	platform: "firefox",
 	debug: false,           // when changing this, don't forget to switch ga_id value also!
 	default_component: 0,
diff --git a/content/search.js b/content/search.js
index 71d2670..27ae51d 100644
--- a/content/search.js
+++ b/content/search.js
@@ -821,8 +821,9 @@ var wot_search =
 			var offline = wot_browser.isoffline();
 
 			for (var i = 0; i < content.links.length; ++i) {
-				if (content.links[i].getAttribute(this.processed) ||
-						!content.links[i].parentNode) {
+				var link = content.links[i];
+				if (link.isContentEditable || link.getAttribute(this.processed) ||
+						!link.parentNode) {
 					continue; /* Process each link only once */
 				}
 
@@ -830,7 +831,7 @@ var wot_search =
 				var showrating = false;
 
 				if (rule && contentmatch) {
-					target = this.processrule(content.links[i], rule);
+					target = this.processrule(link, rule);
 				}
 
 				if (target) {
@@ -839,7 +840,7 @@ var wot_search =
 					/* Prefetch ratings for all links, not only if ratings are
 						shown */
 					target = wot_idn.utftoidn(
-								wot_url.gethostname(content.links[i].href));
+								wot_url.gethostname(link.href));
 				}
 
 				if (!target) {
@@ -854,10 +855,10 @@ var wot_search =
 				}
 
 				if (showrating) {
-					this.addrating(target, content, content.links[i], rule);
+					this.addrating(target, content, link, rule);
 				}
 
-				content.links[i].setAttribute(this.processed, true);
+				link.setAttribute(this.processed, true);
 			}
 
 			if (rule && contentmatch) {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/wot.git