]> source.dussan.org Git - jquery.git/log
jquery.git
13 years agoremove more useless code. feels good.
louisremi [Fri, 15 Apr 2011 13:18:21 +0000 (15:18 +0200)]
remove more useless code. feels good.

13 years ago- merge master
louisremi [Fri, 15 Apr 2011 12:44:55 +0000 (14:44 +0200)]
- merge master
- move private functions at the bottom
- remove duplicate code
- move more var at the top of their scope
- rewrite a loop to be more efficient

13 years agoUpdating the source version to 1.6pre.
jeresig [Thu, 14 Apr 2011 20:29:22 +0000 (16:29 -0400)]
Updating the source version to 1.6pre.

13 years agoTagging the 1.6b1 release. 1.6b1
jeresig [Thu, 14 Apr 2011 20:29:14 +0000 (16:29 -0400)]
Tagging the 1.6b1 release.

13 years agoAdds box-sizing check for IE9 inputs and buttons
timmywil [Thu, 14 Apr 2011 20:26:20 +0000 (16:26 -0400)]
Adds box-sizing check for IE9 inputs and buttons

13 years agoMerge branch '8099' of https://github.com/rwldrn/jquery. Fixes #8099.
jeresig [Thu, 14 Apr 2011 19:57:47 +0000 (15:57 -0400)]
Merge branch '8099' of https://github.com/rwldrn/jquery. Fixes #8099.

Conflicts:
test/data/testsuite.css

13 years agoFix formatting of pull 325. Fixes #4146.
jeresig [Thu, 14 Apr 2011 19:49:15 +0000 (15:49 -0400)]
Fix formatting of pull 325. Fixes #4146.

13 years agoMerge branch 'bug_4146_v2' of https://github.com/jboesch/jquery into jboesch-bug_4146_v2
jeresig [Thu, 14 Apr 2011 19:44:58 +0000 (15:44 -0400)]
Merge branch 'bug_4146_v2' of https://github.com/jboesch/jquery into jboesch-bug_4146_v2

13 years agoreduce function calls
louisremi [Thu, 14 Apr 2011 13:21:08 +0000 (15:21 +0200)]
reduce function calls
simplify easing resolution code
+ some code cleanup

13 years agoMerge branch 'master' of http://github.com/jquery/jquery into effectsCleanup
louisremi [Thu, 14 Apr 2011 09:46:29 +0000 (11:46 +0200)]
Merge branch 'master' of http://github.com/jquery/jquery into effectsCleanup

13 years agoAdjust the unit tests in traversing - is(jQuery) to avoid long-running script alerts
timmywil [Thu, 14 Apr 2011 04:46:10 +0000 (00:46 -0400)]
Adjust the unit tests in traversing - is(jQuery) to avoid long-running script alerts

13 years agofixing bug 4146 - round 2! 325/head
Jordan Boesch [Thu, 14 Apr 2011 04:30:30 +0000 (22:30 -0600)]
fixing bug 4146 - round 2!

13 years agoIE9's support for SVG elements unfortunately does not extend to clearAttributes....
timmywil [Thu, 14 Apr 2011 03:45:58 +0000 (23:45 -0400)]
IE9's support for SVG elements unfortunately does not extend to clearAttributes. Checks for its presence before proceeding.

13 years agoFix test suite fail in IE6/7 on event:undelegate - was failing an if where it shouldn't
timmywil [Thu, 14 Apr 2011 03:10:32 +0000 (23:10 -0400)]
Fix test suite fail in IE6/7 on event:undelegate - was failing an if where it shouldn't

13 years agoMerge branch 'master' of github.com:jquery/jquery
jeresig [Wed, 13 Apr 2011 20:42:20 +0000 (16:42 -0400)]
Merge branch 'master' of github.com:jquery/jquery

13 years agoUpdating Sizzle.
jeresig [Wed, 13 Apr 2011 20:41:55 +0000 (16:41 -0400)]
Updating Sizzle.

13 years agoTicket #8099 Performance tweaking, credits 322/head
rwldrn [Wed, 13 Apr 2011 19:43:15 +0000 (15:43 -0400)]
Ticket #8099 Performance tweaking, credits

13 years agoTicket #8099 Updates per review
rwldrn [Wed, 13 Apr 2011 17:58:17 +0000 (13:58 -0400)]
Ticket #8099 Updates per review

