Skip to content

Commit

Permalink
Support jQuery 1.9.0
Browse files Browse the repository at this point in the history
  • Loading branch information
crofty committed Jan 17, 2013
1 parent cb6c788 commit f1d54fb
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -127,7 +127,7 @@ To run multiple packages, you can separate them with commas. You can run all the

<http://localhost:9292/tests/index.html?package=all>

You can also pass `jquery=VERSION` in the test URL to test different versions of jQuery. Default is 1.7.2.
You can also pass `jquery=VERSION` in the test URL to test different versions of jQuery. Default is 1.9.0.

## From the CLI

Expand Down
1 change: 1 addition & 0 deletions Rakefile
Expand Up @@ -75,6 +75,7 @@ task :test, [:suite] => :dist do |t, args|
"package=all&dist=build&nojshint=true"],
:all => packages.map{|p| "package=#{p}" } +
["package=all&jquery=1.7.2&nojshint=true",
"package=all&jquery=1.8.3&nojshint=true",
"package=all&jquery=git&nojshint=true",
"package=all&extendprototypes=true&nojshint=true",
"package=all&extendprototypes=true&jquery=git&nojshint=true",
Expand Down
2 changes: 1 addition & 1 deletion packages/ember-views/lib/core.js
Expand Up @@ -4,7 +4,7 @@
*/

var jQuery = Ember.imports.jQuery;
Ember.assert("Ember Views require jQuery 1.7 (>= 1.7.2) or 1.8", jQuery && (jQuery().jquery.match(/^1\.(7(?!$)(?!\.[01])|8)(\.\d+)?(pre|rc\d?)?/) || Ember.ENV.FORCE_JQUERY));
Ember.assert("Ember Views require jQuery 1.7 (>= 1.7.2), 1.8 or 1.9", jQuery && (jQuery().jquery.match(/^1\.(7(?!$)(?!\.[01])|8|9)(\.\d+)?(pre|rc\d?)?/) || Ember.ENV.FORCE_JQUERY));

/**
Alias for jQuery
Expand Down
2 changes: 1 addition & 1 deletion tests/index.html
Expand Up @@ -96,7 +96,7 @@ <h2 id="qunit-userAgent"></h2>

<script>
// Load custom version of jQuery if possible (assign to window so IE8 can use in later blocks)
var jQueryVersion = QUnit.urlParams.jquery || "1.8.2";
var jQueryVersion = QUnit.urlParams.jquery || "1.9.0";
if (jQueryVersion !== 'none') {
document.write('<script src="http://code.jquery.com/jquery-'+jQueryVersion+'.js"><\/script>');
}
Expand Down

0 comments on commit f1d54fb

Please sign in to comment.