Commit Graph

5221 Commits

Author SHA1 Message Date
Richard Gibson
7e383b1b07 Merge branches '1.x-master' and '1.x-master' of github.com:jquery/jquery into 1.x-master 2013-11-08 10:10:21 -05:00
Oleg
0b987dbaf9 Check Gruntfile and tasks for code style
Cherry picked from 85d4c0133b commit
2013-11-08 16:07:45 +01:00
Oleg
7f829752e6 Don't execute focus tests in Firefox
Cherry picked from 45be91e398 commit
2013-11-08 16:07:26 +01:00
Oleg
d6fc713e26 Use full version of jQuery 1.9.1
Had some weird failures in IE with xhr build of 1.9.1.
Cherry picked from 626cbde7f8 commit
2013-11-08 01:07:09 +01:00
Sindre Sorhus
878b00772e Add "keywords" to bower.json
Cherry picked from 0bb4090c2c commit
2013-11-07 22:09:33 +01:00
Sindre Sorhus
7e5c2cb6e8 Add load-grunt-tasks package dependency
Cherry picked from abfa210adf commit
2013-11-07 22:09:33 +01:00
Oleg
22120cea66 Fix some code style inconsistencies 2013-11-07 22:09:33 +01:00
Oleg
bcae427015 Fix #12757 - use jscs to check the style guide
Cherry picked from ab63e568f50b5b9823490eda9c184e48cc6440c4 commit
2013-11-07 22:09:32 +01:00
Oleg
9e3d0f3109 Fix #14422 and add more thorough check for CSP violations
Close gh-1413
2013-11-07 22:08:50 +01:00
Richard Gibson
ba2a8fb01e Ref c66a5e70: Synchronize unit tests with master 2013-11-07 11:59:56 -05:00
Richard Gibson
126d596b56 Fix #14074: element id="nodeName". Close gh-1389. 2013-11-07 11:37:52 -05:00
Chris Antaki
d0b8f9fa93 Ref fb2e0a0c: Synchronize unit tests with master 2013-11-07 11:37:15 -05:00
Corey Frang
075763b71a Fix #14101: $().data() should be undefined, not null
- Backported 30eee925db for 1.x
2013-11-06 11:07:52 -05:00
Marian Sollmann
3c968ce65d Fix #14190: Remove unnecessary assignment in .closest. Close gh-1411.
(cherry picked from commit 346b031af9e3b315ef351a9cc7fee56f930cf346)

Conflicts:

	src/traversing.js
2013-11-06 10:27:48 -05:00
Richard Gibson
90d9c4632c No ticket: Update style per gh-1418 comments 2013-11-04 12:58:13 -05:00
Richard Gibson
45a45599af Ref 705216dc: Synchronize ajax/xhr.js with master. Close gh-1418. 2013-11-04 09:42:26 -05:00
Richard Gibson
faed51b2e9 Ref f9d41ac6: Opera-compatible form target
(cherry picked from commit d5b7139abc)
2013-11-04 09:41:34 -05:00
Richard Gibson
26705c6c5b Fix #14379: AJAX requests on unload
(cherry picked from commit f9d41ac641)

Conflicts:

	src/ajax/xhr.js
2013-11-04 09:41:19 -05:00
Richard Gibson
d8576139c1 Fix #14459: Use jQuery.parseJSON instead of JSON.parse
(cherry picked from commit ced9d155f0)
2013-10-28 11:39:43 -04:00
Michał Gołębiowski
5823bf3f44 No ticket. Update npm devDependencies. (cherry-picked from 95d1192d53) 2013-10-25 21:27:49 +02:00
Michał Gołębiowski
4743f017a6 Add tests for class manipulation on jQuery object containing more than one element. Close gh-1404. (cherry-picked from 35b2b94979) 2013-10-25 00:50:55 +02:00
Dave Methvin
469150a27e Revert "Fix #14180. Allow cross-frame use of focusin/out. Close gh-1369."
This reverts commit bba8366af4.

Because cross-frame focus sucks.
2013-10-22 22:47:34 -04:00
Dave Methvin
bba8366af4 Fix #14180. Allow cross-frame use of focusin/out. Close gh-1369.
(cherry picked from commit 6d5dfa0eda2c19e8838930fafff83b596654eca2)
Manually edited for conflicts.
2013-10-22 21:48:50 -04:00
Ronny Springer
aa70819598 Ref 2263134b: Better identify potential JSON. Close gh-1401.
(cherry picked from commit 083edd60a6)

