Changeset 2165 for plugins/apostrophePlugin/trunk/web/js

Timestamp:

09/09/10 12:28:23 (21 months ago)

Author:

wjohnald

Message:

merged aControls.js into the trunk

Location:

plugins/apostrophePlugin/trunk/web/js

Files:

• . (modified) (1 prop)
• aControls.js (modified) (6 diffs)

plugins/apostrophePlugin/trunk/web/js/aControls.js

@@ -71 +71 @@
                 options = {};
         }
-  $(target + ' select[multiple]').each(
+        
+  $(target).find('select[multiple]').each(
     function(i) {
       var name = $(this).attr('name');
@@ -127 +128 @@
       if (id === '')
       {
-        // Hopefully unique
-        id = name;
+        // We need a unique ID for the element, give it one
+        id = 'a_id_' + Math.floor(Math.random() * 1000000000);
       }
       var html = "<div class='a-multiple-select' id='" + id + "'>";
@@ -152 +153 @@
       {
         html += "<input type='checkbox' name='" + name + "'";
+
+        if (options['class-name'] !== undefined)
+        {
+                html += "class='" + options['class-name'] + "'";
+        }
+
         if (selected[j])
         {
@@ -219 +226 @@
         $(items[k]).click(function() { update($(this).data("boxid"), false); return false; });
       }
+      
+      
       function update(remove, initial)
       {
@@ -236 +245 @@
           value = select.options[index].value;
         }
+        
         var boxes = $('#' + id + " input[type=checkbox]");
-        for (k = 1; (k < length); k++)
-        {
-          if (boxes[k].value === remove)
-          {
-            boxes[k].checked = false;
-          }
-          if (boxes[k].value === value)
-          {
-            boxes[k].checked = true;
-          }
-        }
+        
+        boxes.each(function()
+        {
+                if ($(this).val() === remove)
+                {
+                                $(this).attr('checked', false);
+                }
+                else if ($(this).val() === value)
+                {
+                        $(this).attr('checked', true);
+                }
+        });
+        
         var items = $('#' + id + ' ul li');
         var k;
@@ -253 +265 @@
         for (k = 0; (k < length); k++)
         {
-          if (boxes[k].checked)
+          if ($(boxes[k]).is(':checked'))
           {
             $(items[k]).show();