1 files changed, 18 insertions, 10 deletions

diff --git a/js/viewfeed.js b/js/viewfeed.js
index 794e94952..1d04c4276 100644
--- a/js/viewfeed.js
+++ b/js/viewfeed.js
@@ -347,8 +347,6 @@ function view(id) {
 
 		console.log("cache check result: " + (cached_article != false));
 
-		hideAuxDlg();
-
 		var query = "?op=article&method=view&id=" + param_escape(id);
 
 		var neighbor_ids = getRelativePostIds(id);
@@ -541,7 +539,7 @@ function moveToPost(mode, noscroll) {
 					if (!noscroll && article && article.offsetTop + article.offsetHeight >
 							ctr.scrollTop + ctr.offsetHeight) {
 
-						scrollArticle(ctr.offsetHeight/2);
+						scrollArticle(ctr.offsetHeight/4);
 
 					} else if (next_id) {
 						cdmExpandArticle(next_id);
@@ -566,7 +564,7 @@ function moveToPost(mode, noscroll) {
 					if (!getInitParam("cdm_expanded")) {
 
 						if (!noscroll && article.offsetTop < ctr.scrollTop) {
-							scrollArticle(-ctr.offsetHeight/3);
+							scrollArticle(-ctr.offsetHeight/4);
 						} else {
 							cdmExpandArticle(prev_id);
 							cdmScrollToArticleId(prev_id, true);
@@ -578,7 +576,7 @@ function moveToPost(mode, noscroll) {
 						} else if (!noscroll && prev_article &&
 								prev_article.offsetTop < ctr.scrollTop) {
 							cdmExpandArticle(prev_id);
-							scrollArticle(-ctr.offsetHeight/3);
+							scrollArticle(-ctr.offsetHeight/4);
 						} else if (prev_id) {
 							cdmExpandArticle(prev_id);
 							cdmScrollToArticleId(prev_id, noscroll);
@@ -1433,8 +1431,6 @@ function cdmExpandArticle(id) {
 
 		if (!$("RROW-" + id)) return false;
 
-		hideAuxDlg();
-
 		var elem = $("CICD-" + getActiveArticleId());
 
 		if (id == getActiveArticleId() && Element.visible(elem))
@@ -1643,8 +1639,6 @@ function cdmClicked(event, id) {
 	try {
 		//var shift_key = event.shiftKey;
 
-		hideAuxDlg();
-
 		if (!event.ctrlKey) {
 
 			if (!getInitParam("cdm_expanded")) {
@@ -1920,7 +1914,7 @@ function initHeadlinesMenu() {
 				var bare_id = id.substr(id.indexOf(":")+1);
 				var name = label.name[0];
 
-				bare_id = -11-bare_id;
+				bare_id = feed_to_label_id(bare_id);
 
 				labelAddMenu.addChild(new dijit.MenuItem({
 					label: name,
@@ -2120,3 +2114,17 @@ function displayArticleUrl(id) {
 		exception_error("changeScore", e);
 	}
 }
+
+function openSelectedAttachment(elem) {
+	try {
+		var url = elem[elem.selectedIndex].value;
+
+		if (url) {
+			window.open(url);
+			elem.selectedIndex = 0;
+		}
+
+	} catch (e) {
+		exception_error("openSelectedAttachment", e);
+	}
+}