From 02f29cd43f865b33c9a046f867f8df5681818544 Mon Sep 17 00:00:00 2001
From: Alexander <alxndr+github@gmail.com>
Date: Wed, 6 Mar 2013 09:53:34 -0800
Subject: [PATCH] Prevent quote content collisions with multiples in one post
[Fixes #142]
---
.../javascripts/discourse/views/post_view.js | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/app/assets/javascripts/discourse/views/post_view.js b/app/assets/javascripts/discourse/views/post_view.js
index d74d19ff04b..f73d1c5b069 100644
--- a/app/assets/javascripts/discourse/views/post_view.js
+++ b/app/assets/javascripts/discourse/views/post_view.js
@@ -175,14 +175,13 @@ Discourse.PostView = Discourse.View.extend({
},
toggleQuote: function($aside) {
- var $blockQuote, originalText, post, topic_id,
- _this = this;
- this.toggleProperty('quoteExpanded');
- if (this.get('quoteExpanded')) {
+ var $blockQuote, originalText, post, topic_id;
+ $aside.data('expanded',!$aside.data('expanded'));
+ if ($aside.data('expanded')) {
this.updateQuoteElements($aside, 'chevron-up');
// Show expanded quote
$blockQuote = $('blockquote', $aside);
- this.originalContents = $blockQuote.html();
+ $aside.data('original-contents',$blockQuote.html());
originalText = $blockQuote.text().trim();
$blockQuote.html(Em.String.i18n("loading"));
post = this.get('post');
@@ -191,15 +190,14 @@ Discourse.PostView = Discourse.View.extend({
topic_id = $aside.data('topic');
}
$.getJSON("/posts/by_number/" + topic_id + "/" + ($aside.data('post')), function(result) {
- var parsed;
- parsed = $(result.cooked);
+ var parsed = $(result.cooked);
parsed.replaceText(originalText, "<span class='highlighted'>" + originalText + "</span>");
return $blockQuote.showHtml(parsed);
});
} else {
// Hide expanded quote
this.updateQuoteElements($aside, 'chevron-down');
- $('blockquote', $aside).showHtml(this.originalContents);
+ $('blockquote', $aside).showHtml($aside.data('original-contents'));
}
return false;
},
@@ -236,6 +234,7 @@ Discourse.PostView = Discourse.View.extend({
if (!($aside.data('full') || $title.data('has-quote-controls'))) {
$title.on('click', function(e) {
if ($(e.target).is('a')) {
+ // if we clicked on a link, follow it
return true;
}
return _this.toggleQuote($aside);