Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Support jQuery 1.9.0

  • Loading branch information...
commit f1d54fb74899fbae1452c1f013dbc69050346d37 1 parent cb6c788
@crofty crofty authored
View
2  README.md
@@ -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
View
1  Rakefile
@@ -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",
View
2  packages/ember-views/lib/core.js
@@ -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
View
2  tests/index.html
@@ -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>');
}
Please sign in to comment.
Something went wrong with that request. Please try again.