1 files changed, 34 insertions, 4 deletions

diff --git a/js/tt-rss.js b/js/tt-rss.js
index c6c0c13dd..e3731c0cb 100644
--- a/js/tt-rss.js
+++ b/js/tt-rss.js
@@ -116,6 +116,7 @@ function updateFeedList() {
 
 		tree.startup();
 
+
 	} catch (e) {
 		exception_error("updateFeedList", e);
 	}
@@ -249,7 +250,7 @@ function init() {
 		if (!genericSanityCheck())
 			return false;
 
-		loading_set_progress(20);
+		loading_set_progress(30);
 
 		var a = document.createElement('audio');
 
@@ -547,11 +548,37 @@ function init_second_stage() {
 			closeArticlePanel();
 
 			_widescreen_mode = getInitParam("widescreen");
+			switchPanelMode(_widescreen_mode);
 
-			if (_widescreen_mode) {
-				switchPanelMode(_widescreen_mode);
+			if (parseInt(getCookie("ttrss_fh_width")) > 0) {
+				dijit.byId("feeds-holder").domNode.setStyle(
+					{width: getCookie("ttrss_fh_width") + "px" });
 			}
 
+			if (parseInt(getCookie("ttrss_ci_width")) > 0) {
+				if (_widescreen_mode) {
+					dijit.byId("content-insert").domNode.setStyle(
+						{width: getCookie("ttrss_ci_width") + "px" });
+
+				} else {
+					dijit.byId("content-insert").domNode.setStyle(
+						{height: getCookie("ttrss_ci_height") + "px" });
+				}
+			}
+
+			dijit.byId("main").resize();
+
+			var tmph = dojo.connect(dijit.byId('feeds-holder'), 'resize',
+				function (args) {
+					setCookie("ttrss_fh_width", args.w, getInitParam("cookie_lifetime"));
+			});
+
+			var tmph = dojo.connect(dijit.byId('content-insert'), 'resize',
+				function (args) {
+					setCookie("ttrss_ci_width", args.w, getInitParam("cookie_lifetime"));
+					setCookie("ttrss_ci_height", args.h, getInitParam("cookie_lifetime"));
+			});
+
 		});
 
 		delCookie("ttrss_test");
@@ -573,7 +600,7 @@ function init_second_stage() {
 			setActiveFeedId(hash_feed_id, hash_feed_is_cat);
 		}
 
-		loading_set_progress(30);
+		loading_set_progress(50);
 
 		// can't use cache_clear() here because viewfeed might not have initialized yet
 		if ('sessionStorage' in window && window['sessionStorage'] !== null)
@@ -1033,6 +1060,7 @@ function switchPanelMode(wide) {
 				borderTopWidth: '0px' });
 
 			$("headlines-toolbar").setStyle({ borderBottomWidth: '0px' });
+			$("headlines-frame").setStyle({ borderBottomWidth: '0px' });
 
 		} else {
 
@@ -1044,6 +1072,8 @@ function switchPanelMode(wide) {
 				borderTopWidth: '1px'});
 
 			$("headlines-toolbar").setStyle({ borderBottomWidth: '1px' });
+
+			$("headlines-frame").setStyle({ borderBottomWidth: '1px' });
 		}
 
 		closeArticlePanel();