library-mirrors/jquery
1
0
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2024-11-23 02:54:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
3,839 Commits 5 Branches 161 Tags 48 MiB
3ad0ba62f0
Commit Graph

1288 Commits

Author SHA1 Message Date
Dave Methvin
3cfb134ab4 Merge pull request #367 from gnarf37/index-optimize 
Quick improvement to the performance of .index() with no arguments
 2011-08-04 15:11:42 -07:00
Dave Methvin
8d5c874227 Merge pull request #416 from gnarf37/ticket_6652 
CSS: Remove filter from style when setting opacity to 1 - Fixes #6652 - R
 2011-08-04 15:09:31 -07:00
Dave Methvin
b5a16ead1a Merge pull request #412 from rwldrn/9587 
jQuery.clone() check destination child nodes are not null. Fixes #9587
 2011-08-04 14:57:51 -07:00
Dave Methvin
59936dc04d Merge pull request #432 from rwldrn/9794 
Correct non-null|undefined evaluation of data property values. Fixes #9779
 2011-08-04 14:55:21 -07:00
Dave Methvin
6a3395afcd Merge pull request #419 from rwldrn/9630 
Unit tests assert that .contents().hasClass() works as expected. Fixes #9630
 2011-08-04 14:33:52 -07:00
Dave Methvin
5417a2cf6b Merge pull request #417 from rwldrn/9385 
Begrudgingly adds chrome detection to jQuery.browser (1.7). Fixes #9385
 2011-08-04 14:31:56 -07:00
Dave Methvin
d7681a12e5 Merge pull request #447 from rwldrn/9914 
Removes empty, duplicate named test block. Fixes #9914
 2011-08-04 14:12:10 -07:00
Dave Methvin
5f54cb7066 Merge pull request #448 from rwldrn/9912 
Renames duplicate named test block. Fixes #9912
 2011-08-04 14:11:17 -07:00
Dave Methvin
dd3662d0ff Merge pull request #449 from rwldrn/9913 
Removes duplicate test block. Fixes #9913
 2011-08-04 14:10:25 -07:00
Rick Waldron
905e8920f9 Landing pull request 453. Typo correction strictEquals=>strictEqual. Fixes #9964. 
More Details:
 - https://github.com/jquery/jquery/pull/453
 - http://bugs.jquery.com/ticket/9964
 2011-08-03 14:02:10 -04:00
Rick Waldron
a4fb358eac Removes duplicate test block. Fixes #9913 2011-07-26 12:08:50 -04:00
Rick Waldron
06c41e09bd Renames duplicate named test block. Fixes #9912 2011-07-26 11:52:01 -04:00
Rick Waldron
b5f80a6e31 Removes empty, duplicate named test block. Fixes #9914 2011-07-26 11:49:23 -04:00
Rick Waldron
ad16db370e Wrap obj.constructor test in try/catch. Thanks to bkrausz. Fixes #9897 2011-07-25 17:06:38 -04:00
jaubourg
27291ff06d Fixes #9255: xml parsing error in $.parseXML is now properly detected for all browsers. Unit test added. 2011-07-23 03:26:36 +02:00
jaubourg
0ed99097bd Fixes #9854: propagates native statusText onto jqXHR.statusText. statusText in callbacks is still normalized. Unit test added. 2011-07-23 02:39:12 +02:00
jaubourg
e6a99fdb0e Fixes #9887: ajax now supports circular references into objects passed as context. Prefilter and transport developpers should add their own custom option into flatOptions when needed. Unit test added. 2011-07-23 02:10:17 +02:00
Corey Frang
5b0c3060f0 Unit test for #6652 2011-07-13 22:54:25 -05:00
Krinkle
28b470d7d3 Landing pull request 433. Fix testswarm test cases. Fixes #9555. 
More Details:
 - https://github.com/jquery/jquery/pull/433
 - http://bugs.jquery.com/ticket/9555
 2011-07-12 17:12:07 -04:00
