Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

1.x master #1592

Closed
wants to merge 555 commits into from
Closed

1.x master #1592

wants to merge 555 commits into from

Conversation

wenber
Copy link

@wenber wenber commented Jun 7, 2014

合并到我的代码中

markelog and others added 30 commits September 17, 2013 18:21
@markelog
Correct test assertion of #10227 ticket for IE8
94a9a4f
@dmethvin
Update release script for sourcmap syntax change
a4d90ab 
(cherry picked from commit d79c036)
@dmethvin
Fix #14282. Don't fondle getPreventDefault if preventDefault exists. C…
60004e6 
…lose gh-1365.

(cherry picked from commit 4671ef1)

Conflicts:
	src/event.js
@dmethvin
Fix #14290. Don't throw if text node is appended to table. Close gh-1371
75a0b4a 
.

(cherry picked from commit ec3ac9a)
@dmethvin
Tagging the 1.11.0-beta1 release.
b445958
@dmethvin
Updating the source version to 1.11.0-pre
e0e0ab5
@Krinkle @gibson042
core: Fix cut off comment in jQuery.map from c72371f. Close gh-1379.
020414c 
(cherry picked from commit 2aa2957)
@anthonyryan1 @gibson042
No ticket: Fix XHTML regression. Close gh-1376.
4b37828
@gibson042
No ticket: Fix IE focus test failures
3d6ed44
@markelog
Run focus test only if document has focus
0b9a182
@mgol
No ticket. Get rid of comma expression in curCSS.
9bf6aaf
@gibson042
No ticket: Compress core and data modules
b31bd4c
@markelog
Try to fix focus test again
c809736
@markelog
Focus on the body before running focus test
b2f2763
@markelog
Add setup function for the event module
908d88c 
(cherry picked from the commit 2c0b902)
@mgol
No ticket. Simplify the post-uglify task. (cherry-picked from 923bfc8)
11f386f
@dmethvin
Fix #13993. Save result of native inline handlers. Close gh-1368.
b7da3b0 
(cherry picked from commit 3bcd04f)
@Krinkle @dmethvin
Gruntfile: Remove project prefix from TestSwarm job name
2ef0a17
@scottgonzalez @timmywil
Warn on npm install if Bower isn't installed.
e9a36f3
@timmywil
Edit bower install script based on comments. Close gh-1392.
44b9d87
@timmywil
Add bower install script and release scripts to jshint and pass lint
e239873
@timmywil
Update Sizzle to 1.10.10
f669420
@datag @gibson042
No ticket: Correct typo in README section "rebasing". Close gh-1398.
c733b48 
(cherry picked from commit 943dc6c)
@gibson042
Fix #14381: Update to Sizzle 1.10.11
64bdf41
@gibson042
No ticket: Fix subproject iframe tests
3774ee4 
(cherry picked from commit 13d58a9)
@timmywil
Update requirejs to compatible version, remove r.js
67e56db 
Conflicts:
	package.json
@timmywil
Remove comment
03dd514
@timmywil
Fixes #14450. Remove CommonJS+AMD syntax.
62900a9 
- To keep file size unaffected, an extra pragma was added to build.js to remove certain lines when building with special comments.

Conflicts:
	src/core.js
	src/css.js
	src/effects.js
	src/event.js
	src/manipulation.js
	src/offset.js
@gibson042
Fix #14432: Always return string from .css("z-index"). Close gh-1395.
32d61d7 
(cherry picked from commit 5ce4b06)

Conflicts:

	src/css/curCSS.js
@gibson042
No ticket: Small curCSS size optimizations
024317f 
(cherry picked from commit a339096)

Conflicts:

	src/css/curCSS.js
markelog and others added 28 commits April 15, 2014 17:46
@markelog
Tests: Copy some Sizzle combinators tests
0837e41
@markelog
Tests: Remove unused variables
4d5596e
@markelog
Tests: Fix failing ajax tests in oldIE
d89c278
@markelog
Tests: Comply the style guide
3dc5504
@markelog
Build: Update jscsrc
5ac2186 
* Update "grunt-jscs-checker" package

