Commit graph

3387 commits

Author SHA1 Message Date
timmywil 149a040794 Fix test suite fail in IE6/7 on event:undelegate - was failing an if where it shouldn't 2011-04-13 23:14:14 -04:00
jeresig 72ddc8c645 Merge branch 'master' of github.com:jquery/jquery 2011-04-13 16:42:20 -04:00
jeresig 42e20269ec Updating Sizzle. 2011-04-13 16:41:55 -04:00
jaubourg 4ad9b44dea 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. 2011-04-13 19:27:19 +02:00
jaubourg 4344d08417 Fixes #8635 again (fix was lost in rewrite). Also removes unnecessary "manual" garbage collection. 2011-04-13 18:35:38 +02:00
Dave Methvin f7f4ef91cf Merge branch 'fix_suite_fails' of https://github.com/timmywil/jquery into timmywil-fix_suite_fails 2011-04-12 19:42:35 -04:00
Dave Methvin 0032e30f75 Merge branch 'jslint_function_in_loop' of https://github.com/timmywil/jquery into timmywil-jslint_function_in_loop 2011-04-12 19:39:53 -04:00
timmywil 69866fd2e5 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 2011-04-12 19:32:18 -04:00
Dave Methvin bebd8bc01e Followup to #8753. Modify new Event constructor signature to jQuery.event(type, props), which can be exploited by jQuery.event.trigger as well. 2011-04-12 19:29:09 -04:00
Dave Methvin 6d49e84daf Merge branch 'fix-8790-quick-trigger'
Conflicts:
	src/event.js
2011-04-12 18:46:21 -04:00
Dave Methvin 9e71ad1b12 Explicitly set event.type in case we chopped out a namespace or exclusive flag. 2011-04-12 18:32:23 -04:00
timmywil 73f9ab6705 JSLint failed due to function created within for loop 2011-04-12 18:30:21 -04:00
Dave Methvin 352715bd08 Use explicit "new jQuery.Event" to avoid double-function-call overhead. 2011-04-12 17:46:15 -04:00
John Firebaugh 0d8b247cab Accessing the 'type' property on VML elements fails on IE. Fixes #7071. 2011-04-12 16:48:22 -04:00
John Resig 3418f32387 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
2011-04-12 16:39:30 -04:00
John Resig 122514a8da Merge branch 'master' of https://github.com/jclain/jquery into jclain-master 2011-04-12 16:26:41 -04:00
John Resig f1d75edec7 Merge branch 'bug_7931' of https://github.com/Xavi-/jquery into Xavi--bug_7931
Conflicts:
	src/offset.js
2011-04-12 16:13:56 -04:00
John Resig 978c065555 Merge branch 'Sub_Naming' of https://github.com/timmywil/jquery into timmywil-Sub_Naming
Conflicts:
	src/core.js
	src/css.js
	src/event.js
2011-04-12 16:05:40 -04:00
John Resig e7787cd098 More formatting tweaks. 2011-04-12 15:54:30 -04:00
John Resig 34adda3c88 Fixing some minor formatting problems. 2011-04-12 14:58:55 -04:00
John Resig b05d631b30 Merge branch 'fix-8790-quick-trigger' of https://github.com/dmethvin/jquery into dmethvin-fix-8790-quick-trigger 2011-04-12 14:57:30 -04:00
louisremi f19a74f10b revert last commit 2011-04-12 13:12:58 +02:00
louisremi 01a2b51b26 switch double quotes with single quotes 2011-04-12 13:07:38 +02:00
louisremi 02e0047e92 resolve more conflicts 2011-04-12 11:39:21 +02:00
louisremi a5604aedb7 merge with master and resolve more conflicts 2011-04-12 11:29:25 +02:00
louisremi 8547b34f92 resolve conflict 2011-04-12 11:18:44 +02:00
louisremi f42010b657 third batch 2011-04-12 10:47:46 +02:00
jeresig 312df0441b Revert "QUnit test for overriding important css declarations, references #4427"
This reverts commit 1299e89dcd.

Conflicts:

	test/unit/css.js
2011-04-12 00:54:12 -04:00
jeresig 0ff4c69929 Some minor code cleanup. 2011-04-12 00:38:48 -04:00
jeresig db80ad94d5 Merge branch 'fix_8402' of https://github.com/lrbabe/jquery into lrbabe-fix_8402 2011-04-12 00:37:51 -04:00
jeresig 430d9e0b06 Merge branch 'fix_8403' of https://github.com/lrbabe/jquery into lrbabe-fix_8403 2011-04-12 00:35:51 -04:00
jeresig 7bfb6a7dd3 Removing un-needed frameElement check as discussed in #8018. Fixes #8108. 2011-04-12 00:29:52 -04:00
jeresig 0d755dff13 Merge branch 'master' of https://github.com/inukshuk/jquery into inukshuk-master
Conflicts:
	test/unit/offset.js
2011-04-12 00:25:36 -04:00
jeresig ea6987e078 Merge branch 'master' of https://github.com/azatoth/jquery 2011-04-12 00:18:12 -04:00
Azatoth 1299e89dcd QUnit test for overriding important css declarations, references #4427 2011-04-12 00:17:07 -04:00
jeresig 31b3c44db3 Merge branch 'bug_4366' of https://github.com/jboesch/jquery into jboesch-bug_4366 2011-04-12 00:12:27 -04:00
jeresig 2d27ac4d29 Merge branch 'master' of https://github.com/robmorgan/jquery into robmorgan-master 2011-04-12 00:09:46 -04:00
jeresig 0fa0f4cf02 Merge branch 'attr_remove_list_check' of https://github.com/timmywil/jquery into timmywil-attr_remove_list_check 2011-04-12 00:05:21 -04:00
timmywil 98da6b13bc 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 2011-04-11 23:59:12 -04:00
timmywil cb659c6054 retrieving list with getAttribute is fine, no need to add list here anymore 2011-04-11 19:30:20 -04:00
jaubourg 2b70893928 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. 2011-04-12 01:09:35 +02:00
jaubourg f6f1cc77f4 Merge branch 'master' of github.com:jquery/jquery 2011-04-12 00:27:51 +02:00
louisremi 11adde5127 second batch 2011-04-11 22:33:29 +02:00
jeresig e9905b15d4 Merge branch '2773_firefox_opera_fix' of https://github.com/timmywil/jquery into timmywil-2773_firefox_opera_fix 2011-04-11 16:00:34 -04:00
louisremi 581fa82420 double quotes, again 2011-04-11 21:44:29 +02:00
louisremi cccd092fe0 first batch 2011-04-11 21:43:43 +02:00
louisremi 930731ba0f Double quote is the new simple quote 2011-04-11 21:33:15 +02:00
louisremi d710442201 the expected number of assertions shouldn't contain a condition 2011-04-11 21:14:41 +02:00
louisremi 6ddc3816dd limit this test to browsers not supporting opacity 2011-04-11 21:05:15 +02:00
louisremi 272b8d69dc replace cssPropsAware branch 2011-04-11 20:33:52 +02:00