Changeset 26087


Ignore:
Timestamp:
12/22/13 18:45:13 (5 years ago)
Author:
mistic100
Message:

[elegant] panes state conflict due to last changes

Location:
trunk/themes/elegant
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/themes/elegant/scripts.js

    r26085 r26087  
    3434      menuswitcher.html('<div class="switchArrow">&nbsp;</div>'); 
    3535 
    36       if (session_storage['page-menu'] == 'hidden' || p_main_menu == 'off') { 
     36      if (session_storage['page-menu'] == undefined && p_main_menu == 'off') { 
     37        session_storage['page-menu'] = 'hidden'; 
     38      } 
     39 
     40      if (session_storage['page-menu'] == 'hidden') { 
    3741        hideMenu(0); 
    3842      } 
  • trunk/themes/elegant/scripts_pp.js

    r26086 r26087  
    5757      comments_button.addClass("comments_toggle_off").removeClass("comments_toggle_on");; 
    5858      session_storage['comments'] = 'visible'; 
    59  
    6059      comments_top_offset = comments_add.offset().top - parseFloat(comments_add.css('marginTop').replace(/auto/, 0)); 
    6160    } 
     
    7574      menuswitcher.html('<div class="switchArrow">&nbsp;</div>'); 
    7675 
    77       if (session_storage['picture-menu'] == 'hidden' || p_main_menu == 'off') { 
     76      if (session_storage['picture-menu'] == undefined && p_main_menu == 'off') { 
     77        session_storage['picture-menu'] = 'hidden'; 
     78      } 
     79 
     80      if (session_storage['picture-menu'] == 'hidden') { 
    7881        hideMenu(0); 
    7982      } 
     
    99102      infoswitcher.html('<div class="switchArrow">&nbsp;</div>'); 
    100103 
    101       if (session_storage['side-info'] == 'hidden' || p_pict_descr == 'off') { 
     104      if (session_storage['side-info'] == undefined && p_pict_descr == 'off') { 
     105        session_storage['side-info'] = 'hidden'; 
     106      } 
     107 
     108      if (session_storage['side-info'] == 'hidden') { 
    102109        hideInfo(0); 
    103110      } 
     
    130137      } 
    131138 
    132       if (session_storage['comments'] == 'hidden' || p_pict_comment == 'off') { 
     139      if (session_storage['comments'] == undefined && p_pict_comment == 'off') { 
     140        session_storage['comments'] = 'hidden'; 
     141      } 
     142 
     143      if (session_storage['comments'] == 'hidden') { 
    133144        comments.addClass("commentshidden"); 
    134145        comments_button.addClass("comments_toggle comments_toggle_on"); 
Note: See TracChangeset for help on using the changeset viewer.