Updated jade-angular-brunch up to 1.0.2, updated angular to 1.1.5

GulinSS · Aug 6, 2013 · f349818 · f349818
1 parent 4bbb0d0
commit f349818
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 69 deletions.
diff --git a/app/app.coffee b/app/app.coffee
@@ -2,13 +2,12 @@
 
 # Declare app level module which depends on filters, and services
 App = angular.module('app', [
-  'ngCookies'
   'ngResource'
   'app.controllers'
   'app.directives'
   'app.filters'
   'app.services'
-  'partials'
+  'app.partials'
 ])
 
 App.config([
@@ -19,9 +18,9 @@ App.config([
 
   $routeProvider
 
-    .when('/todo', {templateUrl: '/partials/todo.html'})
-    .when('/view1', {templateUrl: '/partials/partial1.html'})
-    .when('/view2', {templateUrl: '/partials/partial2.html'})
+    .when('/todo', {templateUrl: 'app/partials/todo.jade'})
+    .when('/view1', {templateUrl: 'app/partials/partial1.jade'})
+    .when('/view2', {templateUrl: 'app/partials/partial2.jade'})
 
     # Catch all
     .otherwise({redirectTo: '/todo'})

diff --git a/app/assets/index.html b/app/assets/index.html
diff --git a/app/index.jade b/app/index.jade
@@ -19,8 +19,8 @@ html(lang='en', ng-app='app')
         enabled: true
       };
     script(src='/js/vendor.js')
-    script(src='/js/partials.js')
     script(src='/js/app.js')
+    script(src='/js/app.partials.js')
   body(ng-controller='AppCtrl')
     .wrapper
       .navbar.navbar-static-top
@@ -32,7 +32,7 @@ html(lang='en', ng-app='app')
               span.icon-bar
             a(href='/').brand Angular Brunch Seed
             .nav-collapse
-              div(ng-include="'/partials/nav.html'")
+              div(ng-include="'app/partials/nav.jade'")
       .container.main-content
         div(ng-view)
         div Angular Brunch seed app: v<span app-version></span>

diff --git a/component.json b/component.json
@@ -5,15 +5,9 @@
   "dependencies": {
     "console-polyfill": "*",
 
-    "jquery": "1.8.3",
-
     "bootstrap": "~2.3.2",
     "font-awesome": "~3.1.1",
 
-    "angular": "~1.0.7",
-    "angular-sanitize": "~1.0.7",
-    "angular-resource": "~1.0.7",    
-    "angular-cookies": "~1.0.7",
-    "angular-mocks": "git://github.com/fabsor/bower-angular-mocks.git#v1.0.4"      
+    "angularjs-bower": "5baf5dd12749c5d9e1f0197aa8813f005ec34ebf"
   }
 }
diff --git a/config.coffee b/config.coffee
@@ -21,10 +21,7 @@ exports.config =
         before: [
           'vendor/console-polyfill/index.js'
           'vendor/jquery/jquery.js'
-          'vendor/angular/angular.js'          
-          'vendor/angular-resource/angular-resource.js'          
-          'vendor/angular-cookies/angular-cookies.js'          
-          'vendor/angular-sanitize/angular-sanitize.js'                    
+          'vendor/angularjs-bower/angular.js'                  
           'vendor/bootstrap/docs/assets/js/bootstrap.js'
         ]
 
@@ -46,7 +43,13 @@ exports.config =
     bower:
       extend:
         "bootstrap" : 'vendor/bootstrap/docs/assets/js/bootstrap.js'
-        "angular-mocks": []
+        "angularjs-bower": [
+          'vendor/angularjs-bower/angular.js'
+          'vendor/angularjs-bower/angular-loader.js'
+          'vendor/angularjs-bower/angular-resource.js'
+          'vendor/angularjs-bower/angular-sanitize.js'
+          'vendor/angularjs-bower/angular-mocks.js'
+        ]
         "styles": []
       asserts:
         "img" : /bootstrap(\\|\/)img/

diff --git a/package.json b/package.json
@@ -29,12 +29,12 @@
     "uglify-js-brunch": ">= 1.0 < 1.7",
     "clean-css-brunch": ">= 1.0 < 1.7",
 
-    "bower-stylesheet-brunch": "~0.0.2",
-    "bower-javascript-brunch": "~0.0.2",
-    "bower-asserts-brunch": "~0.0.1",
+    "bower-stylesheet-brunch": "0.0.2",
+    "bower-javascript-brunch": "0.0.2",
+    "bower-asserts-brunch": "0.0.1",
     "bower": "~0.9.0",
 
-    "jade-angularjs-brunch" : "0.0.6"
+    "jade-angularjs-brunch" : "1.0.2"
   },
   "devDependencies": {
     "coffee-script": "*",