From a3192d8b18d40a8761adb65d752d909ca7dcd0cb Mon Sep 17 00:00:00 2001
From: Suki <suki@missallsunday.com>
Date: Thu, 5 Mar 2015 12:21:36 -0600
Subject: [PATCH 01/12] Signed-off-by: Suki <suki@missallsunday.com>

---
 Sources/Display.php                        |  2 +-
 Themes/default/Display.template.php        |  8 +++
 Themes/default/languages/index.english.php |  1 +
 Themes/default/scripts/topic.js            | 82 ++++++++++++++++++++--
 4 files changed, 88 insertions(+), 5 deletions(-)

diff --git a/Sources/Display.php b/Sources/Display.php
index e69ce7bca0..6381b90535 100644
--- a/Sources/Display.php
+++ b/Sources/Display.php
@@ -961,7 +961,7 @@ function Display()
 	$context['topic_notification'] = !empty($user_info['id']) ? $topicinfo['notify_prefs'] : array();
 	// 0 => unwatched, 1 => normal, 2 => receive alerts, 3 => receive emails
 	$context['topic_notification_mode'] = !$user_info['is_guest'] ? ($context['topic_unwatched'] ? 0 : ($topicinfo['notify_prefs']['pref'] & 0x02 ? 3 : ($topicinfo['notify_prefs']['pref'] & 0x01 ? 2 : 1))) : 0;
-	
+
 	$attachments = array();
 
 	// If there _are_ messages here... (probably an error otherwise :!)
diff --git a/Themes/default/Display.template.php b/Themes/default/Display.template.php
index 983a3e87c6..9989497f44 100644
--- a/Themes/default/Display.template.php
+++ b/Themes/default/Display.template.php
@@ -697,6 +697,11 @@ function template_single_post($message)
 		echo '
 								<ul class="quickbuttons">';
 
+		// Selected quote.
+		if ($context['can_quote'])
+			echo '
+									<li style="display:none;" id="quoteSelected_', $message['id'], '"><a href="javascript:void(0)" data-msg_id="', $message['id'], '" class="quote_selected_button">', $txt['quote_selected_action'] ,'</a></li>';
+
 		// Can they reply?
 		if ($context['can_quote'])
 			echo '
@@ -946,6 +951,9 @@ function onDocReceived(XMLDoc)
 						sJumpAnchor: "quickreply",
 						bIsFull: true
 					});
+					var oEditorID = "', $context['post_box_name'] ,'";
+					var oEditorObject = oEditorHandle_', $context['post_box_name'], ';
+					var oJumpAnchor = "quickreply";
 				// ]]></script>';
 }
 ?>
diff --git a/Themes/default/languages/index.english.php b/Themes/default/languages/index.english.php
index d4e11e39d8..1227959575 100644
--- a/Themes/default/languages/index.english.php
+++ b/Themes/default/languages/index.english.php
@@ -419,6 +419,7 @@
 $txt['quote_from'] = 'Quote from';
 $txt['quote'] = 'Quote';
 $txt['quote_action'] = 'Quote';
+$txt['quote_selected_action'] = 'Quote selected text';
 $txt['fulledit'] = 'Full&nbsp;edit';
 $txt['edit'] = 'Edit';
 $txt['quick_edit'] = 'Quick Edit';
diff --git a/Themes/default/scripts/topic.js b/Themes/default/scripts/topic.js
index 554343aba6..9fe4009cd2 100755
--- a/Themes/default/scripts/topic.js
+++ b/Themes/default/scripts/topic.js
@@ -257,6 +257,7 @@ QuickReply.prototype.quote = function (iMessageId, xDeprecated)
 			ajax_indicator(true);
 			if (this.bIsFull)
 				insertQuoteFast(iMessageId);
+
 			else
 				getXMLDocument(smf_prepareScriptUrl(this.opt.sScriptUrl) + 'action=quotefast;quote=' + iMessageId + ';xml', this.onQuoteReceived);
 		}
@@ -760,18 +761,91 @@ function ignore_toggles(msgids, text)
 	}
 }
 