Conflicts:

	src/data.js
2013-10-16 08:50:13 -04:00
Timmy Willison
08b6271b6d Only set uglify options if not already the default 2013-10-15 18:00:41 -04:00
Timo Tijhof
e15627022f No ticket: Clean up uglifyjs compress options. Close gh-1382. 2013-10-15 16:48:33 -04:00
Lihan Li
a5063ee2a1 Fix #14394: Changing style !important in webkit. Close gh-1385.
(cherry picked from commit 24e587929f)

Conflicts:

	src/css.js
2013-10-15 16:38:38 -04:00
Richard Gibson
1ceecf4c64 No ticket: Test cleanup
(cherry picked from commit 8df348e9eb)

Conflicts:

	test/unit/css.js
2013-10-15 15:51:08 -04:00
Richard Gibson
024317f03b No ticket: Small curCSS size optimizations
(cherry picked from commit a339096d6a)

Conflicts:

	src/css/curCSS.js
2013-10-15 15:19:45 -04:00
George Kats
32d61d75e5 Fix #14432: Always return string from .css("z-index"). Close gh-1395.
(cherry picked from commit 5ce4b06c28)

Conflicts:

	src/css/curCSS.js
2013-10-15 13:58:06 -04:00
Timmy Willison
62900a9edb Fixes #14450. Remove CommonJS+AMD syntax.
- 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
2013-10-15 11:59:16 -04:00
Timmy Willison
03dd51494f Remove comment 2013-10-15 10:45:15 -04:00
Timmy Willison
67e56db39e Update requirejs to compatible version, remove r.js
Conflicts:
	package.json
2013-10-15 09:54:06 -04:00
Richard Gibson
3774ee49e0 No ticket: Fix subproject iframe tests
(cherry picked from commit 13d58a9bec)
2013-10-11 15:08:58 -04:00
Richard Gibson
64bdf4140b Fix #14381: Update to Sizzle 1.10.11 2013-10-11 14:14:03 -04:00
Dominik D. Geyer
c733b4819a No ticket: Correct typo in README section "rebasing". Close gh-1398.
(cherry picked from commit 943dc6cf83)
2013-10-11 11:08:38 -04:00
Timmy Willison
f6694208aa Update Sizzle to 1.10.10 2013-10-10 16:25:11 -04:00
Timmy Willison
e239873b27 Add bower install script and release scripts to jshint and pass lint 2013-10-07 18:24:14 -04:00
Timmy Willison
44b9d87484 Edit bower install script based on comments. Close gh-1392. 2013-10-07 17:20:02 -04:00
Scott González
e9a36f3a34 Warn on npm install if Bower isn't installed. 2013-10-07 17:19:58 -04:00
Timo Tijhof
2ef0a17031 Gruntfile: Remove project prefix from TestSwarm job name 2013-10-06 21:54:03 -04:00
Dave Methvin
b7da3b0043 Fix #13993. Save result of native inline handlers. Close gh-1368.
(cherry picked from commit 3bcd04f528)
2013-10-06 17:58:28 -04:00
Michał Gołębiowski
11f386fe89 No ticket. Simplify the post-uglify task. (cherry-picked from 923bfc80db) 2013-10-02 00:40:29 +02:00
Oleg
908d88cc70 Add setup function for the event module
(cherry picked from the commit 2c0b9027de)
2013-09-30 21:17:10 +04:00
Oleg
b2f27632eb Focus on the body before running focus test 2013-09-30 20:23:21 +04:00
Oleg
c809736db2 Try to fix focus test again 2013-09-30 19:20:08 +04:00
Richard Gibson
b31bd4c05d No ticket: Compress core and data modules 2013-09-28 12:02:44 -04:00
Michał Gołębiowski
9bf6aaf4ad No ticket. Get rid of comma expression in curCSS. 2013-09-24 14:11:24 +02:00
Oleg
0b9a182ecd Run focus test only if document has focus 2013-09-23 20:50:31 +04:00
Richard Gibson
3d6ed4483e No ticket: Fix IE focus test failures 2013-09-23 12:00:57 -04:00