Skip to content

Commit

Permalink
Build: Updated jQuery core
Browse files Browse the repository at this point in the history
  • Loading branch information
jaspermdegroot authored and agcolom committed Nov 26, 2014
1 parent 4f87675 commit c952b44
Show file tree
Hide file tree
Showing 5 changed files with 6,120 additions and 5,601 deletions.
12 changes: 6 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,20 @@ env:
- TYPES=unit
JQUERIES=1.8.3
- TYPES=unit
JQUERIES=1.10.2
JQUERIES=1.11.1
- TYPES=unit
JQUERIES=2.0.3
JQUERIES=2.1.1
- TYPES=unit
JQUERIES=git
- TYPES=integration
SUITES=!navigation
JQUERIES=1.8.3
- TYPES=integration
SUITES=!navigation
JQUERIES=1.10.2
JQUERIES=1.11.1
- TYPES=integration
SUITES=!navigation
JQUERIES=2.0.3
JQUERIES=2.1.1
- TYPES=integration
SUITES=!navigation
JQUERIES=git
Expand All @@ -34,10 +34,10 @@ env:
JQUERIES=1.8.3
- TYPES=integration
SUITES=navigation
JQUERIES=1.10.2
JQUERIES=1.11.1
- TYPES=integration
SUITES=navigation
JQUERIES=2.0.3
JQUERIES=2.1.1
- TYPES=integration
SUITES=navigation
JQUERIES=git
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ It is IMPORTANT that you always provide a test page when submitting an issue!

* What? - Keep the test page as simple as possible. Only include markup/code that is required to reproduce the issue.

* How? - Use our [JS Bin template](http://jsbin.com/acIRUBo/1/edit) which uses latest code on branch "master". Do not replace the links to the the framework CSS and JavaScript: always test with latest code!
* How? - Use our [JS Bin template](http://jsbin.com/huvoraba/1/edit) which uses latest code on branch "master". Do not replace the links to the the framework CSS and JavaScript: always test with latest code!

* You will notice if the issue has been fixed already
* It enables us to edit your code if necessary
Expand Down Expand Up @@ -158,7 +158,7 @@ will only run the tests under `tests/unit/button/` and `tests/unit/checkboxradio
You can also specify which versions of jQuery you want to test jQuery Mobile with by using the `--jqueries` option:

```bash
$ grunt test --jqueries=1.10.2,git
$ grunt test --jqueries=1.11.1,git
```


Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ This is the main repository for the jQuery Mobile project. From the [official we

> A unified, HTML5-based user interface system for all popular mobile device platforms, built on the rock-solid jQuery and jQuery UI foundation. Its lightweight code is built with progressive enhancement, and has a flexible, easily themeable design.
jQuery Mobile 1.4.x works with versions of jQuery core from 1.8.3 to 1.10.2 / 2.0.3. You can find more information about how the library works, and what it is capable of, by reading the [documentation](http://api.jquerymobile.com) and exploring the [demos](http://demos.jquerymobile.com/).
jQuery Mobile 1.4.x works with versions of jQuery core from 1.8.3 to 1.11.1 / 2.1.1. You can find more information about how the library works, and what it is capable of, by reading the [documentation](http://api.jquerymobile.com) and exploring the [demos](http://demos.jquerymobile.com/).

## Contributing

Expand Down Expand Up @@ -124,7 +124,7 @@ will run all the integration tests but the navigation suite.

You can also specify which versions of jQuery you want to test jQuery Mobile by using the `--jqueries` option:

grunt test --jqueries=1.8.3,git
grunt test --jqueries=1.11.1,git

Additionally, jQuery Mobile's test suite is split between integration and unit tests. Where the unit tests are meant to focus on a single piece of the library (eg, a widget) and the integration tests require multiple pieces of the library to function. You can target either type by including the `--types` option when testing:

Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"tools"
],
"dependencies": {
"jquery": "1.10.2",
"jquery": "1.11.1",
"jquery-ui": "jquery/jquery-ui#c0ab71056b936627e8a7821f03c044aec6280a40",
"jquery-ui-tabs": "jquery/jquery-ui#fadf2b312a05040436451c64bbfaf4814bc62c56",
"jquery-hashchange": "gseguin/jquery-hashchange#2da0c56fd418fa323c136254f971b6176f1ae135"
Expand Down

0 comments on commit c952b44

Please sign in to comment.