]> source.dussan.org Git - jquery.git/commitdiff
Merge branch 'attrhooks.1.6'
authorjeresig <jeresig@gmail.com>
Sun, 10 Apr 2011 19:49:17 +0000 (15:49 -0400)
committerjeresig <jeresig@gmail.com>
Sun, 10 Apr 2011 19:49:17 +0000 (15:49 -0400)
Conflicts:
src/core.js
src/support.js

1  2 
src/core.js
src/support.js

diff --cc src/core.js
index b05d4138cd7b3437ad011e1b184c227730e29fa3,6b00a01513ee3c1deb6c63a1aff143cd001d4704..8f24000fa2cdc0a4090da9bc56fd9eb3ede43aa3
@@@ -892,5 -894,4 +892,4 @@@ function doScrollCheck() 
  // Expose jQuery to the global object
  return jQuery;
  
 -})();
 +})();
diff --cc src/support.js
index 50ae6dfd78ee47bd948185659ea72e74d571adc0,89d2bfea27cfe5e7356e1fc0200369dcb46fc48a..10696aabdd90579a8d7f73a2154e7009918d9444
@@@ -71,15 -58,20 +71,18 @@@ jQuery.support = (function() 
                // Make sure that a selected-by-default option has a working selected property.
                // (WebKit defaults to false instead of true, IE too, if it's in an optgroup)
                optSelected: opt.selected,
+               
+               // Test setAttribute on camelCase class. If it works, we need attrFixes when doing get/setAttribute (ie6/7)
+               getSetAttribute: div.className !== "t",
  
                // Will be defined later
 +              submitBubbles: true,
 +              changeBubbles: true,
 +              focusinBubbles: false,
                deleteExpando: true,
 -              optDisabled: false,
 -              checkClone: false,
                noCloneEvent: true,
 -              noCloneChecked: true,
 -              boxModel: null,
                inlineBlockNeedsLayout: false,
                shrinkWrapBlocks: false,
 -              reliableHiddenOffsets: true,
                reliableMarginRight: true
        };