Changeset 6256

Timestamp:

Mar 25, 2013, 10:48:46 AM (10 years ago)

Author:

Nicklas Nordborg

Message:

References #1729 and #1730. Use lazy loading for the 'Data files' frame in the edit dialogs. Inline scipts has also been removed from the edit file dialog and view and download file links.

Location:

trunk

Files:

• src/clients/web/net/sf/basedb/clients/web/Base.java (modified) (1 diff)
• www/common/datafiles/datafiles.js (added)
• www/common/datafiles/select_files.jsp (modified) (11 diffs)
• www/common/datafiles/select_frameset.jsp (added)
• www/filemanager/select_file.jsp (modified) (1 diff)
• www/include/scripts/main-2.js (modified) (1 diff)
• www/include/scripts/main.js (modified) (1 diff)
• www/lims/arraydesigns/edit_design.jsp (modified) (4 diffs)
• www/views/derivedbioassays/edit_bioassay.jsp (modified) (4 diffs)
• www/views/rawbioassays/edit_rawbioassay.jsp (modified) (4 diffs)

trunk/src/clients/web/net/sf/basedb/clients/web/Base.java

@@ -1647 +1647 @@
         separator = " ";
       }
-      link += " [<a href=\"javascript:Main.viewFile('" + ID + "', " + file.getId() + ")\"" + 
-        " title=\"View the contents of this file (" + bytes + ")\">" + viewIcon + "</a>" + 
+      link += " [<span class=\"link auto-init\" data-auto-init=\"view-file\" data-file-id=\"" + file.getId() + "\"" + 
+        " title=\"View the contents of this file (" + bytes + ")\">" + viewIcon + "</span>" + 
         separator + 
-        "<a href=\"javascript:Main.downloadFile('" + ID + "', " + file.getId() + ")\"" + "" +
+        "<span class=\"link auto-init\" data-auto-init=\"download-file\" data-file-id=\"" + file.getId() + "\"" +
         " title=\"Download the contents of this file (" + bytes + ")\">" + downloadIcon + "</a>]";
     }

trunk/www/common/datafiles/select_files.jsp

@@ -57 +57 @@
   import="net.sf.basedb.clients.web.formatter.FormatterSettings"
   import="net.sf.basedb.util.Values"
+  import="org.json.simple.JSONObject"
+  import="org.json.simple.JSONArray"
   import="java.util.ArrayList"
   import="java.util.List"
@@ -144 +146 @@
     Base.getDataFileTypes(itemType, item, platform, variant, itemSubtype);
   List<DataFileType> fileTypes = fileTypeQuery.list(dc);
+  boolean validationSupport = false;
+  JSONArray jsonFileTypes = new JSONArray();
+  
   String title = "Select data files for " + 
     HTML.encodeTags((item instanceof Nameable ? ((Nameable)item).getName() : 
       (item == null ? " new item" : item.toString())));
-
-  
-  
   %>