* Use ".jscsrc" file instead of old ".jscs.json"

* Use jquery preset instead of explicitly defining all the jscs rules

(Cherry-picked from b7283d7 commit)
@mgol
Build: Remove Sizzle from run names passed to the testswarm task
d2c4884 
(cherry-picked from d0131da)
@scottgonzalez
Build: Update version from pre to -pre
f873d06 
Ref jquery/jquery-release#61
Closes gh-1562
@ckosmowski @dmethvin
Dimensions: Reverse a check to avoid potential reflows
90c50ef 
Fixes #14979
Closes gh-1560
(cherry picked from commit 1ca8421)

Conflicts:
	AUTHORS.txt
@mgol
Css: Use only positive integers as values for widows/orphans
e848b46 
According to http://www.w3.org/TR/CSS2/page.html#propdef-orphans, widows
and orphans can take only positive integer values. Together with a Chrome 34
regression this caused the test to fail.

(cherry-picked from def4841)

Fixes #15016
Closes gh-1563
@gibson042
Selector: Update Sizzle to 1.10.19
12104f0 
Fixes #14901
Fixes #14793
(cherry picked from commit 90b43de)
@markelog
Build: Remove json check for jscs config
4287ee1 
(cherry-picked from 1514dca)
@dmethvin
Build: Add "browser" keyword for npm
dda29d7 
(cherry picked from commit 108428bcabb7027852ecd656b98f110a444039d0)
@markelog
Build: Spaces vs tabs
874304f 
* Use tabs instead of spaces in jscs config

* Always use spaces in package.json (really hope this is temporary)

(cherry-picked from bbace10)
@markelog
Effects: Respect display value on inline elements
f833c9a 
Take "olddisplay" value into the account

Fixes #14824
Closes gh-1566
Ref 73fe172

(cherry-picked from c34dbf5)
Conflicts:
	src/effects.js
@dmethvin
Data: Work around IE11 bug with onpageshow attribute
062a7d6 
Fixes #14894
(cherry picked from commit b8133e2)

Conflicts:
	src/data.js
	test/unit/data.js
@dmethvin
Bower: Update project version to 1.11.2-pre
89bf956
@dmethvin
Build: Bump version to 1.11.2-pre
7d5afcb 
The release script didn't go perfectly.
@poppinlp @mgol
Core: Remove repeated test
7cf9cea 
(cherry-picked from 69d4a48)

Closes gh-1570
@mgol
Core: Correct the number of expected tests
6738117 
(cherry-picked from da148f1)
@mgol
Ajax, Manipulation: don't test cross-document manip in Android 2.3
1bd576a 
(cherry-picked from 213b9604f3da654e4281eeea56fcb169f88ffd19)

Fixes #14796
Closes gh-1572
@timmywil
Build: update AUTHORS.txt
fdff2a9
@timmywil
Build: run jshint and jscs on release scripts
43756f6
@timmywil
Release: ensure Sizzle is the latest tag
523c871 
Fixes #14915
@markelog
Selector: Fix test iframe submission for firefox
9e5f49f 
Ref jquery/sizzle@20fbadb
(Cherry-picked from efc4f8d)
@markelog
Selector: Use jQuery reference not Sizzle
369add5 
(Cherry-picked from 3b9057a)
@timmywil
Ajax: move ajax event aliases to their own file
8530a2f 
Fixes #15126
@tjvantoll @timmywil
Ajax: Support usage without jQuery.event
479e37f 
Fixes #15118
Closes gh-1588
@tjvantoll @timmywil
Wrap: Declare a dependency on the manipulation module
6cb17c8 
Fixes #15121
Closes gh-1589
@lock lock bot locked as resolved and limited conversation to collaborators Jan 20, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet