From abba5dd4d4bffc530c9b76a2b88c79857b8ee6a4 Mon Sep 17 00:00:00 2001
From: Jeffrey Tolar <tolar.jeffrey@gmail.com>
Date: Fri, 21 Jun 2013 23:30:55 -0500
Subject: [PATCH 1/3] Remove content when an article is dismissed

---
 js/viewfeed.js | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/js/viewfeed.js b/js/viewfeed.js
index b7e321d73..6d0941181 100644
--- a/js/viewfeed.js
+++ b/js/viewfeed.js
@@ -1611,6 +1611,10 @@ function dismissArticle(id) {
 
 		new Effect.Fade(elem, {duration : 0.5});
 
+		// Remove the content, too
+		var elem_content = $("CICD-" + id);
+		Element.remove(elem_content);
+
 		if (id == getActiveArticleId()) {
 			setActiveArticleId(0);
 		}
@@ -1634,6 +1638,10 @@ function dismissSelectedArticles() {
 					ids[i] != getActiveArticleId()) {
 				new Effect.Fade(elem, {duration : 0.5});
 				sel.push(ids[i]);
+
+				// Remove the content, too
+				var elem_content = $("CICD-" + ids[i]);
+				Element.remove(elem_content);
 			} else {
 				tmp.push(ids[i]);
 			}
@@ -1661,6 +1669,10 @@ function dismissReadArticles() {
 					!elem.hasClassName("Selected")) {
 
 				new Effect.Fade(elem, {duration : 0.5});
+
+				// Remove the content, too
+				var elem_content = $("CICD-" + ids[i]);
+				Element.remove(elem_content);
 			} else {
 				tmp.push(ids[i]);
 			}

From 055a37e083c9b18bf027cafa724478acd01cae41 Mon Sep 17 00:00:00 2001
From: Jeffrey Tolar <tolar.jeffrey@gmail.com>
Date: Fri, 21 Jun 2013 23:31:59 -0500
Subject: [PATCH 2/3] Fix incorrect function name in exception handling

---
 js/viewfeed.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/viewfeed.js b/js/viewfeed.js
index 6d0941181..7182ec084 100644
--- a/js/viewfeed.js
+++ b/js/viewfeed.js
@@ -1679,7 +1679,7 @@ function dismissReadArticles() {
 		}
 
 	} catch (e) {
-		exception_error("dismissSelectedArticles", e);
+		exception_error("dismissReadArticles", e);
 	}
 }
 

From 3b2605a02e63b20d5b0d2bc388daba9a22b68422 Mon Sep 17 00:00:00 2001
From: Jeffrey Tolar <tolar.jeffrey@gmail.com>
Date: Fri, 21 Jun 2013 23:49:35 -0500
Subject: [PATCH 3/3] Add some checks to see if the content element exists

This *might* help dismissal not break when not using combined mode.
---
 js/viewfeed.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/js/viewfeed.js b/js/viewfeed.js
index 7182ec084..84230f61a 100644
--- a/js/viewfeed.js
+++ b/js/viewfeed.js
@@ -1613,7 +1613,9 @@ function dismissArticle(id) {
 
 		// Remove the content, too
 		var elem_content = $("CICD-" + id);
-		Element.remove(elem_content);
+		if (elem_content) {
+			Element.remove(elem_content);
+		}
 
 		if (id == getActiveArticleId()) {
 			setActiveArticleId(0);
@@ -1641,7 +1643,9 @@ function dismissSelectedArticles() {
 
 				// Remove the content, too
 				var elem_content = $("CICD-" + ids[i]);
-				Element.remove(elem_content);
+				if (elem_content) {
+					Element.remove(elem_content);
+				}
 			} else {
 				tmp.push(ids[i]);
 			}
@@ -1672,7 +1676,9 @@ function dismissReadArticles() {
 
 				// Remove the content, too
 				var elem_content = $("CICD-" + ids[i]);
-				Element.remove(elem_content);
+				if (elem_content) {
+					Element.remove(elem_content);
+				}
 			} else {
 				tmp.push(ids[i]);
 			}