13 years agoTicket #8099 Conditional iframe approache, caches both iframe and iframedoc for reuse
rwldrn [Wed, 13 Apr 2011 17:43:52 +0000 (13:43 -0400)]
Ticket #8099 Conditional iframe approache, caches both iframe and iframedoc for reuse

13 years agoEnsures callback placeholders are tested for and eventually replaced in data only...
jaubourg [Wed, 13 Apr 2011 17:27:19 +0000 (19:27 +0200)]
Ensures callback placeholders are tested for and eventually replaced in data only when contentType is application/x-www-form-urlencoded and data is a string. Removes json to jsonp promotion when jsonp or jsonpCallback options are present. Uses new Deferred.always method to bind cleanUp function.

13 years agoFixes #8635 again (fix was lost in rewrite). Also removes unnecessary "manual" garbag...
jaubourg [Wed, 13 Apr 2011 16:35:38 +0000 (18:35 +0200)]
Fixes #8635 again (fix was lost in rewrite). Also removes unnecessary "manual" garbage collection.

13 years agoMerge branch 'fix_suite_fails' of https://github.com/timmywil/jquery into timmywil...
Dave Methvin [Tue, 12 Apr 2011 23:42:35 +0000 (19:42 -0400)]
Merge branch 'fix_suite_fails' of https://github.com/timmywil/jquery into timmywil-fix_suite_fails

13 years agoMerge branch 'jslint_function_in_loop' of https://github.com/timmywil/jquery into...
Dave Methvin [Tue, 12 Apr 2011 23:39:53 +0000 (19:39 -0400)]
Merge branch 'jslint_function_in_loop' of https://github.com/timmywil/jquery into timmywil-jslint_function_in_loop

13 years agoVML.type test was causing multiple test suite fails, fix attributes.js fail in IE6... 323/head
timmywil [Tue, 12 Apr 2011 23:32:18 +0000 (19:32 -0400)]
VML.type test was causing multiple test suite fails, fix attributes.js fail in IE6 where the val(String/Number) tests were interfering with the val(Function) tests

13 years agoFollowup to #8753. Modify new Event constructor signature to jQuery.event(type, props...
Dave Methvin [Tue, 12 Apr 2011 23:29:09 +0000 (19:29 -0400)]
Followup to #8753. Modify new Event constructor signature to jQuery.event(type, props), which can be exploited by jQuery.event.trigger as well.

13 years agoFixes #8099 using iframe to capture an element's real default display; suggested...
rwldrn [Tue, 12 Apr 2011 21:27:45 +0000 (17:27 -0400)]
Fixes #8099 using iframe to capture an element's real default display; suggested by lrbabe/louisremi

13 years agoMerge branch 'fix-8790-quick-trigger'
Dave Methvin [Tue, 12 Apr 2011 22:46:21 +0000 (18:46 -0400)]
Merge branch 'fix-8790-quick-trigger'

Conflicts:
src/event.js

13 years agoExplicitly set event.type in case we chopped out a namespace or exclusive flag.
Dave Methvin [Tue, 12 Apr 2011 22:32:23 +0000 (18:32 -0400)]
Explicitly set event.type in case we chopped out a namespace or exclusive flag.

13 years agoJSLint failed due to function created within for loop 321/head
timmywil [Tue, 12 Apr 2011 22:30:21 +0000 (18:30 -0400)]
JSLint failed due to function created within for loop

13 years agoUse explicit "new jQuery.Event" to avoid double-function-call overhead.
Dave Methvin [Tue, 12 Apr 2011 21:46:15 +0000 (17:46 -0400)]
Use explicit "new jQuery.Event" to avoid double-function-call overhead.

13 years agoAccessing the 'type' property on VML elements fails on IE. Fixes #7071.
John Firebaugh [Tue, 12 Apr 2011 20:48:22 +0000 (16:48 -0400)]
Accessing the 'type' property on VML elements fails on IE. Fixes #7071.

13 years agoMerge branch 'master' of https://github.com/rjgotten/jquery into rjgotten-master...
John Resig [Tue, 12 Apr 2011 20:39:30 +0000 (16:39 -0400)]
Merge branch 'master' of https://github.com/rjgotten/jquery into rjgotten-master. Also added in unit tests covering the case. Fixes #6180.

Conflicts:
src/manipulation.js

