svn commit: r599212 - /tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry/corelib/components/palette.js

[hlship]

Author: hlship
Date: Wed Nov 28 16:04:06 2007
New Revision: 599212

URL: http://svn.apache.org/viewvc?rev=599212&view=rev
Log:
TAPESTRY-1745: Palette javascript errors in Internet Explorer

Modified:
    
tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry/corelib/components/palette.js

Modified: 
tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry/corelib/components/palette.js
URL: 
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry/corelib/components/palette.js?rev=599212&r1=599211&r2=599212&view=diff
==============================================================================
--- 
tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry/corelib/components/palette.js
 (original)
+++ 
tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry/corelib/components/palette.js
 Wed Nov 28 16:04:06 2007
@@ -11,10 +11,10 @@
         this.selected = $(id);
 
         this.hidden = $(id + ":values");
-         
+
          // Seperator used for values in the hidden field.
         this.sep = ";";
-         
+
          // The BUTTON elements
         this.select = $(id + ":select");
         this.deselect = $(id + ":deselect");
@@ -98,7 +98,7 @@
     {
         var options = $A(this.selected.options);
 
-    // Make sure that all elements from the (first) selectedIndex to the end 
are also selected.     
+    // Make sure that all elements from the (first) selectedIndex to the end 
are also selected.
         return options.slice(this.selected.selectedIndex).all(function(o)
         {
             return o.selected;
@@ -199,7 +199,24 @@
             if (candidate) before = candidate;
         }
 
-        to.add(option, before);
+        try
+        {
+            to.add(option, before);
+        }
+        catch (ex)
+        {
+            //probably IE complaining about type mismatch for before argument;
+            if (before == null)
+            {
+                //just add to the end...
+                to.add(option);
+            }
+            else
+            {
+                //use option index property...
+                to.add(option, before.index);
+            }
+        }
     },
 
     moveDownClicked : function(event)
@@ -210,7 +227,7 @@
         });
         var lastPos = lastSelected.index;
         var before = this.selected.options[lastPos + 2];
-        
+
     // TODO: needs to be "reorder options"
         this.reorderSelected(this.removeSelectedOptions(this.selected), 
before);
 
@@ -226,7 +243,7 @@
 
         this.updateHidden();
         this.updateButtons();
-    },
+    }
 };