deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
3345 commits 3 branches 62 tags 14 MiB
Commit graph

3345 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
timmywil a564a0b1ec 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 2011-04-11 12:24:31 -04:00
jeresig 094c48e0c5 Merge branch '8777' of https://github.com/rwldrn/jquery into rwldrn-8777 
Conflicts:
	src/event.js
 2011-04-11 12:13:04 -04:00
timmywil eb857e2b71 Fix unit tests in firefox 4 and opera 11, passing null or undefined to indexOf was throwing an error in those browsers 2011-04-11 11:54:55 -04:00
Rick Waldon 868e1e28ce Ticket #8753 Always set event type explicitly 2011-04-11 11:32:23 -04:00
jeresig 6591f6dd9d Fix broken merge. 2011-04-11 11:22:52 -04:00
jaubourg 4c3aba9a15 Merge branch 'master' of github.com:jquery/jquery 2011-04-11 13:41:17 +02:00
jaubourg 3411d47a6a Adds _mark and _unmark as a mean to keep track of ongoing non-queued animations in fn.promise. 2011-04-11 13:40:14 +02:00
Rob Morgan 91d0398813 Adding a full-stop 2011-04-11 12:32:45 +08:00
Rob Morgan 467747d55f Fixing typos in the README.md file 2011-04-11 12:24:38 +08:00
jeresig 56ffad2dad Merge branch '8101_lrbabe_requestAnimationFrame' of https://github.com/timmywil/jquery into timmywil-8101_lrbabe_requestAnimationFrame 
Conflicts:
	src/effects.js
 2011-04-10 17:27:34 -04:00
timmywil 791402b453 Separate raf function definition from passing it to requestAnimationFrame 2011-04-10 17:17:34 -04:00
jeresig 92dfb53314 Merge branch 'attrhooks.1.6v2' of https://github.com/timmywil/jquery 2011-04-10 17:11:35 -04:00
timmywil 215c507f79 Added back support.js test for getSetAttribute and removed some duplicate code that crept into attributes.js 2011-04-10 17:08:18 -04:00
jeresig f89edbc6e4 Merge branch 'modest_val_proposal' of https://github.com/timmywil/jquery into timmywil-modest_val_proposal 
Conflicts:
	src/attributes.js
 2011-04-10 16:56:56 -04:00
jeresig 14ecd9a992 Merge branch 'proxy-native-bind' of https://github.com/gf3/jquery into gf3-proxy-native-bind 2011-04-10 16:51:22 -04:00
jeresig 909a6ff60a Merge branch 'bug_7369' of https://github.com/timmywil/jquery into timmywil-bug_7369 2011-04-10 16:48:02 -04:00
jeresig 247363b9a7 Merge branch 'map-object.1.6' of https://github.com/danheberden/jquery into danheberden-map-object.1.6 2011-04-10 16:46:14 -04:00
jeresig 523db95de2 Merge branch '2773_find_closest' of https://github.com/timmywil/jquery into timmywil-2773_find_closest 
Conflicts:
	test/unit/traversing.js
 2011-04-10 16:37:09 -04:00
jeresig 52f31054fd Fix formatting. 2011-04-10 16:32:40 -04:00
jeresig b8fd1f03a6 Merge branch 'bug_2773' of https://github.com/timmywil/jquery into timmywil-bug_2773 2011-04-10 16:31:10 -04:00
jeresig 83dc078055 Bringing in the latest Sizzle code. 2011-04-10 16:28:44 -04:00
jeresig 2c74ee46ee Merge branch 'eventprops.1.6final' of https://github.com/rwldrn/jquery into rwldrn-eventprops.1.6final 
Conflicts:
	test/unit/event.js
 2011-04-10 16:28:15 -04:00