aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorjeresig <jeresig@gmail.com>2010-01-12 21:54:06 -0500
committerjeresig <jeresig@gmail.com>2010-01-12 21:54:06 -0500
commit8e53f7b5d6716e60d8c8ea7e167f2b187aae9d89 (patch)
treee70c4035fdbaf65f782f3a0654c02cbffe9e9f23 /src
parentb5f077ae6af6d644c5ae58ba9fd79a08dc58ba1e (diff)
downloadjquery-8e53f7b5d6716e60d8c8ea7e167f2b187aae9d89.tar.gz
jquery-8e53f7b5d6716e60d8c8ea7e167f2b187aae9d89.zip
Fixed typo in logic, also disabled function setters in this case to allow the functions to passthrough and bind.
Diffstat (limited to 'src')
-rw-r--r--src/core.js2
-rw-r--r--src/event.js4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/core.js b/src/core.js
index 467895f74..edd108906 100644
--- a/src/core.js
+++ b/src/core.js
@@ -772,7 +772,7 @@ function access( elems, key, value, exec, fn, pass ) {
// Setting one attribute
if ( value !== undefined ) {
// Optionally, function values get executed if exec is true
- exec = exec && jQuery.isFunction(value);
+ exec = !pass && exec && jQuery.isFunction(value);
for ( var i = 0; i < length; i++ ) {
fn( elems[i], key, exec ? value.call( elems[i], i, fn( elems[i], key ) ) : value, pass );
diff --git a/src/event.js b/src/event.js
index ea1c14e94..02349984a 100644
--- a/src/event.js
+++ b/src/event.js
@@ -919,8 +919,8 @@ jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblcl
return fn ? this.bind( name, fn ) : this.trigger( name );
};
- if ( jQuery.fnAttr ) {
- jQuery.fnAttr[ name ] = true;
+ if ( jQuery.attrFn ) {
+ jQuery.attrFn[ name ] = true;
}
});