-  <base:page type="popup" title="<%=title%>">
-  <base:head >
-  
-  <script>
-  function init()
-  {
-    if (document.body.addEventListener)
-    {
-      // Mozilla
-      document.body.addEventListener('click', hideVisibleRecentFilesDiv, false);
-    }
-    else
-    {
-      // IE.
-      document.body.onclick = hideVisibleRecentFilesDiv;
-    }
-  }
-  
-  var lastFileTypeId;
-  var lastHasValidator = false;
-  function addFilesOnClick(event, fileTypeId, extension, hasValidator)
-  {
-    var frm = document.forms['datafiles'];
-    var url = '../../filemanager/index.jsp?ID=<%=ID%>&cmd=SelectMultiple&callback=addFileCallback';
-    if (extension)
-    {
-      url += '&resetTemporary=1&tmpfilter:STRING:name='+escape('%.' + extension);
-    }
-    else
-    {
-      url += '&resetTemporary=1&filter:STRING:name=';
-    }
-    lastFileTypeId = fileTypeId;
-    lastHasValidator = hasValidator;
-    Main.openPopup(url, 'SelectFile', 1050, 700);
-    if (event.stopPropagation)
-    {
-      event.stopPropagation();
-    }
-    else
-    {
-      event.cancelBubble = true;
-    }
-  }
-  function addFileCallback(fileId, path)
-  {
-    addFile(lastFileTypeId, fileId, path, lastHasValidator);
-  }
-  
-  function browseOnClick(event, fileTypeId, extension, hasValidator)
-  {
-    var frm = document.forms['datafiles'];
-    var url = '../../filemanager/index.jsp?ID=<%=ID%>&cmd=SelectOne&callback=setFileCallback';
-    if (extension)
-    {
-      url += '&resetTemporary=1&tmpfilter:STRING:name='+escape('%.' + extension);
-    }
-    else
-    {
-      url += '&resetTemporary=1&filter:STRING:name=';
-    }
-    lastFileTypeId = fileTypeId;
-    lastHasValidator = hasValidator;
-    Main.openPopup(url, 'SelectFile', 1050, 700);
-    if (event.stopPropagation)
-    {
-      event.stopPropagation();
-    }
-    else
-    {
-      event.cancelBubble = true;
-    }
-  }
-  function setFileCallback(fileId, path)
-  {
-    setFile(lastFileTypeId, fileId, path, lastHasValidator);
-  }
-  function setFile(fileTypeId, fileId, path, hasValidator)
-  {
-    var frm = document.forms['datafiles'];
-    var fileDiv = document.getElementById('filelist.'+fileTypeId);
-    if (fileId)
-    {
-      fileDiv.innerHTML = '<div id="filelist.'+fileTypeId+'.'+fileId+'" class="file">'+path+'</div>';
-    }
-    else
-    {
-      fileDiv.innerHTML = '';
-    }
-    if (hasValidator) frm['datafiles.validate'].checked = true;
-    new FileAction('setfile', fileTypeId, fileId);
-  }
-  function addFile(fileTypeId, fileId, path, hasValidator)
-  {
-    var frm = document.forms['datafiles'];
-    var fileDiv = document.getElementById('filelist.'+fileTypeId+'.'+fileId);
-    if (fileDiv) return;
-    
-    fileDiv = document.createElement('div');
-    fileDiv.id = 'filelist.'+fileTypeId+'.'+fileId;
-    var html = path + ' <span  class="icon link" title="Remove this file"';
-    html += ' onclick="removeFileOnClick(event,'+fileTypeId + ',' + fileId + ',' + hasValidator +')">';
-    html += '<img src="' + getRoot() + 'images/remove.png"></span>';
-    fileDiv.innerHTML = html; 
-    document.getElementById('filelist.'+fileTypeId).appendChild(fileDiv);
-    if (hasValidator) frm['datafiles.validate'].checked = true;
-    new FileAction('addfile', fileTypeId, fileId);
-  }
-  function removeFileOnClick(event, fileTypeId, fileId, hasValidator)
-  {
-    var frm = document.forms['datafiles'];
-    var fileDiv = document.getElementById('filelist.'+fileTypeId+'.'+fileId);
-    document.getElementById('filelist.'+fileTypeId).removeChild(fileDiv);
-    if (hasValidator) frm['datafiles.validate'].checked = true;
-    new FileAction('removefile', fileTypeId, fileId);
-    if (event.stopPropagation)
-    {
-      event.stopPropagation();
-    }
-    else
-    {
-      event.cancelBubble = true;
-    }
-  }
-  
-  var fileActions = new Array();
-  function FileAction(action, fileTypeId, fileId)
-  {
-    this.action = action;
-    this.fileTypeId = fileTypeId;
-    this.fileId = fileId;
-
-    for (var i = fileActions.length-1; i >= 0; i--)
-    {
-      var other = fileActions[i];
-      var remove = false;
-      if (action == 'setfile')
-      {
-        // Remove all other actions for the given file type
-        remove = other.fileTypeId == this.fileTypeId;
-      }
-      else
-      {
-        // Remove all other actions for the given file type+file
-        remove = other.fileTypeId == this.fileTypeId && other.fileId == this.fileId;
-      }
-      if (remove) fileActions.splice(i, 1);
-    }
-    fileActions[fileActions.length] = this;
-  }
-  
-  function writeFileActionsToForm(toForm)
-  {
-    var frm = document.forms['datafiles'];
-    if (frm['datafiles.validate'])
-    {
-      Forms.createHidden(toForm, 'datafiles.validate', frm['datafiles.validate'].checked ? 1 : 0);
-    }
-    for (var i = 0; i < fileActions.length; i++)
-    {
-      var action = fileActions[i];
-      Forms.createHidden(toForm, action.action + '.' + action.fileTypeId, action.fileId);
-    }
-  }
-  
-  var visibleRecentFilesDiv = null;
-  function recentFilesOnClick(event, fileTypeId)
-  {
-    var recentDiv = document.getElementById('recentfiles.'+fileTypeId);
-    var currentDiv = visibleRecentFilesDiv;
-    hideVisibleRecentFilesDiv();
-    if (currentDiv == recentDiv) return;
-    
-    var fileContainer = document.getElementById('container.'+fileTypeId);
-    var pos = Main.getElementPosition(fileContainer, true);
-    Main.show('recentfiles.'+fileTypeId);
-    
-    recentDiv.style.top = (pos.bottom-2) + 'px';
-    recentDiv.style.left = (pos.left) + 'px';
-    recentDiv.style.width = (pos.width-2) + 'px';
-
-    visibleRecentFilesDiv = recentDiv;
-    if (event.stopPropagation)
-    {
-      event.stopPropagation();
-    }
-    else
-    {
-      event.cancelBubble = true;
-    }
-  }
-
-  function selectRecentFile(fileTypeId, fileId, allowMultiple, hasValidator)
-  {
-    var path = document.getElementById('recentfile.'+fileTypeId+'.'+fileId).innerHTML;
-    if (allowMultiple)
-    {
-      addFile(fileTypeId, fileId, path, hasValidator);
-    }
-    else
-    {
-      setFile(fileTypeId, fileId, path, hasValidator);
-    }
-  }
-  
-  function hideVisibleRecentFilesDiv()
-  {
-    if (visibleRecentFilesDiv)
-    {
-      visibleRecentFilesDiv.style.display = 'none';
-      visibleRecentFilesDiv = null;
-    }
-  }
-  </script>
+  <base:page type="iframe" title="<%=title%>" id="select-datafiles">
+  <base:head scripts="~datafiles.js">
   <style>
   .filelist
   {
     margin-top: 1px;
-    cursor: pointer;
   }
 