-// Likes count for messages.
+function getSelectedText()
+{
+    var text = '';
+    if (window.getSelection)
+	{
+		text = window.getSelection().toString();
+	}
+	else if(document.getSelection){
+		return document.getSelection();
+	}
+	else if (document.selection && document.selection.type != 'Control')
+	{
+		text = document.selection.createRange().text;
+	}
+
+	return text;
+}
+
+// On document ready.
 $(function() {
+
+	// Event for handling selected quotes.
+	$(document).on('mouseup', '.inner', function() {
+
+		// Get any selected text.
+		var oSelectedText = getSelectedText();
+
+		// Get the message ID.
+		var oSelectedID = $(this).attr('id').replace('msg_','');
+
+		// If the button is already visible, hide it!
+		$('#quoteSelected_' + oSelectedID).hide();
+
+		// Do we have some selected text?
+		if (!oSelectedText)
+			return false;
+
+		// Show the "quote this" button.
+		$('#quoteSelected_' + oSelectedID).show();
+
+		// append an onclick event to this very own anchor tag.
+		$(document).one('click', '#quoteSelected_' + oSelectedID + ' a', function(e){
+			e.preventDefault();
+			var text = '';
+
+			$.ajax({
+				url: smf_prepareScriptUrl(smf_scripturl) + 'action=quotefast;quote=' + oSelectedID + ';xml;pb='+ oEditorID + ';mode=' + (oEditorObject.bRichTextEnabled ? 1 : 0),
+				type: 'GET',
+				dataType: 'xml',
+				beforeSend: function () {
+					ajax_indicator(true);
+				},
+				success: function (data, textStatus, xhr) {
+					text = $(data).find('quote').text();
+
+					text = text.match(/^\[quote(.*)]/ig) + oSelectedText + '[/quote]' + '\n\n';
+
+					$('#' + oEditorID).data('sceditor').InsertText(text);
+
+					// Move the view to the quick reply box.
+					if (navigator.appName == 'Microsoft Internet Explorer')
+						window.location.hash = oJumpAnchor;
+					else
+						window.location.hash = '#' + oJumpAnchor;
+
+					ajax_indicator(false);
+				},
+				error: function (xhr, textStatus, errorThrown) {
+					ajax_indicator(false);
+				}
+			});
+		});
+
+		return false;
+	});
+
+	// Likes count for messages.
 	$(document).on('click', '.like_count a', function(e){
 		e.preventDefault();
 		var title = $(this).parent().text(),
 			url = $(this).attr('href') + ';js=1';
 		return reqOverlayDiv(url, title);
 	});
-});
 
