Changeset 7921 for branches/3.18-stable


Ignore:
Timestamp:
Feb 24, 2021, 11:03:48 AM (5 months ago)
Author:
Nicklas Nordborg
Message:

Merge 3.17.2 to the 3.18-stable. 3.17.2 will not be released separately.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/3.18-stable/www/common/annotations/annotate.js

    r7832 r7921  
    244244      }
    245245     
     246      entry.visible = show;
    246247      Doc.showHide(entry.id, show);
    247248    }
     
    751752    {
    752753      var entry = annotations[i];
    753       if (entry.source == 'PRIMARY')
     754      if (entry.visible && entry.source == 'PRIMARY')
    754755      {
    755756        var checkbox = Doc.element('check.'+entry.id);
     
    774775    {
    775776      var entry = annotations[i];
    776       if (entry.source != 'PRIMARY')
     777      if (entry.visible && entry.source != 'PRIMARY')
    777778      {
    778779        var checkbox = Doc.element('check.'+entry.id);
Note: See TracChangeset for help on using the changeset viewer.