@@ -447 +236 @@
   </style>
   </base:head>
-  <base:body onload="init()">
-
+  <base:body>
     <form name="datafiles">
     <div class="absolutefull filled">
@@ -454 +242 @@
     boolean hasNonPlatformFiles = false;      
     boolean activateCheckBoxes = false;
-    boolean validationSupport = false;
     if (fileTypes.size() == 0)
     {
@@ -508 +295 @@
         boolean isRequired = usable == null ? false : usable.isRequired();
         boolean allowMultiple = usable == null ? false : usable.getAllowMultiple();
-        String extension = dft.getExtension();
         boolean hasValidator = dft.hasActiveValidator(dc);
         validationSupport |= hasValidator;
         List<FileSetMember> files = members.get(dft);
         List<File> recentFiles = (List<File>)cc.getRecent(dc, Item.FILE, dft.getExternalId());
+        
+        JSONObject jsonFileType = new JSONObject();
+        jsonFileType.put("id", dft.getId());
+        jsonFileType.put("name", dft.getName());
+        jsonFileType.put("extension", dft.getExtension());
+        jsonFileType.put("hasValidator", hasValidator);
+        jsonFileType.put("allowMultiple", allowMultiple);
+        jsonFileTypes.add(jsonFileType);
         %>
         <tr>
@@ -530 +324 @@
             <%=HTML.encodeTags(label)%>
           </th>
-          <td onclick="<%="recentFilesOnClick(event, " + dftId + ")"%>">
+          <td>
             <div class="filelist <%=isRequired ? "required" : "" %>" id="container.<%=dftId%>">
             <table style="width: 100%;">
@@ -543 +337 @@
                   <div id="filelist.<%=dftId%>.<%=file.getId()%>" class="file">
                   <%=file.getPath() %>
-                  <base:icon image="remove.png" visible="<%=allowMultiple %>"
+                  <base:icon 
+                    id="<%="remove." + dftId+"."+file.getId()%>"
+                    data-file-id="<%=file.getId()%>"
+                    image="remove.png" visible="<%=allowMultiple %>"
                     tooltip="Remove this file"
-                    onclick="<%="removeFileOnClick(event, " + dftId + "," + file.getId() + "," + hasValidator + ")" %>"
                   />
                   </div>
@@ -554 +350 @@
               </td>
               <td class="fileaction">
-                <base:icon image="mini_scroll_down.png" 
+                <base:icon 
+                  id="<%="showrecent." + dftId%>"
+                  image="mini_scroll_down.png" 
                   visible="<%=recentFiles.size() >= 0 %>"
                   tooltip="Select a recently used file"
-                  onclick="<%="recentFilesOnClick(event, " + dftId + ")"%>"
                 />
-                <base:icon image="add.png" 
-                  onclick="<%="addFilesOnClick(event, "+dftId+", '" + HTML.javaScriptEncode(extension) + "', "+ hasValidator + ")"%>"
+                <base:icon id="<%="addfile." + dftId%>" 
+                  image="add.png" 
                   visible="<%=allowMultiple %>"
+                  tooltip="Browse for files in the BASE file system"
                 />
-                <base:icon image="browse.png" 
-                  onclick="<%="browseOnClick(event, "+dftId+", '" + HTML.javaScriptEncode(extension) + "', "+ hasValidator + ")"%>"
+                <base:icon id="<%="browsefile." + dftId%>" 
+                  image="browse.png" 
+                  tooltip="Browse for a file in the BASE file system"
                   visible="<%=!allowMultiple%>"
                 />
@@ -574 +373 @@
             <div id="recentfiles.<%=dftId%>" style="display: none;" class="recentfiles">
               <div class="recentfile"
-                onclick="selectRecentFile(<%=dftId%>, 0, false, <%=hasValidator%>)"
+                data-file-id="0"
                 id="recentfile.<%=dftId%>.0"
                 ><i>- clear -</i></div>
@@ -582 +381 @@
                 %>
                 <div class="recentfile"
-                  onclick="selectRecentFile(<%=dftId%>, <%=recent.getId()%>, <%=allowMultiple ? 1 : 0 %>, <%=hasValidator%>)"
+                  data-file-id="<%=recent.getId()%>"
                   id="recentfile.<%=dftId%>.<%=recent.getId()%>"
                   ><%=HTML.encodeTags(recent.getPath().toString())%></div>
@@ -642 +441 @@
     </div>
     </form>
+    <div id="page-data" class="datacontainer"
+      data-filetypes="<%=HTML.encodeTags(jsonFileTypes.toJSONString()) %>"
+      ></div>
 
   </base:body>

trunk/www/filemanager/select_file.jsp

@@ -84 +84 @@
   function returnSelected()
   {
+    var callback = '<%=callback%>';
+    var notifyTarget = window.opener.document.getElementById(callback);
+    var callbackMethod = window.opener[callback];
+    
     for (var i = 0; i < selected.length; i++)
     {
-      window.opener.<%=callback%>(selected[i].id, selected[i].path);
+      if (notifyTarget)
+      {
+        // Send event to the target in the opener window
+        Events.sendCustomEvent(notifyTarget, 'base-selected', {'id': selected[i].id, 'name': selected[i].path});
+      }
+      else if (callbackMethod)
+      {
+        // Call the callback method in the opener window
+        callbackMethod.call(null, selected[i].id, selected[i].path);
+      }
     }
     window.close();

trunk/www/include/scripts/main-2.js

@@ -1406 +1406 @@
 }();
 
-
+var Files = function()
+{
+  var files = {};
+  var internal = {};
+
+  /**
+    Open a new browser window for viewing the file contents of
+    the file with the given id. If no window name is specified a
+    new window is always created.
+  */
+  files.viewFile = function(fileId, windowName)
+  {
+    var controller = Main.getController('FILE');
+    var url = App.getRoot() + controller.url;
+    url += '?ID='+App.getSessionId();
+    url += '&cmd=ViewFile&item_id'+fileId;
+    if (!windowName) windowName = '_blank';
+    window.open(url, windowName);
+  }
+  
+  /**
+    Open a popup window for downloading the file contents of
+    the file with the given id. The download should start 
+    automatically.
+  */
+  files.downloadFile = function(fileId)
+  {
+    var controller = Main.getController('FILE');
+    var url = App.getRoot() + controller.url;
+    url += '?ID='+App.getSessionId();
+    url += '&cmd=DownloadFile&item_id'+fileId;
+    Main.openPopup(url, 'DownloadFile', 450, 300);
+  }
+  
+  /**
+    Event handler that call 'viewFile' when clicking
+    on the attached target. The file id should be stored
+    in the 'data-file-id' attribute.
+  */
+  files.viewFileOnClick = function(event)
+  {
+    files.viewFile(Data.get(event.currentTarget, 'file-id'));
+  }
+  
+  /**
+    Event handler that call 'downloadFile' when clicking
+    on the attached target. The file id should be stored
+    in the 'data-file-id' attribute.
+  */
+  files.downloadFileOnClick = function(event)
+  {
+    files.downloadFile(Data.get(event.currentTarget, 'file-id'));
+  }
+  
+  internal.initializeFileLinks = function(element, autoInit)
+  {
+    if (autoInit == 'view-file')
+    {
+      Events.addEventHandler(element, 'click', Files.viewFileOnClick);
+    }
+    else if (autoInit == 'download-file')
+    {
+      Events.addEventHandler(element, 'click', Files.downloadFileOnClick);
+    }
+  }
+  Doc.addElementInitializer(internal.initializeFileLinks);
+  
+  return files;
+}();
 
 var Forms = function()

trunk/www/include/scripts/main.js

@@ -470 +470 @@
   this.viewFile = function(ID, fileId)
   {
-    var controller = this.getController('FILE');
-    var url = getRoot() + controller.url + '?ID='+ID+'&cmd=ViewFile&item_id='+fileId;
-    window.open(url, '_blank');
-    //Main.openPopup(url, 'ViewFile', 800, 600, 'x');
+    Files.viewFile(fileId);
   }
 
   this.downloadFile = function(ID, fileId)
   {
-    var controller = this.getController('FILE');
-    var url = getRoot() + controller.url + '?ID='+ID+'&cmd=DownloadFile&item_id='+fileId;
-    Main.openPopup(url, 'DownloadFile', 450, 300);
+    Files.downloadFile(fileId);
   }
   

trunk/www/lims/arraydesigns/edit_design.jsp

@@ -187 +187 @@
         Annotations.saveModifiedAnnotationsToForm(frm);
         Annotations.saveInheritedAnnotationsToForm(frm);
-        if (dataFilesLoaded)
-        {
-          frames.datafiles.writeFileActionsToForm(frm);
-        }
+        DataFiles.writeFileActionsToForm(frm);
         frm.submit();
       }