-// Message likes.
-$(function() {
+	// Message likes.
 	$(document).on('click', '.msg_like', function(event){
 		var obj = $(this);
 		event.preventDefault();

From 53e4c4dec07e8952a092c01f9c2a8bb5cce2a5a3 Mon Sep 17 00:00:00 2001
From: Suki <suki@missallsunday.com>
Date: Thu, 5 Mar 2015 12:31:11 -0600
Subject: [PATCH 02/12] Some comments

Signed-off-by: Suki <suki@missallsunday.com>
---
 Themes/default/scripts/topic.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Themes/default/scripts/topic.js b/Themes/default/scripts/topic.js
index 9fe4009cd2..bead8b6c8d 100755
--- a/Themes/default/scripts/topic.js
+++ b/Themes/default/scripts/topic.js
@@ -801,11 +801,12 @@ $(function() {
 		// Show the "quote this" button.
 		$('#quoteSelected_' + oSelectedID).show();
 
-		// append an onclick event to this very own anchor tag.
+		// Append an on-click event to this very own anchor tag.
 		$(document).one('click', '#quoteSelected_' + oSelectedID + ' a', function(e){
 			e.preventDefault();
 			var text = '';
 
+			// Do a call to make sure this is a valid message.
 			$.ajax({
 				url: smf_prepareScriptUrl(smf_scripturl) + 'action=quotefast;quote=' + oSelectedID + ';xml;pb='+ oEditorID + ';mode=' + (oEditorObject.bRichTextEnabled ? 1 : 0),
 				type: 'GET',
@@ -814,10 +815,13 @@ $(function() {
 					ajax_indicator(true);
 				},
 				success: function (data, textStatus, xhr) {
+					// Search the xml data to get the quote tag.
 					text = $(data).find('quote').text();
 
+					// Insert the selected text between the quotes BBC tags.
 					text = text.match(/^\[quote(.*)]/ig) + oSelectedText + '[/quote]' + '\n\n';
 
+					// Add the whole text to the editor's instance.
 					$('#' + oEditorID).data('sceditor').InsertText(text);
 
 					// Move the view to the quick reply box.

From a9a7eff044565da008224c3b46cb2082a46e4ddb Mon Sep 17 00:00:00 2001
From: Suki <suki@missallsunday.com>
Date: Thu, 5 Mar 2015 12:48:08 -0600
Subject: [PATCH 03/12] The process has been done, hide the button

Signed-off-by: Suki <suki@missallsunday.com>
---
 Themes/default/scripts/topic.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Themes/default/scripts/topic.js b/Themes/default/scripts/topic.js
index bead8b6c8d..03b1712e8d 100755
--- a/Themes/default/scripts/topic.js
+++ b/Themes/default/scripts/topic.js
@@ -836,6 +836,9 @@ $(function() {
 					ajax_indicator(false);
 				}
 			});
+
+			// The process has been done, hide the button.
+			$('#quoteSelected_' + oSelectedID).hide();
 		});
 
 		return false;

From c07f864150455a3a12504a8d0262364c83d96f53 Mon Sep 17 00:00:00 2001
From: Suki <suki@missallsunday.com>
Date: Fri, 6 Mar 2015 09:18:42 -0600
Subject: [PATCH 04/12] Keep it uniform

Signed-off-by: Suki <suki@missallsunday.com>
---
 Themes/default/scripts/topic.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Themes/default/scripts/topic.js b/Themes/default/scripts/topic.js
index 03b1712e8d..faf7790206 100755
--- a/Themes/default/scripts/topic.js
+++ b/Themes/default/scripts/topic.js
@@ -769,7 +769,7 @@ function getSelectedText()
 		text = window.getSelection().toString();
 	}
 	else if(document.getSelection){
-		return document.getSelection();
+		text = document.getSelection();
 	}
 	else if (document.selection && document.selection.type != 'Control')
 	{

From 96927f864e9949486edf8a29267deea2d322ad73 Mon Sep 17 00:00:00 2001
From: Suki <suki@missallsunday.com>
Date: Sun, 8 Mar 2015 12:45:14 -0600
Subject: [PATCH 05/12] Move the hide() event in a vague attempt to try and
 cover obnoxious behaviour...

Signed-off-by: Suki <suki@missallsunday.com>
---
 Themes/default/scripts/topic.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Themes/default/scripts/topic.js b/Themes/default/scripts/topic.js
index faf7790206..d3ed3d0c9d 100755
--- a/Themes/default/scripts/topic.js
+++ b/Themes/default/scripts/topic.js
@@ -806,6 +806,9 @@ $(function() {
 			e.preventDefault();
 			var text = '';
 
+			// The process has been started, hide the button.
+			$('#quoteSelected_' + oSelectedID).hide();
+
 			// Do a call to make sure this is a valid message.
 			$.ajax({
 				url: smf_prepareScriptUrl(smf_scripturl) + 'action=quotefast;quote=' + oSelectedID + ';xml;pb='+ oEditorID + ';mode=' + (oEditorObject.bRichTextEnabled ? 1 : 0),
@@ -836,9 +839,6 @@ $(function() {
 					ajax_indicator(false);
 				}
 			});
-
-			// The process has been done, hide the button.
-			$('#quoteSelected_' + oSelectedID).hide();
 		});
 
 		return false;

From 68f50f3e91e9165fd43a23b8300516fc74d9d3c7 Mon Sep 17 00:00:00 2001
From: Suki <suki@missallsunday.com>
Date: Fri, 13 Mar 2015 17:24:11 -0600
Subject: [PATCH 06/12] A few improvements and a new file

Signed-off-by: Suki <suki@missallsunday.com>
---
 Sources/Display.php                  |   3 +
 Themes/default/scripts/quotedText.js | 107 +++++++++++++++++++++++++++
 Themes/default/scripts/topic.js      |  80 --------------------
 3 files changed, 110 insertions(+), 80 deletions(-)
 create mode 100644 Themes/default/scripts/quotedText.js

diff --git a/Sources/Display.php b/Sources/Display.php
index 6381b90535..71032d2694 100644
--- a/Sources/Display.php
+++ b/Sources/Display.php
@@ -1276,6 +1276,9 @@ function Display()
 	// topic.js
 	loadJavascriptFile('topic.js', array('default_theme' => true, 'defer' => false), 'smf_topic');
 
+	// quotedText.js
+	loadJavascriptFile('quotedText.js', array('default_theme' => true, 'defer' => true), 'smf_quotedText');
+
 	// Mentions
 	if (!empty($modSettings['enable_mentions']) && allowedTo('mention'))
 	{
diff --git a/Themes/default/scripts/quotedText.js b/Themes/default/scripts/quotedText.js
new file mode 100644
index 0000000000..358d04e28c
--- /dev/null
+++ b/Themes/default/scripts/quotedText.js
@@ -0,0 +1,107 @@
+function getSelectedText(divID)
+{
+	if (typeof divID == 'undefined' || divID == false)
+		return false;
+
+	var text = '',
+	selection,
+	found = 0;
+
+	if (window.getSelection)
+	{
+		selection = window.getSelection();
+		text = selection.toString();
+	}
+	else if (document.selection && document.selection.type != 'Control')
+	{
+		selection = document.selection.createRange();
+		text = selection.text;
+	}
+
+	// Need to be sure the selected text does belong to the right div.
+	for (var i = 0; i < selection.rangeCount; i++) {
+			s = selection.getRangeAt(i).startContainer.parentNode.id;
+			e = selection.getRangeAt(i).endContainer.parentNode.id;
+
+			if (s == divID || (s != divID && e == 'child'))
+			{
+				found = 1;
+				break;
+			}
+		}
+
+	return found === 1 ? text : false;
+}
+
+function quotedTextClick(oOptions)
+{
+		text = '';
+
+		// The process has been started, hide the button.
+		$('#quoteSelected_' + oOptions.msgID).hide();
+
+		// Do a call to make sure this is a valid message.
+		$.ajax({
+			url: smf_prepareScriptUrl(smf_scripturl) + 'action=quotefast;quote=' + oOptions.msgID + ';xml;pb='+ oEditorID + ';mode=' + (oEditorObject.bRichTextEnabled ? 1 : 0),
+			type: 'GET',
+			dataType: 'xml',
+			beforeSend: function () {
+				ajax_indicator(true);
+			},
+			success: function (data, textStatus, xhr) {
+				// Search the xml data to get the quote tag.
+				text = $(data).find('quote').text();
+
+				// Insert the selected text between the quotes BBC tags.
+				text = text.match(/^\[quote(.*)]/ig) + oOptions.text + '[/quote]' + '\n\n';
+
+				// Add the whole text to the editor's instance.
+				$('#' + oEditorID).data('sceditor').InsertText(text);
+
+				// Move the view to the quick reply box.
+				if (navigator.appName == 'Microsoft Internet Explorer')
+					window.location.hash = oJumpAnchor;
+				else
+					window.location.hash = '#' + oJumpAnchor;
+
+				ajax_indicator(false);
+			},
+			error: function (xhr, textStatus, errorThrown) {
+				ajax_indicator(false);
+			}
+		});
+}
+
+$(function() {
+
+	// Event for handling selected quotes.
+	$(document).on('mouseup', '.inner', function() {
+
+		// Get everything we need.
+		var oSelected = {
+			divID : $(this).attr('id'),
+			msgID : $(this).attr('id').replace('msg_',''),
+			reference : 'selectQuotedText' + $(this).attr('id')
+		};
+
+		// If the button is already visible, hide it!
+		$('#quoteSelected_' + oSelected.divID).hide();
+
+		// Get any selected text.
+		oSelected.text = getSelectedText(oSelected.divID);
+
+		// Do we have some selected text?
+		if (typeof oSelected.text == 'undefined' || oSelected.text == false)
+			return false;
+
+		// Show the "quote this" button.
+		$('#quoteSelected_' + oSelected.msgID).show();
+		
+			$(document).one('click', '#quoteSelected_' + oSelected.msgID + ' a', function(e){
+				e.preventDefault();
+				quotedTextClick(oSelected);
+			});
+
+		return false;
+	});
+});
\ No newline at end of file
diff --git a/Themes/default/scripts/topic.js b/Themes/default/scripts/topic.js
index d3ed3d0c9d..9d89637585 100755
--- a/Themes/default/scripts/topic.js
+++ b/Themes/default/scripts/topic.js
@@ -761,89 +761,9 @@ function ignore_toggles(msgids, text)
 	}
 }
 
-function getSelectedText()
-{
-    var text = '';
-    if (window.getSelection)
-	{
-		text = window.getSelection().toString();
-	}
-	else if(document.getSelection){
-		text = document.getSelection();
-	}
-	else if (document.selection && document.selection.type != 'Control')
-	{
-		text = document.selection.createRange().text;
-	}
-
-	return text;
-}
-
 // On document ready.
 $(function() {
 
-	// Event for handling selected quotes.
-	$(document).on('mouseup', '.inner', function() {
-
-		// Get any selected text.
-		var oSelectedText = getSelectedText();
-
-		// Get the message ID.
-		var oSelectedID = $(this).attr('id').replace('msg_','');
-
-		// If the button is already visible, hide it!
-		$('#quoteSelected_' + oSelectedID).hide();
-
-		// Do we have some selected text?
-		if (!oSelectedText)
-			return false;
-
-		// Show the "quote this" button.
-		$('#quoteSelected_' + oSelectedID).show();
-
-		// Append an on-click event to this very own anchor tag.
-		$(document).one('click', '#quoteSelected_' + oSelectedID + ' a', function(e){
-			e.preventDefault();
-			var text = '';
-
-			// The process has been started, hide the button.
-			$('#quoteSelected_' + oSelectedID).hide();
-
-			// Do a call to make sure this is a valid message.
-			$.ajax({
-				url: smf_prepareScriptUrl(smf_scripturl) + 'action=quotefast;quote=' + oSelectedID + ';xml;pb='+ oEditorID + ';mode=' + (oEditorObject.bRichTextEnabled ? 1 : 0),
-				type: 'GET',
-				dataType: 'xml',
-				beforeSend: function () {
-					ajax_indicator(true);
-				},
-				success: function (data, textStatus, xhr) {
-					// Search the xml data to get the quote tag.
-					text = $(data).find('quote').text();
-
-					// Insert the selected text between the quotes BBC tags.
-					text = text.match(/^\[quote(.*)]/ig) + oSelectedText + '[/quote]' + '\n\n';
-
-					// Add the whole text to the editor's instance.
-					$('#' + oEditorID).data('sceditor').InsertText(text);
-
-					// Move the view to the quick reply box.
-					if (navigator.appName == 'Microsoft Internet Explorer')
-						window.location.hash = oJumpAnchor;
-					else
-						window.location.hash = '#' + oJumpAnchor;
-
-					ajax_indicator(false);
-				},
-				error: function (xhr, textStatus, errorThrown) {
-					ajax_indicator(false);
-				}
-			});
-		});
-
-		return false;
-	});
-
 	// Likes count for messages.
 	$(document).on('click', '.like_count a', function(e){
 		e.preventDefault();

From dae8401558ea4a4b5a35c317c495719ecd8c3471 Mon Sep 17 00:00:00 2001
From: Suki <suki@missallsunday.com>
Date: Sat, 14 Mar 2015 09:04:46 -0600
Subject: [PATCH 07/12] Add quotedText to Post

Signed-off-by: Suki <suki@missallsunday.com>
---
 Sources/Post.php                     |  3 +++
 Themes/default/Post.template.php     |  3 +++
 Themes/default/scripts/quotedText.js | 16 +++++++++-------
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/Sources/Post.php b/Sources/Post.php
index 07bcf14f5e..0c198c1641 100644
--- a/Sources/Post.php
+++ b/Sources/Post.php
@@ -1172,6 +1172,9 @@ function Post($post_errors = array())
 		loadJavascriptFile('mentions.js', array('default_theme' => true, 'defer' => true), 'smf_mention');
 	}
 
+	// quotedText.js
+	loadJavascriptFile('quotedText.js', array('default_theme' => true, 'defer' => true), 'smf_quotedText');
+
 	// Finally, load the template.
 	if (WIRELESS && WIRELESS_PROTOCOL != 'wap')
 		$context['sub_template'] = WIRELESS_PROTOCOL . '_post';
diff --git a/Themes/default/Post.template.php b/Themes/default/Post.template.php
index 9cccbf3f10..0452c4606a 100644
--- a/Themes/default/Post.template.php
+++ b/Themes/default/Post.template.php
@@ -804,6 +804,8 @@ function onDocSent(XMLDoc)
 			});';
 
 	echo '
+			var oEditorID = "', $context['post_box_name'] ,'";
+			var oEditorObject = oEditorHandle_', $context['post_box_name'], ';
 		// ]]></script>';
 
 	// If the user is replying to a topic show the previous posts.
@@ -834,6 +836,7 @@ function onDocSent(XMLDoc)
 			{
 				echo '
 					<ul class="quickbuttons" id="msg_', $post['id'], '_quote">
+						<li style="display:none;" id="quoteSelected_', $post['id'], '"><a href="javascript:void(0)" data-msg_id="', $post['id'], '" class="quote_selected_button">', $txt['quote_selected_action'] ,'</a></li>
 						<li id="post_modify"><a href="#postmodify" onclick="return insertQuoteFast(', $post['id'], ');" class="quote_button">', $txt['quote'], '</a></li>
 					</ul>';
 			}
diff --git a/Themes/default/scripts/quotedText.js b/Themes/default/scripts/quotedText.js
index 358d04e28c..547b8d38c1 100644
--- a/Themes/default/scripts/quotedText.js
+++ b/Themes/default/scripts/quotedText.js
@@ -58,11 +58,13 @@ function quotedTextClick(oOptions)
 				// Add the whole text to the editor's instance.
 				$('#' + oEditorID).data('sceditor').InsertText(text);
 
-				// Move the view to the quick reply box.
-				if (navigator.appName == 'Microsoft Internet Explorer')
-					window.location.hash = oJumpAnchor;
-				else
-					window.location.hash = '#' + oJumpAnchor;
+				// Move the view to the quick reply box. If available.
+				if (typeof oJumpAnchor != 'undefined'){
+					if (navigator.appName == 'Microsoft Internet Explorer')
+						window.location.hash = oJumpAnchor;
+					else
+						window.location.hash = '#' + oJumpAnchor;
+				}
 
 				ajax_indicator(false);
 			},
@@ -75,7 +77,7 @@ function quotedTextClick(oOptions)
 $(function() {
 
 	// Event for handling selected quotes.
-	$(document).on('mouseup', '.inner', function() {
+	$(document).on('mouseup', '.inner, .list_posts', function() {
 
 		// Get everything we need.
 		var oSelected = {
@@ -96,7 +98,7 @@ $(function() {
 
 		// Show the "quote this" button.
 		$('#quoteSelected_' + oSelected.msgID).show();
-		
+
 			$(document).one('click', '#quoteSelected_' + oSelected.msgID + ' a', function(e){
 				e.preventDefault();
 				quotedTextClick(oSelected);

From df28fa2063b659434a1ab68a6ba005a5231b5b6d Mon Sep 17 00:00:00 2001
From: Suki <suki@missallsunday.com>
Date: Sat, 14 Mar 2015 09:22:26 -0600
Subject: [PATCH 08/12] Move the custom data attribute to the post div to get a
 clean msg ID

Signed-off-by: Suki <suki@missallsunday.com>
---
 Themes/default/Display.template.php  | 4 ++--
 Themes/default/Post.template.php     | 4 ++--
 Themes/default/scripts/quotedText.js | 5 ++---
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/Themes/default/Display.template.php b/Themes/default/Display.template.php
index 9989497f44..c625e2c8a2 100644
--- a/Themes/default/Display.template.php
+++ b/Themes/default/Display.template.php
@@ -568,7 +568,7 @@ function template_single_post($message)
 									', $txt['post_awaiting_approval'], '
 								</div>';
 	echo '
-								<div class="inner" id="msg_', $message['id'], '"', $ignoring ? ' style="display:none;"' : '', '>', $message['body'], '</div>
+								<div class="inner" data-msgid="', $post['id'], '" id="msg_', $message['id'], '"', $ignoring ? ' style="display:none;"' : '', '>', $message['body'], '</div>
 							</div>';
 
 	// Assuming there are attachments...
@@ -700,7 +700,7 @@ function template_single_post($message)
 		// Selected quote.
 		if ($context['can_quote'])
 			echo '
-									<li style="display:none;" id="quoteSelected_', $message['id'], '"><a href="javascript:void(0)" data-msg_id="', $message['id'], '" class="quote_selected_button">', $txt['quote_selected_action'] ,'</a></li>';
+									<li style="display:none;" id="quoteSelected_', $message['id'], '"><a href="javascript:void(0)" class="quote_selected_button">', $txt['quote_selected_action'] ,'</a></li>';
 
 		// Can they reply?
 		if ($context['can_quote'])
diff --git a/Themes/default/Post.template.php b/Themes/default/Post.template.php
index 0452c4606a..36de0f6058 100644
--- a/Themes/default/Post.template.php
+++ b/Themes/default/Post.template.php
@@ -836,7 +836,7 @@ function onDocSent(XMLDoc)
 			{
 				echo '
 					<ul class="quickbuttons" id="msg_', $post['id'], '_quote">
-						<li style="display:none;" id="quoteSelected_', $post['id'], '"><a href="javascript:void(0)" data-msg_id="', $post['id'], '" class="quote_selected_button">', $txt['quote_selected_action'] ,'</a></li>
+						<li style="display:none;" id="quoteSelected_', $post['id'], '" data-msgid="', $post['id'], '"><a href="javascript:void(0)" class="quote_selected_button">', $txt['quote_selected_action'] ,'</a></li>
 						<li id="post_modify"><a href="#postmodify" onclick="return insertQuoteFast(', $post['id'], ');" class="quote_button">', $txt['quote'], '</a></li>
 					</ul>';
 			}
@@ -854,7 +854,7 @@ function onDocSent(XMLDoc)
 			}
 
 			echo '
-					<div class="list_posts smalltext" id="msg_', $post['id'], '_body">', $post['message'], '</div>
+					<div class="list_posts smalltext" id="msg_', $post['id'], '_body" data-msgid="', $post['id'], '">', $post['message'], '</div>
 				</div>
 			</div>';
 		}
diff --git a/Themes/default/scripts/quotedText.js b/Themes/default/scripts/quotedText.js
index 547b8d38c1..f8a1ba0cf6 100644
--- a/Themes/default/scripts/quotedText.js
+++ b/Themes/default/scripts/quotedText.js
@@ -82,8 +82,7 @@ $(function() {
 		// Get everything we need.
 		var oSelected = {
 			divID : $(this).attr('id'),
-			msgID : $(this).attr('id').replace('msg_',''),
-			reference : 'selectQuotedText' + $(this).attr('id')
+			msgID : $(this).data('msgid'),
 		};
 
 		// If the button is already visible, hide it!
@@ -95,7 +94,7 @@ $(function() {
 		// Do we have some selected text?
 		if (typeof oSelected.text == 'undefined' || oSelected.text == false)
 			return false;
-
+console.log(oSelected);
 		// Show the "quote this" button.
 		$('#quoteSelected_' + oSelected.msgID).show();
 

From d9719466bf495498e7aa2c889a34f3cbf6a674fd Mon Sep 17 00:00:00 2001
From: Suki <suki@missallsunday.com>
Date: Sat, 14 Mar 2015 09:23:50 -0600
Subject: [PATCH 09/12] you saw nothing...

Signed-off-by: Suki <suki@missallsunday.com>
---
 Themes/default/scripts/quotedText.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Themes/default/scripts/quotedText.js b/Themes/default/scripts/quotedText.js
index f8a1ba0cf6..01645648f8 100644
--- a/Themes/default/scripts/quotedText.js
+++ b/Themes/default/scripts/quotedText.js
@@ -94,7 +94,7 @@ $(function() {
 		// Do we have some selected text?
 		if (typeof oSelected.text == 'undefined' || oSelected.text == false)
 			return false;
-console.log(oSelected);
+
 		// Show the "quote this" button.
 		$('#quoteSelected_' + oSelected.msgID).show();
 

From 2a14894ecebe1b4a08fabd46e8220fdc42cd8a4c Mon Sep 17 00:00:00 2001
From: Suki <suki@missallsunday.com>
Date: Sat, 14 Mar 2015 09:28:44 -0600
Subject: [PATCH 10/12] Add the cusotm class to the css file

Signed-off-by: Suki <suki@missallsunday.com>
---
 Themes/default/css/index.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Themes/default/css/index.css b/Themes/default/css/index.css
index c991dd5a74..cc4e4cd6a4 100644
--- a/Themes/default/css/index.css
+++ b/Themes/default/css/index.css
@@ -1389,7 +1389,7 @@ ul li.greeting {
 .quickbuttons a:hover {
 	color: #a70;
 }
-.quickbuttons li a.quote_button {
+.quickbuttons li a.quote_button, .quickbuttons li a.quote_selected_button {
 	background-position: 0 -1px;
 	padding: 0 2px 0 20px;
 }

From 1bcb3b09cbc7f8994c1b4703bb3b4e4f7653b94d Mon Sep 17 00:00:00 2001
From: Suki <suki@missallsunday.com>
Date: Sat, 14 Mar 2015 09:37:02 -0600
Subject: [PATCH 11/12] Use msgID to hide the button

Signed-off-by: Suki <suki@missallsunday.com>
---
 Themes/default/scripts/quotedText.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Themes/default/scripts/quotedText.js b/Themes/default/scripts/quotedText.js
index 01645648f8..889d0b6147 100644
--- a/Themes/default/scripts/quotedText.js
+++ b/Themes/default/scripts/quotedText.js
@@ -86,7 +86,7 @@ $(function() {
 		};
 
 		// If the button is already visible, hide it!
-		$('#quoteSelected_' + oSelected.divID).hide();
+		$('#quoteSelected_' + oSelected.msgID).hide();
 
 		// Get any selected text.
 		oSelected.text = getSelectedText(oSelected.divID);

From e385ae450b51cac3d0dfbd44a58f1fbafea76b4d Mon Sep 17 00:00:00 2001
From: Suki <suki@missallsunday.com>
Date: Sat, 14 Mar 2015 14:31:16 -0600
Subject: [PATCH 12/12] $message is used in Display.template, $post in
 Post.template...

Signed-off-by: Suki <suki@missallsunday.com>
---
 Themes/default/Display.template.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Themes/default/Display.template.php b/Themes/default/Display.template.php
index c625e2c8a2..542a37b8df 100644
--- a/Themes/default/Display.template.php
+++ b/Themes/default/Display.template.php
@@ -568,7 +568,7 @@ function template_single_post($message)
 									', $txt['post_awaiting_approval'], '
 								</div>';
 	echo '
-								<div class="inner" data-msgid="', $post['id'], '" id="msg_', $message['id'], '"', $ignoring ? ' style="display:none;"' : '', '>', $message['body'], '</div>
+								<div class="inner" data-msgid="', $message['id'], '" id="msg_', $message['id'], '"', $ignoring ? ' style="display:none;"' : '', '>', $message['body'], '</div>
 							</div>';
 
 	// Assuming there are attachments...