Skip to content
Browse files

update jquery references

add jquery note to Rakefile
  • Loading branch information...
1 parent da9bd3f commit 8cf25fff49dd6405aa1df2453397554540205149 @trevor trevor committed Apr 1, 2012
Showing with 8 additions and 7 deletions.
  1. +1 −0 Rakefile
  2. +1 −1 benchmarks/external/backbone.html
  3. +1 −1 benchmarks/index.html
  4. +1 −1 benchmarks/runner.js
  5. +1 −1 benchmarks/setup.markdown
  6. +1 −1 benchmarks/simple.html
  7. +2 −2 tests/index.html
View
1 Rakefile
@@ -304,6 +304,7 @@ task :test, [:suite] => :dist do |t, args|
suites = {
:default => ["package=all"],
+ # testing older jQuery 1.6.4 for compatibility
:all => ["package=all",
"package=all&jquery=1.6.4&nojshint=true",
"package=all&extendprototypes=true&nojshint=true",
View
2 benchmarks/external/backbone.html
@@ -2,7 +2,7 @@
<html>
<head>
- <script src="../../tests/jquery-1.7.1.js"></script>
+ <script src="../../tests/jquery-1.7.2.js"></script>
<style>
p {
View
2 benchmarks/index.html
@@ -2,7 +2,7 @@
<html>
<head>
- <script src="../tests/jquery-1.7.1.js"></script>
+ <script src="../tests/jquery-1.7.2.js"></script>
<script src="benchmark.js"></script>
<script src="runner.js"></script>
</head>
View
2 benchmarks/runner.js
@@ -13,7 +13,7 @@ function makeiframe(emberPath, suitePath, profile, callback) {
iframe.name = name;
write("<title>" + name + "</title>");
- write("<script src='../tests/jquery-1.7.1.js'></script>");
+ write("<script src='../tests/jquery-1.7.2.js'></script>");
write("<script src='" + emberPath + "'></script>");
write("<script src='benchmark.js'></script>");
write("<script src='iframe_runner.js'></script>");
View
2 benchmarks/setup.markdown
@@ -3,7 +3,7 @@ Files:
* `index.html`: bootstrap file for testing
* `ember-before.js`: the Ember file that represents the "before" in the test
* `../dist/ember.min.js`: the Ember file that represents the "after" in the test
-* `../tests/jquery-1.7.1.js`: the latest version of jQuery
+* `../tests/jquery-1.7.2.js`: the latest version of jQuery
* `benchmark.js`: the benchmark JS runner
* `nano.jar`: the nanosecond timer
* `runner.js`: the bootstrap for the runner
View
2 benchmarks/simple.html
@@ -2,7 +2,7 @@
<html>
<head>
- <script src="../tests/jquery-1.7.1.js"></script>
+ <script src="../tests/jquery-1.7.2.js"></script>
<script src="ember.js"></script>
</head>
<body>
View
4 tests/index.html
@@ -60,7 +60,7 @@ <h2 id="qunit-userAgent"></h2>
<script>
// Load custom version of jQuery if possible
var jQueryMatch = location.search.match(/jquery=([^&]+)/),
- jQueryVersion = jQueryMatch ? jQueryMatch[1] : "1.7.1";
+ jQueryVersion = jQueryMatch ? jQueryMatch[1] : "1.7.2";
if (jQueryVersion !== 'none') {
document.write(unescape('%3Cscript src="http://ajax.googleapis.com/ajax/libs/jquery/'+jQueryVersion+'/jquery.js"%3E%3C/script%3E'));
}
@@ -71,7 +71,7 @@ <h2 id="qunit-userAgent"></h2>
// Fallback to default jQuery
if (jQueryVersion !== 'none' && !window.jQuery) {
if (console && console.warn) { console.warn("Unable to load jQuery "+jQueryVersion+". Using default."); }
- document.write(unescape('%3Cscript src="jquery-1.7.1.js"%3E%3C/script%3E'));
+ document.write(unescape('%3Cscript src="jquery-1.7.2.js"%3E%3C/script%3E'));
}
// Close the script tag to make sure document.write happens
</script>

0 comments on commit 8cf25ff

Please sign in to comment.
Something went wrong with that request. Please try again.