Rick Waldron
84d066ff7c Correct non-null|undefined evaluation of data property values. Fixes #9794 2011-07-10 21:45:50 -04:00
timmywil
1886d74434 Check the attribute node value for false for HTML5 booleans when not supported. Fixes #9504. 2011-07-09 14:52:16 -04:00
jaubourg
e83fcdcb02 Fixes #9682. Removes data from the options for request with no content so that it is not used again in case of a retry. Unit test added. 2011-07-01 02:11:26 +02:00
jaubourg
139135a98a Fixes #9446. Context is properly propagated using pipe. If context was the original deferred, then context is updated to next deferred in the chain. Unit tests added. 2011-07-01 01:51:50 +02:00
rwldrn
09fe3ea265 Updated version numbers; Fixes #9385 2011-06-23 08:46:26 -04:00
rwldrn
bb1702518e Filter hasClass by nodeType 1; Fixes #9630 2011-06-22 08:50:44 -04:00
rwldrn
27e5052a7b Assert that .contents().hasClass() works as expected. Fixes #9630 2011-06-21 14:04:06 -04:00
rwldrn
dd93d0eb32 Begrudgingly adds chrome detection to jQuery.browser (1.7). Fixes #9385 2011-06-20 09:57:26 -04:00
timmywil
96501d38a9 Allow similarly named classes (regression from 9499) and switch class retrieval to property when passing class to value functions. Fixes #9617. 2011-06-19 18:58:47 -04:00
rwldrn
5c3b9e0c24 jQuery.clone() check that destination child nodes are not null. Fixes #9587 2011-06-15 11:14:52 -04:00
gnarf
9a96af1d59 Quick improvement to the performace of .index() with no arguments - Adding a unit test for .index() of a node without a parent returns -1 2011-06-14 23:38:36 -05:00
John Resig
d59b0f3e27 Re-updating QUnit, oops. 2011-06-14 15:06:28 -07:00
John Resig
d443e533aa Tagging the 1.6.2rc1 release. 2011-06-14 14:54:23 -07:00
rwldrn
5eef5917fd Landing pull request 409. Adds fillOpacity to internal cssNumber. Fixes #9548. 
More Details:
 - https://github.com/jquery/jquery/pull/409
 - http://bugs.jquery.com/ticket/9548
 2011-06-14 15:59:22 -04:00
rwldrn
6926247bf4 Landing pull request 397. withinElement rewrite in event. Fixes #6234, #9357, #9447. 
More Details:
 - https://github.com/jquery/jquery/pull/397
 - http://bugs.jquery.com/ticket/6234
 - http://bugs.jquery.com/ticket/9357
 - http://bugs.jquery.com/ticket/9447
 2011-06-14 15:38:46 -04:00
timmywil
641ad80211 Attribute hooks do not need to be attached in XML docs. Fixes #9568. 2011-06-13 10:02:13 -04:00
timmywil
db437be6e3 Check classes passed for duplicates. Fixes #9499. 2011-06-07 21:00:44 -04:00
timmywil
75203de743 Optimize width/height retrieval (moved logic to getWH, removed adjustWH). Supplements #9441, #9300. 2011-06-06 23:35:16 -04:00
Mike Sherov
80ad14bd14 Add margin after checking width. Add tests. Fixes #9441. Fixes #9300. 2011-06-06 23:13:37 -04:00
rwldrn
0742056645 Landing pull request 403. Check for both camelized and hyphenated data property names; Fixes #9301. 
More Details:
 - https://github.com/jquery/jquery/pull/403
 - http://bugs.jquery.com/ticket/9301
 2011-06-06 20:18:36 -04:00
timmywil
71d2e657d0 Update QUnit. 2011-06-06 20:15:16 -04:00
timmywil
9d4033d629 Add test for appending an xml element to another. Supplements #9370. 2011-05-25 20:48:59 -04:00
timmywil
edb2286544 Return null for outer/inner width/height calls on window/document. Fixes #7557. 2011-05-25 19:49:50 -04:00
rwldrn
408c98fb4b Landing pull request 383. Relocating jQuery.camelCase to core; Fixes #9368. 
More Details:
 - https://github.com/jquery/jquery/pull/383
 - http://bugs.jquery.com/ticket/9368
 2011-05-25 15:10:49 -04:00
