]> source.dussan.org Git - jquery.git/commitdiff
Merge branch 'proxy-native-bind' of https://github.com/gf3/jquery into gf3-proxy...
authorjeresig <jeresig@gmail.com>
Sun, 10 Apr 2011 20:51:22 +0000 (16:51 -0400)
committerjeresig <jeresig@gmail.com>
Sun, 10 Apr 2011 20:51:22 +0000 (16:51 -0400)
1  2 
src/core.js
src/event.js
src/support.js
test/unit/core.js

diff --cc src/core.js
Simple merge
diff --cc src/event.js
Simple merge
diff --cc src/support.js
index 10696aabdd90579a8d7f73a2154e7009918d9444,8adec5a0f57d664b57d00ab1658ce8103739947d..2d7bc7caa5cbc4a5f4def3e2f49ebc2dbe1357ef
@@@ -71,29 -56,58 +71,33 @@@ 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",
  
+               // Test for presence of native Function#bind.
+               // Not in: >= Chrome 6, >= FireFox 3, Safari 5?, IE 9?, Opera 11?
+               nativeBind: jQuery.isFunction( Function.prototype.bind ),
                // Will be defined later
 +              submitBubbles: true,
 +              changeBubbles: true,
 +              focusinBubbles: false,
                deleteExpando: true,
 -              optDisabled: false,
 -              checkClone: false,
 -              _scriptEval: null,
                noCloneEvent: true,
 -              boxModel: null,
                inlineBlockNeedsLayout: false,
                shrinkWrapBlocks: false,
 -              reliableHiddenOffsets: true
 +              reliableMarginRight: true
        };
  
 +      // Make sure checked status is properly cloned
 +      input.checked = true;
 +      support.noCloneChecked = input.cloneNode( true ).checked;
 +
        // Make sure that the options inside disabled selects aren't marked as disabled
 -      // (WebKit marks them as diabled)
 +      // (WebKit marks them as disabled)
        select.disabled = true;
 -      jQuery.support.optDisabled = !opt.disabled;
 -
 -      jQuery.support.scriptEval = function() {
 -              if ( jQuery.support._scriptEval === null ) {
 -                      var root = document.documentElement,
 -                              script = document.createElement("script"),
 -                              id = "script" + jQuery.now();
 -
 -                      script.type = "text/javascript";
 -                      try {
 -                              script.appendChild( document.createTextNode( "window." + id + "=1;" ) );
 -                      } catch(e) {}
 -
 -                      root.insertBefore( script, root.firstChild );
 -
 -                      // Make sure that the execution of code works by injecting a script
 -                      // tag with appendChild/createTextNode
 -                      // (IE doesn't support this, fails, and uses .text instead)
 -                      if ( window[ id ] ) {
 -                              jQuery.support._scriptEval = true;
 -                              delete window[ id ];
 -                      } else {
 -                              jQuery.support._scriptEval = false;
 -                      }
 -
 -                      root.removeChild( script );
 -                      // release memory in IE
 -                      root = script = id  = null;
 -              }
 -
 -              return jQuery.support._scriptEval;
 -      };
 +      support.optDisabled = !opt.disabled;
  
        // Test to see if it's possible to delete an expando from an element
        // Fails in Internet Explorer
Simple merge