13 years agoMerge branch 'master' of https://github.com/jclain/jquery into jclain-master
John Resig [Tue, 12 Apr 2011 20:26:41 +0000 (16:26 -0400)]
Merge branch 'master' of https://github.com/jclain/jquery into jclain-master

13 years agoMerge branch 'bug_7931' of https://github.com/Xavi-/jquery into Xavi--bug_7931
John Resig [Tue, 12 Apr 2011 20:13:56 +0000 (16:13 -0400)]
Merge branch 'bug_7931' of https://github.com/Xavi-/jquery into Xavi--bug_7931

Conflicts:
src/offset.js

13 years agoMerge branch 'Sub_Naming' of https://github.com/timmywil/jquery into timmywil-Sub_Naming
John Resig [Tue, 12 Apr 2011 20:05:40 +0000 (16:05 -0400)]
Merge branch 'Sub_Naming' of https://github.com/timmywil/jquery into timmywil-Sub_Naming

Conflicts:
src/core.js
src/css.js
src/event.js

13 years agoMore formatting tweaks.
John Resig [Tue, 12 Apr 2011 19:54:30 +0000 (15:54 -0400)]
More formatting tweaks.

13 years agoFixing some minor formatting problems.
John Resig [Tue, 12 Apr 2011 18:58:55 +0000 (14:58 -0400)]
Fixing some minor formatting problems.

13 years agoMerge branch 'fix-8790-quick-trigger' of https://github.com/dmethvin/jquery into...
John Resig [Tue, 12 Apr 2011 18:57:30 +0000 (14:57 -0400)]
Merge branch 'fix-8790-quick-trigger' of https://github.com/dmethvin/jquery into dmethvin-fix-8790-quick-trigger

13 years agoFixes #8099 using iframe to capture an element's real default display; suggested...
rwldrn [Tue, 12 Apr 2011 17:47:27 +0000 (13:47 -0400)]
Fixes #8099 using iframe to capture an element's real default display; suggested by lrbabe/louisremi

13 years agoTicket 8099, Reattempt with iframe
rwldrn [Tue, 12 Apr 2011 15:48:07 +0000 (11:48 -0400)]
Ticket 8099, Reattempt with iframe

13 years agorevert last commit 319/head
louisremi [Tue, 12 Apr 2011 11:12:58 +0000 (13:12 +0200)]
revert last commit

13 years agoswitch double quotes with single quotes
louisremi [Tue, 12 Apr 2011 11:07:38 +0000 (13:07 +0200)]
switch double quotes with single quotes

13 years agoresolve more conflicts
louisremi [Tue, 12 Apr 2011 09:39:21 +0000 (11:39 +0200)]
resolve more conflicts

13 years agomerge with master and resolve more conflicts
louisremi [Tue, 12 Apr 2011 09:29:25 +0000 (11:29 +0200)]
merge with master and resolve more conflicts

13 years agoresolve conflict
louisremi [Tue, 12 Apr 2011 09:18:44 +0000 (11:18 +0200)]
resolve conflict

13 years agothird batch
louisremi [Tue, 12 Apr 2011 08:47:46 +0000 (10:47 +0200)]
third batch

13 years agoRevert "QUnit test for overriding important css declarations, references #4427"
jeresig [Tue, 12 Apr 2011 04:54:12 +0000 (00:54 -0400)]
Revert "QUnit test for overriding important css declarations, references #4427"

This reverts commit 1299e89dcd803ee0ed48622c716dc3d4c8567cb7.

Conflicts:

test/unit/css.js

13 years agoSome minor code cleanup.
jeresig [Tue, 12 Apr 2011 04:38:48 +0000 (00:38 -0400)]
Some minor code cleanup.

13 years agoMerge branch 'fix_8402' of https://github.com/lrbabe/jquery into lrbabe-fix_8402
jeresig [Tue, 12 Apr 2011 04:37:51 +0000 (00:37 -0400)]
Merge branch 'fix_8402' of https://github.com/lrbabe/jquery into lrbabe-fix_8402

13 years agoMerge branch 'fix_8403' of https://github.com/lrbabe/jquery into lrbabe-fix_8403
jeresig [Tue, 12 Apr 2011 04:35:51 +0000 (00:35 -0400)]
Merge branch 'fix_8403' of https://github.com/lrbabe/jquery into lrbabe-fix_8403

