From 8ee24cf5faca0afd738041bcca1ec6f00b838df4 Mon Sep 17 00:00:00 2001
From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?=
 <bombe@pterodactylus.net>
Date: Tue, 13 Sep 2011 06:19:53 +0200
Subject: [PATCH] Rename ID of Sone in menu to avoid conflict with page-level
 Sone ID.

---
 src/main/resources/static/javascript/sone.js       | 6 +++---
 src/main/resources/templates/include/soneMenu.html | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/static/javascript/sone.js b/src/main/resources/static/javascript/sone.js
index ca80b48..f6327e4 100644
--- a/src/main/resources/static/javascript/sone.js
+++ b/src/main/resources/static/javascript/sone.js
@@ -291,7 +291,7 @@ function getSoneElement(element) {
  * @return The Sone ID
  */
 function getMenuSone(element) {
-	return $(element).closest(".sone-menu").find(".sone-id").text();
+	return $(element).closest(".sone-menu").find(".sone-menu-id").text();
 }
 
 /**
@@ -865,7 +865,7 @@ function ajaxifyPost(postElement) {
 		return false;
 	});
 	(function(postElement) {
-		var soneId = $(".sone-id", postElement).text();
+		var soneId = $(".sone-menu-id", postElement).text();
 		$(".sone-post-menu .follow", postElement).click(function() {
 			var followElement = this;
 			ajaxGet("followSone.ajax", { "sone": soneId, "formPassword": getFormPassword() }, function() {
@@ -995,7 +995,7 @@ function ajaxifyReply(replyElement) {
 		return false;
 	});
 	(function(replyElement) {
-		var soneId = $(".sone-id", replyElement).text();
+		var soneId = $(".sone-menu-id", replyElement).text();
 		$(".sone-menu .follow", replyElement).click(function() {
 			var followElement = this;
 			ajaxGet("followSone.ajax", { "sone": soneId, "formPassword": getFormPassword() }, function() {
diff --git a/src/main/resources/templates/include/soneMenu.html b/src/main/resources/templates/include/soneMenu.html
index 49237ba..db1e67c 100644
--- a/src/main/resources/templates/include/soneMenu.html
+++ b/src/main/resources/templates/include/soneMenu.html
@@ -1,5 +1,5 @@
 <div class="sone-menu <% class|css|html>">
-	<div class="sone-id hidden"><%sone.id|html></div>
+	<div class="sone-menu-id hidden"><%sone.id|html></div>
 	<img class="avatar" src="/WebOfTrust/GetIdenticon?identity=<%sone.id|html>&amp;width=64&height=64" width="64" height="64" alt="Avatar Image" />
 	<div class="inner-menu">
 		<div>
-- 
2.7.4