diff options
| author | mistic100 <mistic@piwigo.org> | 2013-12-22 17:45:13 +0000 |
|---|---|---|
| committer | mistic100 <mistic@piwigo.org> | 2013-12-22 17:45:13 +0000 |
| commit | bb20bfc9ea3c8d73d52c5091a8a5e730817b6e02 (patch) | |
| tree | ce92e4cbf72d1cdf4a0d782931847318133f3731 /themes/elegant | |
| parent | 77ec43f9f059f2fbb141cf6e4313dd6153808a6e (diff) | |
[elegant] panes state conflict due to last changes
git-svn-id: http://piwigo.org/svn/trunk@26087 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'themes/elegant')
| -rw-r--r-- | themes/elegant/scripts.js | 6 | ||||
| -rw-r--r-- | themes/elegant/scripts_pp.js | 19 |
2 files changed, 20 insertions, 5 deletions
diff --git a/themes/elegant/scripts.js b/themes/elegant/scripts.js index 172d6d8e3..6f7629d79 100644 --- a/themes/elegant/scripts.js +++ b/themes/elegant/scripts.js @@ -33,7 +33,11 @@ if (menubar.length == 1 && p_main_menu!="disabled") { menuswitcher.html('<div class="switchArrow"> </div>'); - if (session_storage['page-menu'] == 'hidden' || p_main_menu == 'off') { + if (session_storage['page-menu'] == undefined && p_main_menu == 'off') { + session_storage['page-menu'] = 'hidden'; + } + + if (session_storage['page-menu'] == 'hidden') { hideMenu(0); } else { diff --git a/themes/elegant/scripts_pp.js b/themes/elegant/scripts_pp.js index be2bbfe26..26d505ebf 100644 --- a/themes/elegant/scripts_pp.js +++ b/themes/elegant/scripts_pp.js @@ -56,7 +56,6 @@ comments.removeClass("commentshidden").addClass("commentsshown"); comments_button.addClass("comments_toggle_off").removeClass("comments_toggle_on");; session_storage['comments'] = 'visible'; - comments_top_offset = comments_add.offset().top - parseFloat(comments_add.css('marginTop').replace(/auto/, 0)); } else { @@ -74,7 +73,11 @@ menuswitcher.html('<div class="switchArrow"> </div>'); - if (session_storage['picture-menu'] == 'hidden' || p_main_menu == 'off') { + if (session_storage['picture-menu'] == undefined && p_main_menu == 'off') { + session_storage['picture-menu'] = 'hidden'; + } + + if (session_storage['picture-menu'] == 'hidden') { hideMenu(0); } else { @@ -98,7 +101,11 @@ infoswitcher.html('<div class="switchArrow"> </div>'); - if (session_storage['side-info'] == 'hidden' || p_pict_descr == 'off') { + if (session_storage['side-info'] == undefined && p_pict_descr == 'off') { + session_storage['side-info'] = 'hidden'; + } + + if (session_storage['side-info'] == 'hidden') { hideInfo(0); } else { @@ -129,7 +136,11 @@ comments_button=jQuery("#comments h3"); } - if (session_storage['comments'] == 'hidden' || p_pict_comment == 'off') { + if (session_storage['comments'] == undefined && p_pict_comment == 'off') { + session_storage['comments'] = 'hidden'; + } + + if (session_storage['comments'] == 'hidden') { comments.addClass("commentshidden"); comments_button.addClass("comments_toggle comments_toggle_on"); } |