Commit graph

1036 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
jeresig
92dfb53314 Merge branch 'attrhooks.1.6v2' of https://github.com/timmywil/jquery 2011-04-10 17:11:35 -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
b8fd1f03a6 Merge branch 'bug_2773' of https://github.com/timmywil/jquery into timmywil-bug_2773 2011-04-10 16:31:10 -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
timmywil
c10a76ec71 Merge branch 'master' into attrhooks.1.6v2 2011-04-10 16:26:39 -04:00
jeresig
7fb95ebe8f Merge branch 'attrhooks.1.6'
Conflicts:
	src/core.js
	src/support.js
2011-04-10 15:49:17 -04:00
timmywil
da89d8768c Had some stale code in test/unit/attributes.js 2011-04-10 15:40:49 -04:00
Alexis Abril
8c318bf414 Fixes #7328. When getting data- attributes, after-cap any embedded dashes per the W3C HTML5 spec. 2011-04-10 15:17:00 -04:00
timmywil
3a1b4661f5 #8150 - When removing the width and height attributes in IE6/7, setting to "" actually sets to 0 instead of auto
- Having fixed this automatically with the use of removeAttribute in browsers that support it, this will fix it for IE6/7 as well.

- This has no effect on width/height styles set elsewhere( test added to removeAttr )

- With this addition, I need to call attr in removeAttr for IE6/7, which means boolean calls like .attr("checked", "") will no longer remove the attribute, which I think is fine.  .attr("checked", false) will still remove.  If I had left it, it would have gone in an infinite loop since setting to empty string is the only way to remove it in these browsers.

- The hrefNormalized hooks were returning null if they weren't present.  Added the null check to the getter.

- Now that the style support fails in IE8 as well due to uppercasing everything, no need to have style included with the hrefNormalized hooks
2011-04-09 17:25:06 -04:00
timmywil
17afd80d48 IE8 testing for lowercasing the css properties on retrieving style; had assumed the style support check failed in IE8, which it now does 2011-04-09 15:56:35 -04:00
jaubourg
7a1c6beab0 Renames chain as pipe. 2011-04-08 17:35:08 +02:00
Dave Methvin
98d83ef85f Fixes #8722. Remove try/catch used by #3533 to fix the IE Table Colon Blow bug, and instead check for colon in the event name. Thanks to daguej for scoping this out -- a colonoscopy you might say. 2011-04-07 22:52:15 -04:00
Dave Methvin
c470db6950 Merge branch 'master' of github.com:jquery/jquery 2011-04-07 11:30:26 -04:00
Dave Methvin
14193e449e Create jQuery.holdReady(true/false) method to encapsulate jQuery.readyWait++ / jQuery.ready(true) logic. Fix problem where jQuery.ready may trigger twice, causing the (unsupported) document.onready to run twice. Fixes #8803 . 2011-04-07 11:26:42 -04:00
jaubourg
f3c6077da0 Rewrite of globalEval. Uses window.execScript or window.eval with a trick to ensure proper context. Unit tests added. 2011-04-07 06:47:15 +02:00
jaubourg
4552d135f4 Adds fn.promise as a mean to observe the completion of animations on a set of elements. Only queued animations are handled for now, non-queued animations support coming soon. Effects unit tests updated to test the feature (needs more testing though). 2011-04-07 06:00:52 +02:00
jaubourg
bb99899ca0 Adds always and chain methods to deferreds. 2011-04-07 05:49:32 +02:00
Dave Methvin
b7dd8404c5 Fixes #8712. Bubble custom events to the window when they are triggered. Ride that, Cowboy! 2011-04-06 22:11:58 -04:00
carpie
e0856738e6 Skip id regex check when large html strings are passed to the jQuery constructor (#7990). 2011-04-05 23:18:35 -04:00
Dave Methvin
ceaf093942 Merge branch 'cssrelative.1.6' of https://github.com/danheberden/jquery into danheberden-cssrelative.1.6 2011-04-05 22:40:59 -04:00
Dave Methvin
0fbadbcced Merge branch 'domready' of https://github.com/cowboy/jquery 2011-04-05 22:24:40 -04:00
Dave Methvin
1e85027dee Merge branch '4321' of https://github.com/rwldrn/jquery into rwldrn-4321 2011-04-05 22:04:05 -04:00
Dave Methvin
c1316a4cb1 Shorten up the code and do event cleanup on test cases. 2011-04-05 21:59:09 -04:00
Dave Methvin
b5c7c507c1 Merge branch 'ticket_7883' of https://github.com/rwldrn/jquery into rwldrn-ticket_7883 2011-04-05 21:42:58 -04:00