Merge pull request #426 from tbranyen/fix-jquery

Changed jQuery location to dist/.
tbranyen · Feb 28, 2014 · c4d0f8e · c4d0f8e
2 parents 40bb604 + 7e06849
commit c4d0f8e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/bower.json b/bower.json
@@ -9,6 +9,7 @@
     "requirejs": "~2.1"
   },
   "devDependencies": {
-    "qunit": "~1.14.0"
+    "qunit": "~1.14.0",
+    "jquery": ">=2.1.0"
   }
 }
diff --git a/test/index.html b/test/index.html
@@ -7,7 +7,7 @@
   <!-- Bower components -->
   <link rel="stylesheet" href="../bower_components/qunit/qunit/qunit.css">
   <script src="../bower_components/qunit/qunit/qunit.js"></script>
-  <script src="../bower_components/jquery/jquery.js"></script>
+  <script src="../bower_components/jquery/dist/jquery.js"></script>
   <script src="../bower_components/underscore/underscore.js"></script>
   <script src="../bower_components/backbone/backbone.js"></script>
   <script src="../backbone.layoutmanager.js"></script>

diff --git a/test/spec/expose.js b/test/spec/expose.js
@@ -29,7 +29,7 @@ asyncTest("AMD support", 1, function() {
 
     paths: {
       underscore: "bower_components/underscore/underscore",
-      jquery: "bower_components/jquery/jquery",
+      jquery: "bower_components/jquery/dist/jquery",
       backbone: "bower_components/backbone/backbone"
     },