timmywil
a5396bde70 Attach background data to divs as well 2011-05-25 14:01:33 -04:00
timmywil
e5457a5a1f Remove unnecessary background setting in support now that we have the div reversion. Test added. 2011-05-25 13:58:05 -04:00
rwldrn
f82b9dddc4 Landing pull request 382. Adds support for number values (meter,progress); Fixes #9319. 
More Details:
 - https://github.com/jquery/jquery/pull/382
 - http://bugs.jquery.com/ticket/9319
 2011-05-20 11:03:33 -04:00
timmywil
25118e22a2 Handle unset value attributes consistently depending on property existence. Supplements #9328. 2011-05-18 11:46:22 -04:00
timmywil
ba90af0dc5 Make the value hook less obtrusive for elements which do not inherently have a value property. Fixes #9328. 2011-05-18 11:29:25 -04:00
timmywil
7d3ba9f89e Switched title attribute to getAttributeNode for IE6/7. Fixes #9329. 2011-05-18 11:05:20 -04:00
Rick Waldron
c17f589ec9 Landing pull request 377. Check custom data != null(undefined), allows zero; Fixes #9285. 
More Details:
 - https://github.com/jquery/jquery/pull/377
 - http://bugs.jquery.com/ticket/9285
 2011-05-16 10:38:36 -04:00
timmywil
a5cf257a8a Use getAttributeNode for ^on attributes in IE6/7 to avoid anonymous function wrapper. Fixes #9298. 2011-05-16 10:17:50 -04:00
timmywil
6171e0a923 Retrieve the class attribute on a form in IE6/7. Fixes 9286. 2011-05-14 12:07:40 -04:00
timmywil
bc82ff0ff9 Make sure setting boolean attributes to the same name sets the property to a boolean type 2011-05-13 13:39:38 -04:00
timmywil
6f676e692d Use prop to retrieve boolean properties (so the selected hook will be used) 2011-05-13 13:33:43 -04:00
Rick Waldron
ec829431fe Landing pull request 365. jQuery.buildFragment, ensure doc is a document; Fixes #8950. 
More Details:
 - https://github.com/jquery/jquery/pull/365
 - http://bugs.jquery.com/ticket/8950
 2011-05-13 12:26:17 -04:00
timmywil
a5b7c0fa33 Style edits for pull request 375 2011-05-13 12:14:31 -04:00
avaly
cbbd7d28e1 Landing pull request 375. Added test case to support #9237 Fixes #9237. 
More Details:
 - https://github.com/jquery/jquery/pull/375
 - http://bugs.jquery.com/ticket/9237
 2011-05-13 12:09:49 -04:00
timmywil
3486365062 Animation callbacks keep their place in the queue stack. Fixes #9220. 2011-05-13 11:56:55 -04:00
jaubourg
0f81cf8991 Adds iframe code for #9239. 2011-05-13 17:50:57 +02:00
jaubourg
ceba855c01 Fixes #9239. If the body is already present in the DOM, use a div within it to perform boxModel-related support tests. Unit test added. 2011-05-13 17:43:53 +02:00
timmywil
01c5b7f7f5 JR don't want my QUnit. 2011-05-11 12:02:41 -04:00
John Resig
f794f48f02 Adding in test case to support #9211. 2011-05-11 11:43:37 -04:00
jaubourg
391398cf23 Fixes #9221. Wraps openings of html comments and CDATA blocks found at the beginning of inserted script elements into a javascript block comment so that the new implementation of globalEval will not throw an exception in IE (execScript being less lenient than eval). Unit tests added. 2011-05-11 14:13:07 +02:00
timmywil
3a1c27b508 Revert "Updating QUnit." This commit actually reverted QUnit. 
This reverts commit f9cccd05b6.
 2011-05-10 13:58:50 -04:00