@@ -205 +202 @@
     }
     
-    var dataFilesLoaded = false;
-    var platformChanged = false;
     function loadDataFilesFrame()
     {
       var frm = document.forms['design'];
-      if (platformChanged || !dataFilesLoaded)
-      {
-        var platform = Platforms.getSelectedPlatform(frm.platform);
-        var variant = Platforms.getSelectedVariant(frm.platform);
-        Platforms.loadDataFilesFrame(frames.datafiles, '<%=ID%>', '<%=itemType.name()%>', <%=design == null ? 0 : design.getId()%>, platform == null ? 0 : platform.id, variant == null ? 0 : variant.id);
-        dataFilesLoaded = true;
-        platformChanged = false;
-      }
-    }
-
-    function platformOnChange()
-    {
-      platformChanged = true;
+      var platform = Platforms.getSelectedPlatform(frm.platform);
+      var variant = Platforms.getSelectedVariant(frm.platform);
+      DataFiles.autoLoadEditFrame(platform ? platform.id : 0, variant ? variant.id : 0, 0);
     }
 
@@ -291 +276 @@
         <th>Platform</th>
         <td>
-          <select name="platform" onchange="platformOnChange()" class="required"
+          <select name="platform" class="required"
             <%=deniedPlatform ? "disabled" : "" %>>
           <%
