From 11e1695154127e28964687149bd24a8922bc38b6 Mon Sep 17 00:00:00 2001 From: Igor Minar Date: Sun, 29 Apr 2012 21:39:30 -0700 Subject: [PATCH] various fixes --- README.md | 9 +++++---- app/index-async.html | 7 +++---- app/index.html | 2 +- app/js/controllers.js | 3 ++- app/js/directives.js | 3 ++- app/js/filters.js | 3 ++- app/js/services.js | 4 +++- config/jsTestDriver.conf | 3 +++ test/e2e/scenarios.js | 4 ++++ test/unit/controllersSpec.js | 2 ++ test/unit/directivesSpec.js | 2 ++ test/unit/filtersSpec.js | 2 ++ test/unit/servicesSpec.js | 2 ++ 13 files changed, 33 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index cb1b48c..1c98a2c 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,8 @@ -# angular-seed — the seed for <angular/> apps +# angular-seed — the seed for AngularJS apps -This project is an application skeleton for a typical [angular](http://angularjs.org/) web app. You -can use it to quickly bootstrap your angular webapp projects and dev environment for these projects. +This project is an application skeleton for a typical [AngularJS](http://angularjs.org/) web app. +You can use it to quickly bootstrap your angular webapp projects and dev environment for these +projects. The seed contains angular libraries, test libraries and a bunch of scripts all preconfigured for instant web development gratification. Just clone the repo (or download the zip/tarball), start up @@ -113,7 +114,7 @@ fetch the changes and merge them into your project with git. angular/ angular.js --> the latest angular js angular.min.js --> the latest minified angular js - angular-ie-compat.js --> angular patch for IE 6&7 compatibility + angular-*.js --> angular add-on modules version.txt --> version number partials/ --> angular view partials (partial html templates) partial1.html diff --git a/app/index-async.html b/app/index-async.html index bd85886..5a042ca 100644 --- a/app/index-async.html +++ b/app/index-async.html @@ -1,5 +1,5 @@ - + - +
Angular seed app: v
- diff --git a/app/index.html b/app/index.html index 859e5fb..d38a259 100644 --- a/app/index.html +++ b/app/index.html @@ -1,5 +1,5 @@ - + My AngularJS App diff --git a/app/js/controllers.js b/app/js/controllers.js index 18cb297..e40a356 100644 --- a/app/js/controllers.js +++ b/app/js/controllers.js @@ -1,5 +1,6 @@ 'use strict'; -/* App Controllers */ + +/* Controllers */ function MyCtrl1() {} diff --git a/app/js/directives.js b/app/js/directives.js index 8ed47bb..9fc16cc 100644 --- a/app/js/directives.js +++ b/app/js/directives.js @@ -1,5 +1,6 @@ 'use strict'; -/* http://docs-next.angularjs.org/api/angular.module.ng.$compileProvider.directive */ + +/* Directives */ angular.module('myApp.directives', []). diff --git a/app/js/filters.js b/app/js/filters.js index ef89b6b..259dd4e 100644 --- a/app/js/filters.js +++ b/app/js/filters.js @@ -1,5 +1,6 @@ 'use strict'; -/* http://docs-next.angularjs.org/api/angular.module.ng.$filter */ + +/* Filters */ angular.module('myApp.filters', []). filter('interpolate', ['version', function(version) { diff --git a/app/js/services.js b/app/js/services.js index 6b8a5e0..334d543 100644 --- a/app/js/services.js +++ b/app/js/services.js @@ -1,7 +1,9 @@ 'use strict'; +/* Services */ + // Demonstrate how to register services -// In this case it is a simple constant service. +// In this case it is a simple value service. angular.module('myApp.services', []). value('version', '0.1'); diff --git a/config/jsTestDriver.conf b/config/jsTestDriver.conf index 9e21f82..41787ea 100644 --- a/config/jsTestDriver.conf +++ b/config/jsTestDriver.conf @@ -4,6 +4,9 @@ load: - test/lib/jasmine/jasmine.js - test/lib/jasmine-jstd-adapter/JasmineAdapter.js - app/lib/angular/angular.js + - app/lib/angular/angular-cookies.js + - app/lib/angular/angular-resource.js + - app/lib/angular/angular-sanitize.js - test/lib/angular/angular-mocks.js - app/js/*.js - test/unit/*.js diff --git a/test/e2e/scenarios.js b/test/e2e/scenarios.js index 516c2a8..a4248f7 100644 --- a/test/e2e/scenarios.js +++ b/test/e2e/scenarios.js @@ -1,3 +1,7 @@ +'use strict'; + +/* http://docs.angularjs.org/guide/dev_guide.e2e-testing */ + describe('my app', function() { beforeEach(function() { diff --git a/test/unit/controllersSpec.js b/test/unit/controllersSpec.js index 5761a4e..bc9be5e 100644 --- a/test/unit/controllersSpec.js +++ b/test/unit/controllersSpec.js @@ -1,3 +1,5 @@ +'use strict'; + /* jasmine specs for controllers go here */ describe('MyCtrl1', function(){ diff --git a/test/unit/directivesSpec.js b/test/unit/directivesSpec.js index a9938cf..6061842 100644 --- a/test/unit/directivesSpec.js +++ b/test/unit/directivesSpec.js @@ -1,3 +1,5 @@ +'use strict'; + /* jasmine specs for directives go here */ describe('directives', function() { diff --git a/test/unit/filtersSpec.js b/test/unit/filtersSpec.js index 8c0798f..19af329 100644 --- a/test/unit/filtersSpec.js +++ b/test/unit/filtersSpec.js @@ -1,3 +1,5 @@ +'use strict'; + /* jasmine specs for filters go here */ describe('filter', function() { diff --git a/test/unit/servicesSpec.js b/test/unit/servicesSpec.js index 8c34dc5..3864c8d 100644 --- a/test/unit/servicesSpec.js +++ b/test/unit/servicesSpec.js @@ -1,3 +1,5 @@ +'use strict'; + /* jasmine specs for services go here */ describe('service', function() {