Changeset 6944


Ignore:
Timestamp:
Sep 1, 2015, 2:22:44 PM (6 years ago)
Author:
Nicklas Nordborg
Message:

References #1941: Store experimental factor values as part experiments

Fixes an issue with the annotations tab being reloaded in some cases when moving back and forth between tabs in an edit dialog. This could cause modified annotation values be reset to their original values.

Location:
trunk/www
Files:
14 edited

Legend:

Unmodified
Added
Removed
  • trunk/www/admin/pluginconfigurations/configurations.js

    r6600 r6944  
    4444      if (Doc.element('settings.annotations'))
    4545      {
    46         TabControl.addTabActivateListener('settings.annotations', Annotations.autoLoadEditFrame);
     46        TabControl.addTabActivateListener('settings.annotations', Annotations.onSwitchToAnnotationsTab);
    4747      }
    4848
     
    129129  }
    130130
    131   configurations.loadAnnotationsFrame = function()
    132   {
    133     Annotations.autoLoadEditFrame();
    134   }
    135 
    136131  configurations.validateConfiguration = function()
    137132  {
  • trunk/www/admin/plugindefinitions/plugins.js

    r6640 r6944  
    4545      if (Doc.element('settings.annotations'))
    4646      {
    47         TabControl.addTabActivateListener('settings.annotations', Annotations.autoLoadEditFrame);
     47        TabControl.addTabActivateListener('settings.annotations', Annotations.onSwitchToAnnotationsTab);
    4848      }
    4949     
  • trunk/www/biomaterials/bioplates/bioplates.js

    r6615 r6944  
    4040     
    4141      // Tab validation
    42       TabControl.addTabActivateListener('settings.annotations', Annotations.autoLoadEditFrame);
     42      TabControl.addTabActivateListener('settings.annotations', Annotations.onSwitchToAnnotationsTab);
    4343      TabControl.addTabValidator('settings.info', bioplates.validateBioPlate);
    4444
  • trunk/www/biomaterials/tags/tags.js

    r6389 r6944  
    4040
    4141      // Tab validation
    42       TabControl.addTabActivateListener('settings.annotations', Annotations.autoLoadEditFrame);
     42      TabControl.addTabActivateListener('settings.annotations', Annotations.onSwitchToAnnotationsTab);
    4343      TabControl.addTabValidator('settings.info', tags.validateTag);
    4444    }
  • trunk/www/include/scripts/annotations.js

    r6255 r6944  
    4040 
    4141  /**
     42    Event handler for switching to the annotations tab for
     43    items not having a protocol and/or subtype.
     44  */
     45  annotations.onSwitchToAnnotationsTab = function(event)
     46  {
     47    annotations.autoLoadEditFrame();
     48  }
     49 
     50  /**
    4251    Automatically load or reload the 'Edit annotations' frame. The
    4352    frame is loaded if it has not previously been loaded, or if
    4453    the protocolId parameter has changed since last time this method
    45     was called.
     54    was called. DO NOT USE AS AN EVENT HANDLER.
    4655  */
    4756  annotations.autoLoadEditFrame = function(protocolId, subtypeId)
  • trunk/www/lims/arraydesigns/designs.js

    r6695 r6944  
    4040
    4141      // Tab validation
    42       TabControl.addTabActivateListener('settings.annotations', Annotations.autoLoadEditFrame);
     42      TabControl.addTabActivateListener('settings.annotations', Annotations.onSwitchToAnnotationsTab);
    4343      TabControl.addTabActivateListener('settings.inheritedAnnotations', Annotations.autoLoadInheritFrame);
    4444      TabControl.addTabActivateListener('settings.datafiles', arrayDesigns.loadDataFilesFrame);
  • trunk/www/lims/arrayslides/slides.js

    r6695 r6944  
    4040
    4141      // Tab validation
    42       TabControl.addTabActivateListener('settings.annotations', Annotations.autoLoadEditFrame);
     42      TabControl.addTabActivateListener('settings.annotations', Annotations.onSwitchToAnnotationsTab);
    4343      TabControl.addTabActivateListener('settings.inheritedAnnotations', arraySlides.loadInheritedAnnotationsFrame);
    4444      TabControl.addTabValidator('settings.info', arraySlides.validateArraySlide);
  • trunk/www/lims/plates/plates.js

    r6389 r6944  
    4040
    4141      // Tab validation
    42       TabControl.addTabActivateListener('settings.annotations', Annotations.autoLoadEditFrame);
     42      TabControl.addTabActivateListener('settings.annotations', Annotations.onSwitchToAnnotationsTab);
    4343      TabControl.addTabActivateListener('settings.inheritedAnnotations', Annotations.autoLoadInheritFrame);
    4444      TabControl.addTabValidator('settings.info', plates.validatePlate);
  • trunk/www/lims/plates/wells/wells.js

    r6400 r6944  
    4040
    4141      // Tab validation
    42       TabControl.addTabActivateListener('settings.annotations', Annotations.autoLoadEditFrame);
     42      TabControl.addTabActivateListener('settings.annotations', Annotations.onSwitchToAnnotationsTab);
    4343      TabControl.addTabActivateListener('settings.inheritedAnnotations', Annotations.autoLoadInheritFrame);
    4444      TabControl.addTabValidator('settings.info', wells.validateWell);
  • trunk/www/views/experiments/bioassays/bioassays.js

    r6942 r6944  
    4040
    4141      // Tab validation
    42       TabControl.addTabActivateListener('settings.annotations', Annotations.autoLoadEditFrame);
     42      TabControl.addTabActivateListener('settings.annotations', Annotations.onSwitchToAnnotationsTab);
    4343      TabControl.addTabActivateListener('settings.inheritedAnnotations', Annotations.autoLoadInheritFrame);
    4444      TabControl.addTabValidator('settings.info', bioassays.validateBioAssay);
  • trunk/www/views/experiments/bioassaysets/bioassaysets.js

    r6612 r6944  
    4242
    4343      // Tab validation
    44       TabControl.addTabActivateListener('settings.annotations', Annotations.autoLoadEditFrame);
     44      TabControl.addTabActivateListener('settings.annotations', Annotations.onSwitchToAnnotationsTab);
    4545      TabControl.addTabActivateListener('settings.inheritedAnnotations', Annotations.autoLoadInheritFrame);
    4646      TabControl.addTabValidator('settings.info', bioassaysets.validateBioAssaySet);
  • trunk/www/views/experiments/experiments.js

    r6942 r6944  
    4040
    4141      // Tab validation
    42       TabControl.addTabActivateListener('settings.annotations', Annotations.autoLoadEditFrame);
     42      TabControl.addTabActivateListener('settings.annotations', Annotations.onSwitchToAnnotationsTab);
    4343      TabControl.addTabValidator('settings.info', experiments.validateExperiment);
    4444     
  • trunk/www/views/experiments/rootrawbioassays/bioassays.js

    r6942 r6944  
    4040
    4141      // Tab validation
    42       TabControl.addTabActivateListener('settings.annotations', Annotations.autoLoadEditFrame);
     42      TabControl.addTabActivateListener('settings.annotations', Annotations.onSwitchToAnnotationsTab);
    4343      TabControl.addTabActivateListener('settings.inheritedAnnotations', Annotations.autoLoadInheritFrame);
    4444      TabControl.addTabValidator('settings.info', bioassays.validateBioAssay);
  • trunk/www/views/itemlists/lists.js

    r6840 r6944  
    4242      // Tab validation
    4343      TabControl.addTabValidator('settings.info', lists.validateList);
    44       TabControl.addTabActivateListener('settings.annotations', Annotations.autoLoadEditFrame);
     44      TabControl.addTabActivateListener('settings.annotations', Annotations.onSwitchToAnnotationsTab);
    4545     
    4646      var frm = document.forms['list'];
Note: See TracChangeset for help on using the changeset viewer.