@@ -340 +325 @@
     </t:tab>
 
-    <t:tab id="datafiles" title="Data files" helpid="datafiles.edit" activate="loadDataFilesFrame()"><iframe 
-      name="datafiles" id="idDatafiles" src="../../common/datafiles/wait.jsp" 
-      class="absolutefull" style="width: 100%; height: 100%;"></iframe></t:tab>
+    <t:tab id="datafiles" title="Data files" helpid="datafiles.edit" activate="loadDataFilesFrame()">
+      <jsp:include page="../../common/datafiles/select_frameset.jsp">
+        <jsp:param name="item_type" value="<%=itemType.name()%>" />
+        <jsp:param name="item_id" value="<%=itemId%>" />
+        <jsp:param name="ID" value="<%=ID%>" />
+      </jsp:include>
+    </t:tab>
 
     <t:tab id="annotations" title="Annotations" helpid="annotations.edit" activate="loadAnnotationsFrame()">

trunk/www/views/derivedbioassays/edit_bioassay.jsp

@@ -268 +268 @@
         Annotations.saveModifiedAnnotationsToForm(frm);
         Annotations.saveInheritedAnnotationsToForm(frm);
-        if (dataFilesLoaded)
-        {
-          frames.datafiles.writeFileActionsToForm(frm);
-        }
+        DataFiles.writeFileActionsToForm(frm);
         if (frm.addedPhysicalBioAssays)
         {
@@ -296 +293 @@
     }
 
