floatingTitle: show collapse button if in expandable mode

1 files changed, 10 insertions, 0 deletions

diff --git a/js/Headlines.js b/js/Headlines.js
index e83a5fac7..b0ac7debe 100755
--- a/js/Headlines.js
+++ b/js/Headlines.js
@@ -556,6 +556,9 @@ define(["dojo/_base/declare"], function (declare) {
 
 				if (!append) {
 
+					// TODO: the below needs to be applied again when switching expanded/expandable on the fly
+					// via hotkeys, not just on feed load
+
 					$("headlines-frame").removeClassName("cdm");
 					$("headlines-frame").removeClassName("normal");
 
@@ -564,6 +567,13 @@ define(["dojo/_base/declare"], function (declare) {
 					$("headlines-frame").setAttribute("is-vfeed",
 						reply['headlines']['is_vfeed'] ? 1 : 0);
 
+					// for floating title because it's placed outside of headlines-frame
+					$("main").removeClassName("expandable");
+					$("main").removeClassName("expanded");
+
+					if (App.isCombinedMode())
+						$("main").addClassName(App.getInitParam("cdm_expanded") ? " expanded" : " expandable");
+
 					Article.setActive(0);
 
 					try {