Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | Merge branch 'master' of github.com:jquery/jquery into fix-8790-quick-trigger | Dave Methvin | 2011-04-11 | 1 | -1/+4 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/event.js | |||||
| * \ \ \ \ \ \ \ | Merge branch 'master' of github.com:jquery/jquery into fix-8790-quick-trigger | Dave Methvin | 2011-04-11 | 1 | -7/+2 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Move initialization of event until we determine if anyone wants it. | Dave Methvin | 2011-04-11 | 1 | -15/+18 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Merge branch 'master' of github.com:jquery/jquery into fix-8790-quick-trigger | Dave Methvin | 2011-04-10 | 26 | -728/+1492 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Allow specific custom events to exit trigger early if there are no handlers ↵ | Dave Methvin | 2011-04-06 | 1 | -2/+15 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bound for that type. | |||||
* | | | | | | | | | | | revert last commit | louisremi | 2011-04-12 | 1 | -1/+1 | |
| | | | | | | | | | | | ||||||
* | | | | | | | | | | | switch double quotes with single quotes | louisremi | 2011-04-12 | 1 | -1/+1 | |
| | | | | | | | | | | | ||||||
* | | | | | | | | | | | resolve more conflicts | louisremi | 2011-04-12 | 1 | -4/+0 | |
| | | | | | | | | | | | ||||||
* | | | | | | | | | | | merge with master and resolve more conflicts | louisremi | 2011-04-12 | 19 | -86/+321 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Revert "QUnit test for overriding important css declarations, references #4427" | jeresig | 2011-04-12 | 2 | -19/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 1299e89dcd803ee0ed48622c716dc3d4c8567cb7. Conflicts: test/unit/css.js | |||||
| * | | | | | | | | | | | Some minor code cleanup. | jeresig | 2011-04-12 | 1 | -5/+5 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Merge branch 'fix_8402' of https://github.com/lrbabe/jquery into lrbabe-fix_8402 | jeresig | 2011-04-12 | 2 | -6/+26 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | replace cssPropsAware branch | louisremi | 2011-04-11 | 2 | -6/+26 | |
| | | |/ / / / / / / / / | | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | | Merge branch 'fix_8403' of https://github.com/lrbabe/jquery into lrbabe-fix_8403 | jeresig | 2011-04-12 | 3 | -5/+9 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | double quotes, again | louisremi | 2011-04-11 | 1 | -1/+1 | |
| | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | Double quote is the new simple quote | louisremi | 2011-04-11 | 1 | -1/+1 | |
| | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | the expected number of assertions shouldn't contain a condition | louisremi | 2011-04-11 | 1 | -3/+3 | |
| | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | limit this test to browsers not supporting opacity | louisremi | 2011-04-11 | 1 | -2/+4 | |
| | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | Adding unit tests for #8403 | louisremi | 2011-03-07 | 2 | -2/+3 | |
| | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | fixing both #8403 and #8401: jQuery \"bulldozes\" other IE filters when ↵ | louisremi | 2011-03-01 | 1 | -3/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | setting opacity | |||||
| * | | | | | | | | | | | | Removing un-needed frameElement check as discussed in #8018. Fixes #8108. | jeresig | 2011-04-12 | 1 | -11/+0 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Merge branch 'master' of https://github.com/inukshuk/jquery into inukshuk-master | jeresig | 2011-04-12 | 2 | -4/+32 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: test/unit/offset.js | |||||
| | * | | | | | | | | | | | | Use parseFloat instead of parseInt to read CSS values. | Sylvester Keil | 2011-01-15 | 2 | -3/+31 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes #7730 and #7885. | |||||
| * | | | | | | | | | | | | | Merge branch 'master' of https://github.com/azatoth/jquery | jeresig | 2011-04-12 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | Makefile: pull_submodules cleaning | Carl Fürstenberg | 2011-03-22 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Empirical testing confirms that pulling the url again is enough | |||||
| * | | | | | | | | | | | | | | QUnit test for overriding important css declarations, references #4427 | Azatoth | 2011-04-12 | 2 | -0/+19 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Merge branch 'bug_4366' of https://github.com/jboesch/jquery into ↵ | jeresig | 2011-04-12 | 2 | -3/+13 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jboesch-bug_4366 | |||||
| | * | | | | | | | | | | | | | | Bug 4366; removing extra space | Jordan Boesch | 2011-03-30 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | Bug 4366; fixing $.each(document.styleSheets) from throwing errors in IE | Jordan Boesch | 2011-03-30 | 2 | -3/+13 | |
| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/robmorgan/jquery into ↵ | jeresig | 2011-04-12 | 1 | -4/+4 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | robmorgan-master | |||||
| | * | | | | | | | | | | | | | | | Adding a full-stop | Rob Morgan | 2011-04-11 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Fixing typos in the README.md file | Rob Morgan | 2011-04-11 | 1 | -4/+4 | |
| | | |_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Merge branch 'attr_remove_list_check' of https://github.com/timmywil/jquery ↵ | jeresig | 2011-04-12 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into timmywil-attr_remove_list_check | |||||
| | * | | | | | | | | | | | | | | | retrieving list with getAttribute is fine, no need to add list here anymore | timmywil | 2011-04-11 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | Fixes unit/css.js test fail in Safari 5. support.js test was passing ↵ | timmywil | 2011-04-11 | 2 | -4/+7 | |
| |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | erroneously due to the body to which the div was attached having a width of 0 | |||||
| * | | | | | | | | | | | | | | | Bug fixes in queue.js: type in dequeue could be undefined which lead to a ↵ | jaubourg | 2011-04-12 | 2 | -13/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wrong data key, which would then have undesirable data left dangling on elements. Also adds missing semicolon in effects unit. | |||||
| * | | | | | | | | | | | | | | | Merge branch 'master' of github.com:jquery/jquery | jaubourg | 2011-04-12 | 4 | -14/+45 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch '2773_firefox_opera_fix' of https://github.com/timmywil/jquery ↵ | jeresig | 2011-04-11 | 2 | -5/+9 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into timmywil-2773_firefox_opera_fix | |||||
| | | * | | | | | | | | | | | | | | Run order problem when running full test suite in Opera 11, removed failing ↵ | timmywil | 2011-04-11 | 2 | -4/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test as it passed by itself and there are others just like it | |||||
| | | * | | | | | | | | | | | | | | Fix unit tests in firefox 4 and opera 11, passing null or undefined to ↵ | timmywil | 2011-04-11 | 1 | -1/+6 | |
| | | | |_|_|_|_|_|/ / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | indexOf was throwing an error in those browsers | |||||
| | * | | | | | | | | | | | | | | Merge branch '8777' of https://github.com/rwldrn/jquery into rwldrn-8777 | jeresig | 2011-04-11 | 2 | -0/+29 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/event.js | |||||
| | | * | | | | | | | | | | | | | Ticket #8777 undelegate by namespace | rwldrn | 2011-04-05 | 2 | -8/+39 | |
| | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | Ticket #8753 Always set event type explicitly | Rick Waldon | 2011-04-11 | 1 | -2/+5 | |
| | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | Fix broken merge. | jeresig | 2011-04-11 | 1 | -7/+2 | |
| | | |/ / / / / / / / / / / | | |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Merge branch 'master' of github.com:jquery/jquery | jaubourg | 2011-04-11 | 17 | -370/+899 | |
| |\| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Adds _mark and _unmark as a mean to keep track of ongoing non-queued ↵ | jaubourg | 2011-04-11 | 3 | -37/+183 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | animations in fn.promise. | |||||
* | | | | | | | | | | | | | | resolve conflict | louisremi | 2011-04-12 | 1 | -8/+3 | |
| | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | third batch | louisremi | 2011-04-12 | 7 | -616/+616 | |
| | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | second batch | louisremi | 2011-04-11 | 6 | -460/+460 | |
| | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | first batch | louisremi | 2011-04-11 | 1 | -2/+2 | |
| |/ / / / / / / / / / / / |/| | | | | | | | | | | | |