John Resig
f9cccd05b6 Updating QUnit. 2011-05-10 13:50:21 -04:00
John Resig
c42360b5be More formatting tweaking. 2011-05-10 12:57:55 -04:00
timmywil
d75c61a5bd Update QUnit 2011-05-10 12:46:55 -04:00
John Resig
1ec003f10c Fix tabs in delegate test. 2011-05-10 12:43:34 -04:00
John Resig
a5e407cafb Make sure that data properties with hyphens are always accessed/set using camelCase. Fixes #9124. 2011-05-10 11:56:42 -04:00
John Resig
419b5e5e2a Make sure that mouseenter/mouseleave fire on the correct element when doing delegation. Fixes #9069. 2011-05-10 11:49:32 -04:00
louisremi
521ae562da Landing pull request 374. .animate() Callbacks should fire in correct order (unit test included). Fixes #9100. 
More Details:
 - https://github.com/jquery/jquery/pull/374
 - https://github.com/jquery/jquery/issues/9100
 2011-05-10 11:22:12 -04:00
jaubourg
38de389a8e Adds unit/support.js to unit tests. Still have to test for #8763 has to be done in its own file however, since Firefox refuses to notify global errors in the iframe (attachEvent, window.onerror and script.onerror all fail). 2011-05-10 12:24:36 +02:00
louisremi
966c2fe46a oops console 2011-05-10 12:18:40 +02:00
timmywil
4526c8b0a0 Add fallback to prop for the window and document. Switch value to use the property instead of the attribute for back compat. 2011-05-10 00:28:02 -04:00
louisremi
f34a90b3f7 oops unit test 2011-05-09 17:46:00 +02:00
jaubourg
8c13cfa805 Fixes #9104. Returning null or undefined in a pipe callback shouldn't end up throwing an exception. Silly, silly, me. 2011-05-09 10:01:20 +02:00
jaubourg
efd0fce7a1 Fixes #9109. When jQuery is loaded in the body, then the fake body element used in support has to be inserted before the document's body for boxModel to be properly detected (got the hint by looking at the code in jQuery mobile). Test page added so that we can keep checking this. 2011-05-09 09:48:23 +02:00
timmywil
18b1cf2942 Remove value check from formHook; other elements can use value hook 2011-05-07 22:01:10 -04:00
timmywil
90f37aaf7a Call extend on prop to avoid changing original properties so that per-property easing is not lost in multiple animations with the same props 2011-05-07 21:26:02 -04:00
timmywil
8bb6e95b66 Set val before hide/show check and fix easing setting; also update attributes test for autofocus 
- The object passed should not change so it can be used in future animates, updated src and tests accordingly.
 2011-05-07 20:46:38 -04:00
Daniel Pihlstrom
3d1c27d52e Fix per-property easing. Fixes #9067 2011-05-07 19:28:07 -04:00
gnarf
31268449b9 Landing pull request 372. Test for numeric properties was using wrong variable. Fixes #9074. 
More Details:
 - https://github.com/jquery/jquery/pull/372
 2011-05-07 19:18:52 -04:00
timmywil
c085563270 Reduce the boolean list only to those that have corresponding IDLs that don't require being added to propFix; only set the IDL if it exists 
- See http://jsfiddle.net/timmywil/u5NLn/ for how boolean attributes are handled in every browser.
 2011-05-07 14:49:04 -04:00
timmywil
c72b0f3256 Check empty string instead of specified as specified is inconsistent on the name attribute. Fixes #9148. 2011-05-06 13:49:20 -04:00
timmywil
cccf9ad91d Add support for the contenteditable attribute 2011-05-05 12:52:04 -04:00
timmywil
5195335cf4 Set the property corresponding to a boolean attribute when setting to true. Fixes #9103. 
- Once boolean properties had been modified natively, setting the attribute no longer set the current value
 2011-05-04 15:53:00 -04:00
