Fix for improper object iteration in jQuery.css method

[jquery.git] / src / jquery / jquery.js

diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js
index 430e24f..9f6fbd0 100644 (file)
--- a/src/jquery/jquery.js
+++ b/src/jquery/jquery.js
@@ -1472,7 +1472,7 @@ jQuery.extend({
                if ( p == "height" || p == "width" ) {
                        var old = {}, oHeight, oWidth, d = ["Top","Bottom","Right","Left"];
 
-                       for ( var i in d ) {
+                       for ( var i=0; i<d.length; i++ ) {
                                old["padding" + d[i]] = 0;
                                old["border" + d[i] + "Width"] = 0;
                        }
@@ -2245,8 +2245,8 @@ jQuery.extend({
                },
 
                trigger: function(type,data,element) {
-                       // Touch up the incoming data
-                       data = data || [];
+                       // Clone the incoming data, if any
+                       data = $.merge([], data || []);
 
                        // Handle a global trigger
                        if ( !element ) {