diff options
| author | Mike Sherov <mike.sherov@gmail.com> | 2012-10-22 13:28:51 -0400 |
|---|---|---|
| committer | Mike Sherov <mike.sherov@gmail.com> | 2012-10-22 13:29:43 -0400 |
| commit | bede0123d99ed41ef2214edde795927e2a777f8a (patch) | |
| tree | 80ecc9bb03338459f179c80f2da77644152ffadd /src | |
| parent | 227c49a4596423a125bdcb1d25a2263e526360db (diff) | |
| download | jquery-bede0123d99ed41ef2214edde795927e2a777f8a.tar.gz jquery-bede0123d99ed41ef2214edde795927e2a777f8a.zip | |
new JSHINT mixed spaces/tabs is smart enough to not warn on multiline comments, rendering smarttabs useless
Diffstat (limited to 'src')
| -rw-r--r-- | src/.jshintrc | 1 | ||||
| -rw-r--r-- | src/event.js | 6 | ||||
| -rw-r--r-- | src/offset.js | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/src/.jshintrc b/src/.jshintrc index bc4ae7750..8a47fc233 100644 --- a/src/.jshintrc +++ b/src/.jshintrc @@ -8,7 +8,6 @@ "maxerr": 100, "newcap": false, "quotmark": "double", - "smarttabs": true, "strict": true, "sub": true, "trailing": true, diff --git a/src/event.js b/src/event.js index 499a30397..4b0040528 100644 --- a/src/event.js +++ b/src/event.js @@ -160,9 +160,9 @@ jQuery.event = { handleObj = eventType[ j ]; if ( ( mappedTypes || origType === handleObj.origType ) && - ( !handler || handler.guid === handleObj.guid ) && - ( !namespaces || namespaces.test( handleObj.namespace ) ) && - ( !selector || selector === handleObj.selector || selector === "**" && handleObj.selector ) ) { + ( !handler || handler.guid === handleObj.guid ) && + ( !namespaces || namespaces.test( handleObj.namespace ) ) && + ( !selector || selector === handleObj.selector || selector === "**" && handleObj.selector ) ) { eventType.splice( j--, 1 ); if ( handleObj.selector ) { diff --git a/src/offset.js b/src/offset.js index 6a2fdc993..385d8c743 100644 --- a/src/offset.js +++ b/src/offset.js @@ -172,7 +172,7 @@ jQuery.each( {scrollLeft: "pageXOffset", scrollTop: "pageYOffset"}, function( me if ( win ) { win.scrollTo( !top ? val : jQuery( win ).scrollLeft(), - top ? val : jQuery( win ).scrollTop() + top ? val : jQuery( win ).scrollTop() ); } else { |