From: jeresig <jeresig@gmail.com>
Date: Sun, 10 Apr 2011 19:49:17 +0000 (-0400)
Subject: Merge branch 'attrhooks.1.6'
X-Git-Tag: 1.6b1~37
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=7fb95ebe8f1b79220947d127a5d2b8bf56143622;p=jquery.git

Merge branch 'attrhooks.1.6'

Conflicts:
	src/core.js
	src/support.js
---

7fb95ebe8f1b79220947d127a5d2b8bf56143622
diff --cc src/core.js
index b05d4138c,6b00a0151..8f24000fa
--- a/src/core.js
+++ b/src/core.js
@@@ -892,5 -894,4 +892,4 @@@ function doScrollCheck() 
  // Expose jQuery to the global object
  return jQuery;
  
 -})();
 +})();
- 
diff --cc src/support.js
index 50ae6dfd7,89d2bfea2..10696aabd
--- a/src/support.js
+++ b/src/support.js
@@@ -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
  	};