Changeset 6337

Timestamp:

Oct 28, 2013, 4:29:30 PM (9 years ago)

Author:

Nicklas Nordborg

Message:

References #1729: Move in-page <script> elements to external *.js files

Cleaning out unused functions from table.js.

Location:

trunk/www

Files:

• biomaterials/lists/members/add_members.js (modified) (1 diff)
• biomaterials/lists/members/add_members_frameset.jsp (modified) (3 diffs)
• include/scripts/table.js (modified) (3 diffs)

trunk/www/biomaterials/lists/members/add_members.js

@@ -40 +40 @@
   }
   
-  addMembers.addSelected = function()
+  addMembers.addSelected = function(event)
   {
-    var selected = top['members'].Table.getSelected(0);
+    var tableId = Data.get(event.currentTarget, 'table-id');
+    var selected = top['members'].Table.getSelected(tableId);
     if (selected.length == 0)
     {

trunk/www/biomaterials/lists/members/add_members_frameset.jsp

@@ -40 +40 @@
 DbControl dc = sc.newDbControl();
 String urlToController = "";
+String tableId = "";
 try
 {
@@ -47 +48 @@
   {
     urlToController = "biosources";
+    tableId = "biosources";
   }
   else if (memberType == Item.SAMPLE)
   {
     urlToController = "samples";
+    tableId = "samples";
   }
   else if (memberType == Item.EXTRACT)
   {
     urlToController = "extracts";
+    tableId = "extracts";
   }
 }
@@ -72 +76 @@
       
     <base:buttongroup subclass="dialogbuttons topborder">
-      <base:button id="btnAddSelected" title="Add selected" />
+      <base:button id="btnAddSelected" title="Add selected" data-table-id="<%=tableId%>" />
       <base:button id="btnAddPage" title="Add current page" />
       <base:button id="btnAddAll" title="Add all" />

trunk/www/include/scripts/table.js

@@ -641 +641 @@
   }
 
+  /**
+    Toggle the selected status of a checkbox with 
+    @param tableDiv The ID or main table element
+    
+    @returns The toggled  element or null if no element was found
+  */
+  table.toggleCheckBox = function(tableDiv, itemId)
+  {
+    tableDiv = Doc.element(tableDiv);
+    var frm = document.forms[tableDiv.id];
+    
+    for (var i=0; i < frm.elements.length; i++)
+    {
+      var element = frm.elements[i];
+      if (element.type == 'checkbox' && element.name == itemId)
+      {
+        element.checked = !element.checked;
+        return element;
+      }
+    }
+    return null;
+  }
+
+  /**
+    Get the ID of all selected items in a table.
+    
+    @param tableDiv The ID or main table element
+    @param regexp An optional regular expression matching the names
+      of checkboxes that can be selected, if not specified it matches
+      checkboxes with numeric names (eg. the name is the id of the item
+      in the table)
+    @return An array object with the ID:s
+  */
+  table.getSelected = function(tableDiv, regexp)
+  {
+    tableDiv = Doc.element(tableDiv);
+    if (!regexp) regexp = /\d+/;
+
+    var frm = document.forms[tableDiv.id];
+    var items = [];
+    if (frm.item_id)
+    {
+      // Radio buttons
+      var element = Forms.getCheckedRadio(frm.item_id);
+      if (element != null)
+      {
+        items[items.length] = element.value;
+      }
+    }
+    else
+    {
+      // Checkboxes
+      for (var i=0; i < frm.elements.length; i++)
+      {
+        var element = frm.elements[i];
+        if (element.type == 'checkbox' && element.name.match(regexp) && element.checked)
+        {
+          items[items.length] = element.value;
+        }
+      }
+    }
+    return items;
+  }
+
   
   /**
@@ -646 +710 @@
     method (older way) or an event notification (new way).
     
-    @param tableId The ID attribute of the table tag
+    @param tableDiv The ID or main table element
+    @param regexp An optional regular expression matching the names
+      of checkboxes that can be selected, if not specified it matches
+      checkboxes with numeric names (eg. the name is the id of the item
+      in the table)
 
     @return The number of selected items
@@ -728 +796 @@
     return numSelected;
   }
-  
-  // ------- OLD CODE BELOW ------------------
-  table.poolItems = function(submitPage, ID, tableId, itemType, cmd, regexp)
-  {
-    var frm = document.forms[tableId];
-    if (Forms.numChecked(frm) < 1)
-    {
-      Forms.showNotification('check.uncheck', 'Please select at least one item in the list', null, 'pointer-left');
-      return;
-    }
-    var oldAction = frm.action;
-    var oldCmd = frm.cmd.value;
-    frm.action = submitPage;
-    frm.cmd.value = cmd ? cmd : "NewPooledItem";
-    frm.target = 'NewPooledItem'+tableId;
-    Main.openPopup('', 'NewPooledItem'+tableId, 750, 500);
-    frm.submit();
-    frm.target = window.name;
-    frm.action = oldAction;
-    frm.cmd.value = oldCmd;
-  }
-  
-  
-  /**
-    Return the selected items to the parent using a 
-    callback function.
-    @param tableId The ID attribute of the table tag
-    @param callback A function object which should take two parameters:
-      the ID and title of the selected item
-    @return The number of selected items
-  */
-  table.returnSelected = function(tableId, callback)
-  {
-    if (!callback) return 0;
-    var frm = document.forms[tableId];
-    var numSelected = 0;
-    if (frm.item_id)
-    {
-      var element = Forms.getCheckedRadio(frm.item_id);
-      if (element != null)
-      {
-        callback(element.value, element.title);
-        numSelected = 1;
-      }
-    }
-    else
-    {
-      for (var i=0; i < frm.elements.length; i++) // >
-      {
-        var element = frm.elements[i];
-        if (element.type == 'checkbox' && element.name.match(/\d+/) && element.checked)
-        {
-          callback(element.name, element.title);
-          numSelected++;
-        }
-      }
-    }
-    return numSelected;
-  }
-
-  
-  /**
-    Get the ID of all selected items.
-    @param tableId The ID attribute of the table tag
-    @return An array object with the ID:s
-  */
-  table.getSelected = function(tableId)
-  {
-    var frm = document.forms[tableId];
-    var items = new Array();
-    if (frm.item_id)
-    {
-      var element = Forms.getCheckedRadio(frm.item_id);
-      if (element != null)
-      {
-        items[items.length] = element.value;
-      }
-    }
-    else
-    {
-      for (var i=0; i < frm.elements.length; i++) // >
-      {
-        var element = frm.elements[i];
-        if (element.type == 'checkbox' && element.name.match(/\d+/) && element.checked)
-        {
-          items[items.length] = element.name;
-        }
-      }
-    }
-    return items;
-  }
-  
-  
-  table.itemOnClick = function(tableId, evt, itemId, mode, viewFunction, editFunction, returnFunction)
-  {
-    var frm = document.forms[tableId];
-    if (mode == 'selectone')
-    {
-      var index = Forms.checkRadio(frm.item_id, itemId);
-      returnFunction(frm.item_id.length ? frm.item_id[index] : frm.item_id);
-    }
-    else if (mode == 'selectmultiple' || mode == 'selectmultiplenobuttons')
-    {
-      var checkbox = table.toggleCheckBox(tableId, itemId);
-      returnFunction(checkbox);
-    }
-    else
-    {
-      if (evt && (evt.altKey || evt.ctrlKey || evt.shiftKey))
-      {
-        editFunction(itemId);
-      }
-      else
-      {
-        viewFunction(itemId);
-      }
-    }
-  }
-  
-  table.toggleCheckBox = function(tableId, itemId)
-  {
-    var frm = document.forms[tableId];
-    for (var i=0; i < frm.elements.length; i++) // >
-    {
-      var element = frm.elements[i];
-      if (element.type == 'checkbox' && element.name == itemId)
-      {
-        element.checked = !element.checked;
-        return element;
-      }
-    }
-    return null;
-  }
-  
+
   return table;
 }();