From 67cdf4cf123ef4ac04baba881b3443e64c90d9a4 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Fri, 30 Nov 2018 14:39:06 +0300
Subject: [PATCH] remove some unnecessary element IDs rework plugins/note to
 use xhrJson()

---
 classes/feeds.php    |  6 +++---
 plugins/note/note.js | 33 ++++++++++++++-------------------
 2 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/classes/feeds.php b/classes/feeds.php
index 2bd9b0e65..d6da225e8 100755
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -417,7 +417,7 @@ class Feeds extends Handler_Protected {
 
 					$reply['content'] .= "<div onclick='return hlClicked(event, $id)'
                     class=\"hlTitle\"><span class='hlContent $hlc_suffix'>";
-					$reply['content'] .= "<a id=\"RTITLE-$id\" class=\"title $hlc_suffix\"
+					$reply['content'] .= "<a class=\"title $hlc_suffix\"
                     href=\"" . htmlspecialchars($line["link"]) . "\"
                     onclick=\"\">" .
 						truncate_string($line["title"], 200);
@@ -523,7 +523,7 @@ class Feeds extends Handler_Protected {
 					}
 
 					// data-article-id included for context menu
-					$tmp_content .= "<span id=\"RTITLE-$id\"
+					$tmp_content .= "<span
                     onclick=\"return cdmClicked(event, $id);\"
                     data-article-id=\"$id\"
                     class=\"titleWrap hlMenuAttach $hlc_suffix\">
@@ -564,7 +564,7 @@ class Feeds extends Handler_Protected {
 
 					$tmp_content .= "</div>"; //cdmHeader
 
-					$tmp_content .= "<div class=\"cdmContent\" onclick=\"return cdmClicked(event, $id, true);\" id=\"CICD-$id\">";
+					$tmp_content .= "<div class=\"cdmContent\" onclick=\"return cdmClicked(event, $id, true);\">";
 
 					$tmp_content .= "<div id=\"POSTNOTE-$id\">";
 					if ($line['note']) {
diff --git a/plugins/note/note.js b/plugins/note/note.js
index 022fc88e7..bf69a680e 100644
--- a/plugins/note/note.js
+++ b/plugins/note/note.js
@@ -12,31 +12,26 @@ function editArticleNote(id) {
 			style: "width: 600px",
 			execute: function() {
 				if (this.validate()) {
-					var query = dojo.objectToQuery(this.attr('value'));
-
 					notify_progress("Saving article note...", true);
 
-					new Ajax.Request("backend.php",	{
-					parameters: query,
-					onComplete: function(transport) {
-						notify('');
-						dialog.hide();
+					xhrJson("backend.php", this.attr('value'), (reply) => {
+                        notify('');
+                        dialog.hide();
 
-						var reply = JSON.parse(transport.responseText);
+                        if (reply) {
+                            cache_delete("article:" + id);
 
-						cache_delete("article:" + id);
+                            var elem = $("POSTNOTE-" + id);
 
-						var elem = $("POSTNOTE-" + id);
+                            if (elem) {
+                                Element.hide(elem);
+                                elem.innerHTML = reply.note;
 
-						if (elem) {
-							Element.hide(elem);
-							elem.innerHTML = reply.note;
-
-							if (reply.raw_length != 0)
-								new Effect.Appear(elem);
-						}
-
-					}});
+                                if (reply.raw_length != 0)
+                                    new Effect.Appear(elem);
+                            }
+                        }
+                    });
 				}
 			},
 			href: query,