fix linnovate#584 downgrade jquery to 1.x until angular supports 2.x

also move jquery before angular in assets list
felipeands · Jun 12, 2014 · 9731dd2 · 9731dd2
1 parent fab83ef
commit 9731dd2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/bower.json b/bower.json
@@ -2,6 +2,7 @@
     "name": "mean",
     "version": "0.3.3",
     "dependencies": {
+        "jquery": "1.x",
         "angular": "latest",
         "angular-resource": "latest",
         "angular-cookies": "latest",

diff --git a/server/config/assets.json b/server/config/assets.json
@@ -7,12 +7,12 @@
         },
         "js": {
             "public/build/js/dist.min.js": [
+                "public/system/lib/jquery/dist/jquery.min.js",
                 "public/system/lib/angular/angular.js",
                 "public/system/lib/angular-mocks/angular-mocks.js",
                 "public/system/lib/angular-cookies/angular-cookies.js",
                 "public/system/lib/angular-resource/angular-resource.js",
                 "public/system/lib/angular-ui-router/release/angular-ui-router.js",
-                "public/system/lib/jquery/dist/jquery.min.js",
                 "public/system/lib/angular-bootstrap/ui-bootstrap.js",
                 "public/system/lib/angular-bootstrap/ui-bootstrap-tpls.js",
                 "public/init.js",