timmywil
480b88ca37 Set corresponding property to false when removing boolean attributes. Fixes #9094 2011-05-04 11:29:38 -04:00
timmywil
97144424cc Update boolean check to avoid crashes, add all name fixes to propFix (properties are case-sensitive in all browsers), add tests for prop 2011-05-04 00:31:01 -04:00
John Resig
a9d9f8c542 If no hook is provided, and a boolean property exists, use that to return an attribute-style value for boolean attributes. Fixes #9079. 2011-05-03 21:44:42 -04:00
John Resig
bfad45fe45 Fix problem with appending multiple string arguments in IE 6. Fixes #9072. 2011-05-03 15:02:26 -04:00
timmywil
4ac2fdda2c Fix setting value attributes on option elements. Fixes #9071. 2011-05-03 14:48:36 -04:00
timmywil
6d2fd57f45 Fix QUnit Header links 2011-05-02 18:14:12 -04:00
timmywil
ea24cd106b Avoid changing html in two places; add minified jQuery as an option to the main test page 2011-05-02 17:53:55 -04:00
timmywil
3dbd7b54de Add a test page for running the test suite against a fully built and compressed jQuery. Fixes #7650. 2011-05-02 16:56:39 -04:00
John Resig
6c449fd5df Make sure that empty nodelists continue to map properly. Fixes #8993. 2011-05-02 13:25:53 -04:00
John Resig
86aa764f0b Change check for skipping the initial quickExpr RegExp check. Fixes #8984. 2011-05-02 13:14:13 -04:00
timmywil
24a8ffb3ea Test for a colon in attribute names for IE6/7. Fixes #1591. 2011-05-01 17:09:50 -04:00
Rick Waldron
0c2d1aee54 jQuery.buildFragment, ensure doc is a document; Includes comments; Adds unit test. Fixes #8950 2011-04-30 10:42:36 -04:00
Rick Waldron
ca367674c1 Restored /g flag to rspaces; Adds unit tests; Supplements #9008 2011-04-28 21:15:45 -04:00
timmywil
b8a9c2ba34 Syntax in testrunner 2011-04-28 16:31:51 -04:00
rwldrn
632cd6c4ba Landing pull request 357. Update unit tests for widows & orphans. Supplements #8971 Fixes #8971. 
More Details:
 - https://github.com/jquery/jquery/pull/357
 - http://bugs.jquery.com/ticket/8971
 2011-04-28 15:56:02 -04:00
Rick Waldron
ebac797ac2 Landing pull request 354. Adds QUnit Aliases to testrunner.js. Fixes #8991. 
More Details:
 - https://github.com/jquery/jquery/pull/354
 - http://bugs.jquery.com/ticket/8991
 2011-04-28 15:28:01 -04:00
timmywil
c0450f3c2a Correct the attachment of the p tag in the widows/orphans tests. Fixes test suite in IE8 2011-04-27 16:33:12 -04:00
timmywil
fb65ba418a Merged pull request #345 from rwldrn/8971. 
No need to test for widows & orphans values in IE6-8. Fixes #8971
 2011-04-25 12:53:43 -07:00
rwldrn
86d5d3e809 No need to test for widows & orphans values in IE6-8. Fixes #8971 2011-04-25 13:13:57 -04:00
timmywil
5165033883 Add tests data- and aria- attributes and the autofocus boolean attribute and some style updates in jQuery.attr 2011-04-25 12:41:12 -04:00
John Resig
9b00827ac9 Disabling .add(form.elements) unit test. 2011-04-22 00:51:23 -04:00
Rick Waldron
3d9445e3fc Landing pull request 340. Adds widows, orphans to cssNumber hash; includes tests. Fixes #8936. 
More Details:
 - https://github.com/jquery/jquery/pull/340
 - http://bugs.jquery.com/ticket/8936
 2011-04-22 00:02:08 -04:00
timmywil
d274b7b9f7 Landing pull request 332. Appending disconnected radio or checkbox inputs and keeping checked setting Fixes #8060, #8500. 
More Details:
 - https://github.com/jquery/jquery/pull/332
 - http://bugs.jquery.com/ticket/8060
 - http://bugs.jquery.com/ticket/8500
 2011-04-21 21:51:23 -04:00
