Skip to content
Permalink
Browse files

Merge branch 'attrhooks.1.6v2' of https://github.com/timmywil/jquery

  • Loading branch information...
jeresig committed Apr 10, 2011
2 parents f89edbc + 215c507 commit 92dfb53314b4654826940eec3dc98aede92d4d49
Showing with 3 additions and 20 deletions.
  1. +0 −14 src/attributes.js
  2. +3 −2 src/support.js
  3. +0 −4 test/unit/attributes.js
@@ -23,20 +23,6 @@ jQuery.fn.extend({
return jQuery.access( this, name, value, true, jQuery.prop );
},

removeProp: function( name ) {
return this.each(function() {
// try/catch handles cases where IE balks (such as removing a property on window)
try {
this[ name ] = undefined;
delete this[ name ];
} catch( e ) {}
});
},

prop: function( name, value ) {
return jQuery.access( this, name, value, true, jQuery.prop );
},

removeProp: function( name ) {
return this.each(function() {
// try/catch handles cases where IE balks (such as removing a property on window)
@@ -19,7 +19,8 @@ jQuery.support = (function() {
isSupported;

// Preliminary tests
div.innerHTML = " <link/><table></table><a href='/a' style='color:red;float:left;opacity:.55;'>a</a><input type='checkbox'/>";
div.setAttribute("className", "t");
div.innerHTML = " <link/><table></table><a href='/a' style='top:1px;float:left;opacity:.55;'>a</a><input type='checkbox'/>";

all = div.getElementsByTagName( "*" );
a = div.getElementsByTagName( "a" )[ 0 ];
@@ -48,7 +49,7 @@ jQuery.support = (function() {

// Get the style information from getAttribute
// (IE uses .cssText instead)
style: /red/.test( a.getAttribute("style") ),
style: /top/.test( a.getAttribute("style") ),

// Make sure that URLs aren't manipulated
// (IE normalizes it by default)
@@ -127,10 +127,6 @@ test("attr(String)", function() {

body.removeAttribute('foo'); // Cleanup

var select = document.createElement("select"), optgroup = document.createElement("optgroup"), option = document.createElement("option");
optgroup.appendChild( option );
select.appendChild( optgroup );

var $img = jQuery('<img style="display:none" width="215" height="53" src="http://static.jquery.com/files/rocker/images/logo_jquery_215x53.gif"/>').appendTo('body');
equals( $img.attr('width'), "215", "Retrieve width attribute an an element with display:none." );
equals( $img.attr('height'), "53", "Retrieve height attribute an an element with display:none." );

0 comments on commit 92dfb53

Please sign in to comment.
You can’t perform that action at this time.