-    var subtypeChanged = false;
-    var dataFilesLoaded = false;
-    
     function loadDataFilesFrame()
     {
-      if (subtypeChanged || !dataFilesLoaded)
-      {
-        var subtypeId = ItemSubtype.getSubtypeId('bioAssay');
-        Platforms.loadDataFilesFrame(frames.datafiles, '<%=ID%>', '<%=itemType.name()%>', <%=itemId%>, 0, 0, subtypeId);
-        dataFilesLoaded = true;
-        subtypeChanged = false;
-      }
+      var subtypeId = ItemSubtype.getSubtypeId('bioAssay');
+      DataFiles.autoLoadEditFrame(0, 0, subtypeId);
     }
       
@@ -351 +340 @@
       var frm = document.forms['bioAssay'];
       var subtypeId = ItemSubtype.getSubtypeId('bioAssay');
-      subtypeChanged = true;
       var recentInfo = ItemSubtype.getRecentAndRelatedInfo(subtypeId, 'BIOASSAY', ['PROTOCOL', 'HARDWARE', 'SOFTWARE']);
       ItemSubtype.updateSelectionList(frm.protocol_id, recentInfo.PROTOCOL['recent'], recentInfo.PROTOCOL['default']);
@@ -893 +881 @@
     </t:tab>
 