13 years agoRemoving un-needed frameElement check as discussed in #8018. Fixes #8108.
jeresig [Tue, 12 Apr 2011 04:29:52 +0000 (00:29 -0400)]
Removing un-needed frameElement check as discussed in #8018. Fixes #8108.

13 years agoMerge branch 'master' of https://github.com/inukshuk/jquery into inukshuk-master
jeresig [Tue, 12 Apr 2011 04:25:36 +0000 (00:25 -0400)]
Merge branch 'master' of https://github.com/inukshuk/jquery into inukshuk-master

Conflicts:
test/unit/offset.js

13 years agoMerge branch 'master' of https://github.com/azatoth/jquery
jeresig [Tue, 12 Apr 2011 04:18:12 +0000 (00:18 -0400)]
Merge branch 'master' of https://github.com/azatoth/jquery

13 years agoQUnit test for overriding important css declarations, references #4427
Azatoth [Tue, 12 Apr 2011 04:17:07 +0000 (00:17 -0400)]
QUnit test for overriding important css declarations, references #4427

13 years agoMerge branch 'bug_4366' of https://github.com/jboesch/jquery into jboesch-bug_4366
jeresig [Tue, 12 Apr 2011 04:12:27 +0000 (00:12 -0400)]
Merge branch 'bug_4366' of https://github.com/jboesch/jquery into jboesch-bug_4366

13 years agoMerge branch 'master' of https://github.com/robmorgan/jquery into robmorgan-master
jeresig [Tue, 12 Apr 2011 04:09:46 +0000 (00:09 -0400)]
Merge branch 'master' of https://github.com/robmorgan/jquery into robmorgan-master

13 years agoMerge branch 'attr_remove_list_check' of https://github.com/timmywil/jquery into...
jeresig [Tue, 12 Apr 2011 04:05:21 +0000 (00:05 -0400)]
Merge branch 'attr_remove_list_check' of https://github.com/timmywil/jquery into timmywil-attr_remove_list_check

13 years agoFixes unit/css.js test fail in Safari 5. support.js test was passing erroneously... 318/head
timmywil [Tue, 12 Apr 2011 03:59:12 +0000 (23:59 -0400)]
Fixes unit/css.js test fail in Safari 5. support.js test was passing erroneously due to the body to which the div was attached having a width of 0

13 years agoretrieving list with getAttribute is fine, no need to add list here anymore 317/head
timmywil [Mon, 11 Apr 2011 23:30:20 +0000 (19:30 -0400)]
retrieving list with getAttribute is fine, no need to add list here anymore

13 years agoBug fixes in queue.js: type in dequeue could be undefined which lead to a wrong data...
jaubourg [Mon, 11 Apr 2011 23:09:35 +0000 (01:09 +0200)]
Bug fixes in queue.js: type in dequeue could be undefined which lead to a wrong data key, which would then have undesirable data left dangling on elements. Also adds missing semicolon in effects unit.

13 years agoMerge branch 'master' of github.com:jquery/jquery
jaubourg [Mon, 11 Apr 2011 22:27:51 +0000 (00:27 +0200)]
Merge branch 'master' of github.com:jquery/jquery

13 years agosecond batch
louisremi [Mon, 11 Apr 2011 20:33:29 +0000 (22:33 +0200)]
second batch

13 years agoMerge branch '2773_firefox_opera_fix' of https://github.com/timmywil/jquery into...
jeresig [Mon, 11 Apr 2011 20:00:34 +0000 (16:00 -0400)]
Merge branch '2773_firefox_opera_fix' of https://github.com/timmywil/jquery into timmywil-2773_firefox_opera_fix

13 years agodouble quotes, again 256/head
louisremi [Mon, 11 Apr 2011 19:44:29 +0000 (21:44 +0200)]
double quotes, again

13 years agofirst batch
louisremi [Mon, 11 Apr 2011 19:43:43 +0000 (21:43 +0200)]
first batch

13 years agoDouble quote is the new simple quote
louisremi [Mon, 11 Apr 2011 19:33:15 +0000 (21:33 +0200)]
Double quote is the new simple quote

13 years agothe expected number of assertions shouldn't contain a condition
louisremi [Mon, 11 Apr 2011 19:14:41 +0000 (21:14 +0200)]
the expected number of assertions shouldn't contain a condition

