Bump bower deps + account for ngRoute being a plugin in Angular > 1.1.x

Dynalon · Jan 18, 2015 · d19d54a · d19d54a
1 parent bf6b978
commit d19d54a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 17 deletions.
diff --git a/Rainy.UI/app_admin/js/admin/app_admin.js b/Rainy.UI/app_admin/js/admin/app_admin.js
@@ -3,9 +3,7 @@ var app = angular.module('myApp', [
     'myApp.filters',
     'myApp.services',
     'myApp.directives',
-
-    // anguar-strap.js
-    '$strap.directives'
+    'ngRoute'
 ])
 .config(['$routeProvider',
     function($routeProvider) {

diff --git a/Rainy.UI/app_admin/js/client/app_client.js b/Rainy.UI/app_admin/js/client/app_client.js
@@ -3,9 +3,7 @@ var app = angular.module('clientApp', [
     'clientApp.filters',
     'clientApp.services',
     'clientApp.directives',
-
-    // anguar-strap.js
-    '$strap.directives'
+    'ngRoute'
 ])
 .config(['$routeProvider',
     function($routeProvider) {

diff --git a/Rainy.UI/bower.json b/Rainy.UI/bower.json
@@ -2,21 +2,16 @@
   "name": "Rainy-UI",
   "version": "0.0.1",
   "devDependencies": {
-    "jquery": "~2.0.3",
-    "angular-strap": "~0.7.5",
-    "angular": "~1.0.7",
-    "bootstrap.zip": "http://getbootstrap.com/2.3.2/assets/bootstrap.zip",
-    "bootswatch-united": "http://netdna.bootstrapcdn.com/bootswatch/2.3.2/united/bootstrap.min.css",
-    "underscore": "~1.5.1",
-    "bootstrap-switch": "*",
     "bower": "*"
   },
   "dependencies": {
+    "jquery": "~2.0.3",
+    "underscore": "~1.5.1",
     "noty": "~2.1.0",
     "wysihtml5": "~0.3.0",
-    "bootstrap-wysihtml5": "*"
-  },
-  "resolutions": {
-    "bootstrap": ">=2.0.4 <3.0"
+    "bootstrap-wysihtml5": "*",
+    "bootstrap": "~3.3.1",
+    "angular": "~1.3.9",
+    "angular-route": "~1.3.9"
   }
 }