timmywil
3ac9eb7ce3 Landing pull request [337](https://github.com/jquery/jquery/pull/337). Value of radio inputs resets when type is set after the value in all IEs. Fixes #8570 ([bug](http://bugs.jquery.com/ticket/8570)). 2011-04-21 21:33:09 -04:00
timmywil
dbe966aa57 Update Sizzle and QUnit 2011-04-21 13:03:19 -04:00
jeresig
60cfab3d19 Updating Sizzle and QUnit. 2011-04-20 19:08:29 -04:00
timmywil
825d3d96ce Only use getAttributeNode on buttons when setting value 2011-04-19 13:17:38 -04:00
timmywil
34d80709ce Fix value attribute and val for value on button elements. Fixes #1954 2011-04-17 18:17:31 -04:00
John Resig
15da298f72 Remove unnecessary usage of Function.prototype.bind (#7783) but maintain API. Also fix bug with proxy failing when a name is provided. Fixes #8893. 2011-04-17 18:17:31 -04:00
Brian Brennan
3cb9c1835c Fix live mouseenter and mouseleave binding so they can be activated by triggers. Fixes #6514. 2011-04-17 18:17:31 -04:00
timmywil
3aa46725ed Merge branch 'qunit_fixture' 2011-04-17 14:12:31 -04:00
timmywil
68cc3ad730 Update QUnit, fix visibility of #dl and pass JSLint in effects.js 2011-04-17 14:12:05 -04:00
John Resig
21c0be8496 Make sure that hide or show don't fail when operating on non-Element nodes. Fixes #6135. 2011-04-17 11:07:42 -07:00
John Resig
728a70c036 Make sure that forms and selects are added to a jQuery set correctly. Fixes #6912. 2011-04-17 10:51:24 -07:00
timmywil
ecf6a3c383 Switch QUnit div from depreceted #main to #qunit-fixture 2011-04-17 02:43:57 -04:00
jrburke
0b1c2e642a Add support for registering jQuery as an AMD module. Only does so if the AMD loader indicates it has special allowances for multiple versions of jQuery being loaded in a page. 2011-04-16 20:35:18 -07:00
John Resig
5d70c6d797 Add in unit tests for #6993. 2011-04-16 17:39:30 -07:00
John Resig
5b197b6c5f Merge branch 'cellpadding_support' of https://github.com/timmywil/jquery into timmywil-cellpadding_support 2011-04-16 09:17:34 -07:00
John Resig
ce7b311b92 Backing out fix for #6481. 2011-04-16 09:12:53 -07:00
Jordan Boesch
c4d0cccecf revert to old code, bug is invalid 2011-04-15 07:48:50 -06:00
timmywil
b6d21592cb Add support for setting the cellPadding attribute in IE6/7 2011-04-14 23:11:49 -04:00
jeresig
1dda994c46 Merge branch '8099' of https://github.com/rwldrn/jquery. Fixes #8099. 
Conflicts:
	test/data/testsuite.css
 2011-04-14 15:57:47 -04:00
jeresig
cdb02d09f1 Merge branch 'bug_4146_v2' of https://github.com/jboesch/jquery into jboesch-bug_4146_v2 2011-04-14 15:44:58 -04:00
timmywil
38d6d9f6e0 Adjust the unit tests in traversing - is(jQuery) to avoid long-running script alerts 2011-04-14 00:46:10 -04:00
Jordan Boesch
e64d3d4e57 fixing bug 4146 - round 2! 2011-04-13 22:30:30 -06:00
timmywil
ca5bc202ac IE9's support for SVG elements unfortunately does not extend to clearAttributes. Checks for its presence before proceeding. 2011-04-13 23:45:58 -04:00
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
rwldrn
a76decc476 Ticket #8099 Performance tweaking, credits 2011-04-13 15:43:15 -04:00
rwldrn
59240d31c0 Ticket #8099 Updates per review 2011-04-13 13:58:17 -04:00
rwldrn
4fde550cb6 Ticket #8099 Conditional iframe approache, caches both iframe and iframedoc for reuse 2011-04-13 13:43:52 -04: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
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
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
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
rwldrn
7164615f67 Ticket 8099, Reattempt with iframe 2011-04-12 11:48:07 -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
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