13 years agolimit this test to browsers not supporting opacity
louisremi [Mon, 11 Apr 2011 19:05:15 +0000 (21:05 +0200)]
limit this test to browsers not supporting opacity

13 years agoreplace cssPropsAware branch 316/head
louisremi [Mon, 11 Apr 2011 18:33:52 +0000 (20:33 +0200)]
replace cssPropsAware branch

13 years agoMerge branch 'master' of github.com:jquery/jquery into fix-8790-quick-trigger 312/head
Dave Methvin [Mon, 11 Apr 2011 17:25:57 +0000 (13:25 -0400)]
Merge branch 'master' of github.com:jquery/jquery into fix-8790-quick-trigger

13 years agoShave some time off array setup in trigger/handle
Dave Methvin [Mon, 11 Apr 2011 17:19:00 +0000 (13:19 -0400)]
Shave some time off array setup in trigger/handle

13 years agoGroup all local functions at the top of the file and add comments
louisremi [Mon, 11 Apr 2011 17:01:04 +0000 (19:01 +0200)]
Group all local functions at the top of the file and add comments

13 years agoRun order problem when running full test suite in Opera 11, removed failing test... 315/head
timmywil [Mon, 11 Apr 2011 16:24:31 +0000 (12:24 -0400)]
Run order problem when running full test suite in Opera 11, removed failing test as it passed by itself and there are others just like it

13 years agoMerge branch '8777' of https://github.com/rwldrn/jquery into rwldrn-8777
jeresig [Mon, 11 Apr 2011 16:13:04 +0000 (12:13 -0400)]
Merge branch '8777' of https://github.com/rwldrn/jquery into rwldrn-8777

Conflicts:
src/event.js

13 years agoFix unit tests in firefox 4 and opera 11, passing null or undefined to indexOf was...
timmywil [Mon, 11 Apr 2011 15:54:55 +0000 (11:54 -0400)]
Fix unit tests in firefox 4 and opera 11, passing null or undefined to indexOf was throwing an error in those browsers

13 years agoMerge branch 'master' of github.com:jquery/jquery into fix-8790-quick-trigger
Dave Methvin [Mon, 11 Apr 2011 15:44:26 +0000 (11:44 -0400)]
Merge branch 'master' of github.com:jquery/jquery into fix-8790-quick-trigger

Conflicts:
src/event.js

13 years agoTicket #8753 Always set event type explicitly 314/head
Rick Waldon [Mon, 11 Apr 2011 15:32:23 +0000 (11:32 -0400)]
Ticket #8753 Always set event type explicitly

13 years agoMerge branch 'master' of github.com:jquery/jquery into fix-8790-quick-trigger
Dave Methvin [Mon, 11 Apr 2011 15:25:27 +0000 (11:25 -0400)]
Merge branch 'master' of github.com:jquery/jquery into fix-8790-quick-trigger

13 years agoFix broken merge.
jeresig [Mon, 11 Apr 2011 15:22:52 +0000 (11:22 -0400)]
Fix broken merge.

13 years agoMove initialization of event until we determine if anyone wants it.
Dave Methvin [Mon, 11 Apr 2011 15:15:00 +0000 (11:15 -0400)]
Move initialization of event until we determine if anyone wants it.

13 years agoMerge branch 'master' of github.com:jquery/jquery
jaubourg [Mon, 11 Apr 2011 11:41:17 +0000 (13:41 +0200)]
Merge branch 'master' of github.com:jquery/jquery

13 years agoAdds _mark and _unmark as a mean to keep track of ongoing non-queued animations in...
jaubourg [Mon, 11 Apr 2011 11:40:14 +0000 (13:40 +0200)]
Adds _mark and _unmark as a mean to keep track of ongoing non-queued animations in fn.promise.

13 years agoAdding a full-stop 313/head
Rob Morgan [Mon, 11 Apr 2011 04:32:45 +0000 (12:32 +0800)]
Adding a full-stop

13 years agoFixing typos in the README.md file
Rob Morgan [Mon, 11 Apr 2011 04:24:38 +0000 (12:24 +0800)]
Fixing typos in the README.md file

13 years agoMerge branch 'master' of github.com:jquery/jquery into fix-8790-quick-trigger
Dave Methvin [Sun, 10 Apr 2011 21:40:31 +0000 (17:40 -0400)]
Merge branch 'master' of github.com:jquery/jquery into fix-8790-quick-trigger