-    <t:tab id="datafiles" title="Data files" helpid="datafiles.edit" activate="loadDataFilesFrame()"><iframe 
-      name="datafiles" id="idDatafiles" src="../../common/datafiles/wait.jsp" 
-      class="absolutefull" style="width: 100%; height: 100%;"></iframe></t:tab>
+    <t:tab id="datafiles" title="Data files" helpid="datafiles.edit" activate="loadDataFilesFrame()">
+      <jsp:include page="../../common/datafiles/select_frameset.jsp">
+        <jsp:param name="item_type" value="<%=itemType.name()%>" />
+        <jsp:param name="item_id" value="<%=itemId%>" />
+        <jsp:param name="ID" value="<%=ID%>" />
+      </jsp:include>    
+    </t:tab>
 
     <t:tab id="annotations" title="Annotations &amp; parameters" helpid="annotations.edit" activate="loadAnnotationsFrame()">

trunk/www/views/rawbioassays/edit_rawbioassay.jsp

@@ -356 +356 @@
         Annotations.saveModifiedAnnotationsToForm(frm);
         Annotations.saveInheritedAnnotationsToForm(frm);
-        if (dataFilesLoaded)
-        {
-          frames.datafiles.writeFileActionsToForm(frm);
-        }
+        DataFiles.writeFileActionsToForm(frm);
         frm.submit();
       }
@@ -374 +371 @@
     }
   
-    var dataFilesLoaded = false;
-    var platformChanged = false;
-
     function loadDataFilesFrame()
     {
       var frm = document.forms['rawbioassay'];
-      if (platformChanged || !dataFilesLoaded)
-      {
-        var platform = Platforms.getSelectedPlatform(frm.platform);
-        var variant = Platforms.getSelectedVariant(frm.platform);
-        Platforms.loadDataFilesFrame(frames.datafiles, '<%=ID%>', '<%=itemType.name()%>', <%=rawBioAssay == null ? 0 : rawBioAssay.getId()%>, platform == null ? 0 : platform.id, variant == null ? 0 : variant.id);
-        dataFilesLoaded = true;
-        platformChanged = false;
-      }
+      var platform = Platforms.getSelectedPlatform(frm.platform);
+      var variant = Platforms.getSelectedVariant(frm.platform);
+      DataFiles.autoLoadEditFrame(platform ? platform.id : 0, variant ? variant.id : 0, 0);
     }
     
@@ -393 +382 @@
     {
       var frm = document.forms['rawbioassay'];
-      platformChanged = true;
       var platform = Platforms.getSelectedPlatform(frm.platform);
       var variant = Platforms.getSelectedVariant(frm.platform);
@@ -879 +867 @@
     </t:tab>
     
-    <t:tab id="datafiles" title="Data files" helpid="datafiles.edit" activate="loadDataFilesFrame()"><iframe 
-      name="datafiles" id="idDatafiles" src="../../common/datafiles/wait.jsp" 
-      class="absolutefull" style="width: 100%; height: 100%;"></iframe></t:tab>
+    <t:tab id="datafiles" title="Data files" helpid="datafiles.edit" activate="loadDataFilesFrame()">
+      <jsp:include page="../../common/datafiles/select_frameset.jsp">
+        <jsp:param name="item_type" value="<%=itemType.name()%>" />
+        <jsp:param name="item_id" value="<%=itemId%>" />
+        <jsp:param name="ID" value="<%=ID%>" />
+      </jsp:include>
+    </t:tab>
 
     <t:tab id="annotations" title="Annotations &amp; parameters" helpid="annotations.edit" activate="loadAnnotationsFrame()">