diff options
author | Andrew Dolgov <[email protected]> | 2013-03-30 19:55:52 +0400 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2013-03-30 19:55:52 +0400 |
commit | 22af12326989980dbed22c3bfcb73067d52804a8 (patch) | |
tree | d44c8ba45a18fded7b6b736a8c42037994f00fd4 | |
parent | 583dbc56953afbad6ccae5e3add15160e23b68e4 (diff) |
make toggling combined mode work without reload
-rw-r--r-- | index.php | 6 | ||||
-rw-r--r-- | js/tt-rss.js | 9 |
2 files changed, 8 insertions, 7 deletions
@@ -233,9 +233,7 @@ <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcDigest')"><?php echo __('Switch to digest...') ?></div> <?php } ?> <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcTagCloud')"><?php echo __('Show tag cloud...') ?></div> - <?php if (!get_pref($link, 'COMBINED_DISPLAY_MODE')) { ?> - <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcToggleWidescreen')"><?php echo __('Toggle widescreen mode') ?></div> - <?php } ?> + <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcToggleWidescreen')"><?php echo __('Toggle widescreen mode') ?></div> <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcTagSelect')"><?php echo __('Select by tags...') ?></div> <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcAddLabel')"><?php echo __('Create label...') ?></div> <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcAddFilter')"><?php echo __('Create filter...') ?></div> @@ -261,10 +259,8 @@ </div> </div> - <?php if (!get_pref($link, 'COMBINED_DISPLAY_MODE')) { ?> <div id="content-insert" dojoType="dijit.layout.ContentPane" region="bottom" style="height : 50%" splitter="true"></div> - <?php } ?> </div> </div> diff --git a/js/tt-rss.js b/js/tt-rss.js index cb7c0ab2d..6c921c258 100644 --- a/js/tt-rss.js +++ b/js/tt-rss.js @@ -480,8 +480,13 @@ function init() { new Ajax.Request("backend.php", { parameters: query, onComplete: function(transport) { - window.location.reload(); - } }); + setInitParam("combined_display_mode", + !getInitParam("combined_display_mode")); + + closeArticlePanel(); + viewCurrentFeed(); + + } }); }; hotkey_actions["toggle_cdm_expanded"] = function() { notify_progress("Loading, please wait..."); |