13 years agoMerge branch '8101_lrbabe_requestAnimationFrame' of https://github.com/timmywil/jquer...
jeresig [Sun, 10 Apr 2011 21:27:34 +0000 (17:27 -0400)]
Merge branch '8101_lrbabe_requestAnimationFrame' of https://github.com/timmywil/jquery into timmywil-8101_lrbabe_requestAnimationFrame

Conflicts:
src/effects.js

13 years agoSeparate raf function definition from passing it to requestAnimationFrame 298/head
timmywil [Sun, 10 Apr 2011 21:17:34 +0000 (17:17 -0400)]
Separate raf function definition from passing it to requestAnimationFrame

13 years agoMerge branch 'attrhooks.1.6v2' of https://github.com/timmywil/jquery
jeresig [Sun, 10 Apr 2011 21:11:35 +0000 (17:11 -0400)]
Merge branch 'attrhooks.1.6v2' of https://github.com/timmywil/jquery

13 years agoAdded back support.js test for getSetAttribute and removed some duplicate code that... 311/head
timmywil [Sun, 10 Apr 2011 21:08:18 +0000 (17:08 -0400)]
Added back support.js test for getSetAttribute and removed some duplicate code that crept into attributes.js

13 years agoMerge branch 'modest_val_proposal' of https://github.com/timmywil/jquery into timmywi...
jeresig [Sun, 10 Apr 2011 20:56:56 +0000 (16:56 -0400)]
Merge branch 'modest_val_proposal' of https://github.com/timmywil/jquery into timmywil-modest_val_proposal

Conflicts:
src/attributes.js

13 years agoMerge branch 'proxy-native-bind' of https://github.com/gf3/jquery into gf3-proxy...
jeresig [Sun, 10 Apr 2011 20:51:22 +0000 (16:51 -0400)]
Merge branch 'proxy-native-bind' of https://github.com/gf3/jquery into gf3-proxy-native-bind

13 years agoMerge branch 'bug_7369' of https://github.com/timmywil/jquery into timmywil-bug_7369
jeresig [Sun, 10 Apr 2011 20:48:02 +0000 (16:48 -0400)]
Merge branch 'bug_7369' of https://github.com/timmywil/jquery into timmywil-bug_7369

13 years agoMerge branch 'map-object.1.6' of https://github.com/danheberden/jquery into danheberd...
jeresig [Sun, 10 Apr 2011 20:46:14 +0000 (16:46 -0400)]
Merge branch 'map-object.1.6' of https://github.com/danheberden/jquery into danheberden-map-object.1.6

13 years agoMerge branch '2773_find_closest' of https://github.com/timmywil/jquery into timmywil...
jeresig [Sun, 10 Apr 2011 20:37:09 +0000 (16:37 -0400)]
Merge branch '2773_find_closest' of https://github.com/timmywil/jquery into timmywil-2773_find_closest

Conflicts:
test/unit/traversing.js

13 years agoFix formatting.
jeresig [Sun, 10 Apr 2011 20:32:40 +0000 (16:32 -0400)]
Fix formatting.

13 years agoMerge branch 'bug_2773' of https://github.com/timmywil/jquery into timmywil-bug_2773
jeresig [Sun, 10 Apr 2011 20:31:10 +0000 (16:31 -0400)]
Merge branch 'bug_2773' of https://github.com/timmywil/jquery into timmywil-bug_2773

13 years agoBringing in the latest Sizzle code.
jeresig [Sun, 10 Apr 2011 20:28:44 +0000 (16:28 -0400)]
Bringing in the latest Sizzle code.

13 years agoMerge branch 'eventprops.1.6final' of https://github.com/rwldrn/jquery into rwldrn...
jeresig [Sun, 10 Apr 2011 20:28:15 +0000 (16:28 -0400)]
Merge branch 'eventprops.1.6final' of https://github.com/rwldrn/jquery into rwldrn-eventprops.1.6final

Conflicts:
test/unit/event.js

13 years agoMerge branch 'master' into attrhooks.1.6v2
timmywil [Sun, 10 Apr 2011 20:26:39 +0000 (16:26 -0400)]
Merge branch 'master' into attrhooks.1.6v2

13 years agoMerge branch 'attrhooks.1.6'
jeresig [Sun, 10 Apr 2011 19:49:17 +0000 (15:49 -0400)]
Merge branch 'attrhooks.1.6'

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