Dotclear

Changeset 1829:db77f6bb5df9 for admin/js


Ignore:
Timestamp:
09/11/13 13:26:20 (12 years ago)
Author:
kevin@…
Branch:
Ticket #1539
Parents:
1828:5274b117ae55 (diff), 1792:3ad2e47ed52d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Fusion avec default

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • admin/js/common.js

    r1789 r1829  
    263263     }, 
    264264 
    265      checkboxesHelpers: function(e) { 
     265     checkboxesHelpers: function(e, target) { 
    266266          $(e).append(document.createTextNode(dotclear.msg.to_select)); 
    267267          $(e).append(document.createTextNode(' ')); 
    268268 
     269          target = target || $(e).parents('form').find('input[type="checkbox"]'); 
     270           
    269271          var a = document.createElement('a'); 
    270272          a.href='#'; 
    271273          $(a).append(document.createTextNode(dotclear.msg.select_all)); 
    272274          a.onclick = function() { 
    273                $(this).parents('form').find('input[type="checkbox"]').check(); 
     275               target.check(); 
    274276               return false; 
    275277          }; 
     
    282284          $(a).append(document.createTextNode(dotclear.msg.no_selection)); 
    283285          a.onclick = function() { 
    284                $(this).parents('form').find('input[type="checkbox"]').unCheck(); 
     286               target.unCheck(); 
    285287               return false; 
    286288          }; 
     
    293295          $(a).append(document.createTextNode(dotclear.msg.invert_sel)); 
    294296          a.onclick = function() { 
    295                $(this).parents('form').find('input[type="checkbox"]').toggleCheck(); 
     297               target.toggleCheck(); 
    296298               return false; 
    297299          }; 
  • admin/js/common.js

    r1827 r1829  
    8383      
    8484     var set_user_pref = p.hide ^ p.reverse_user_pref; 
    85      if (p.user_pref && (p.user_pref in p.unfolded_sections)) { 
     85     if (p.user_pref && p.unfolded_sections !== undefined && (p.user_pref in p.unfolded_sections)) { 
    8686          p.hide = p.reverse_user_pref; 
    8787     } 
     
    349349     // remove class no-js from html tag; cf style/default.css for examples 
    350350     $('body').removeClass('no-js'); 
     351     $('body').addClass('with-js'); 
    351352 
    352353     $('#wrapper').contents().each(function() { 
Note: See TracChangeset for help on using the changeset viewer.

Sites map