Merge branch 'master' of git://github.com/EyesX/Tiny-Tiny-RSS into EyesX-master

[tt-rss.git] / js / tt-rss.js

diff --git a/js/tt-rss.js b/js/tt-rss.js
index 577922948f275e8ee35505598593e9b567cfd4ea..e3731c0cbf11c84883f4d5dab52314711e533d65 100644 (file)
--- a/js/tt-rss.js
+++ b/js/tt-rss.js
@@ -116,6 +116,7 @@ function updateFeedList() {
 
                tree.startup();
 
+
        } catch (e) {
                exception_error("updateFeedList", e);
        }
@@ -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");
@@ -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();