archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[elegant] panes state conflict due to last changes

Browse source 
git-svn-id: http://piwigo.org/svn/trunk@26087 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
mistic100 2013-12-22 17:45:13 +00:00
parent 77ec43f9f0
commit bb20bfc9ea
2 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
themes/elegant/scripts.js
View file

@ -33,7 +33,11 @@
if (menubar.length == 1 && p_main_menu!="disabled") {
menuswitcher.html('<div class="switchArrow">&nbsp;</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 {

19
themes/elegant/scripts_pp.js
View file

@ -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">&nbsp;</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">&nbsp;</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");
}