Skip to content

Commit

Permalink
various fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
IgorMinar committed Apr 30, 2012
1 parent 5d36813 commit 11e1695
Show file tree
Hide file tree
Showing 13 changed files with 33 additions and 13 deletions.
9 changes: 5 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand 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
Expand Down
7 changes: 3 additions & 4 deletions app/index-async.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!doctype html>
<html xmlns:ng="http://angularjs.org/">
<html lang="en">
<head>
<meta charset="utf-8">
<style>
Expand Down Expand Up @@ -41,18 +41,17 @@
});
</script>
<title>My AngularJS App</title>
<link rel="stylesheet" href="css/app.css"/>
<link rel="stylesheet" href="css/app.css">
</head>
<body>
<ul class="menu">
<li><a href="#/view1">view1</a></li>
<li><a href="#/view2">view2</a></li>
</ul>

<ng-view></ng-view>
<div ng-view></div>

<div>Angular seed app: v<span app-version></span></div>

</head>
</body>
</html>
2 changes: 1 addition & 1 deletion app/index.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!doctype html>
<html ng-app="myApp">
<html lang="en" ng-app="myApp">
<head>
<meta charset="utf-8">
<title>My AngularJS App</title>
Expand Down
3 changes: 2 additions & 1 deletion app/js/controllers.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
'use strict';
/* App Controllers */

/* Controllers */


function MyCtrl1() {}
Expand Down
3 changes: 2 additions & 1 deletion app/js/directives.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
'use strict';
/* http://docs-next.angularjs.org/api/angular.module.ng.$compileProvider.directive */

/* Directives */


angular.module('myApp.directives', []).
Expand Down
3 changes: 2 additions & 1 deletion app/js/filters.js
Original file line number Diff line number Diff line change
@@ -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) {
Expand Down
4 changes: 3 additions & 1 deletion app/js/services.js
Original file line number Diff line number Diff line change
@@ -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');
3 changes: 3 additions & 0 deletions config/jsTestDriver.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions test/e2e/scenarios.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
'use strict';

/* http://docs.angularjs.org/guide/dev_guide.e2e-testing */

describe('my app', function() {

beforeEach(function() {
Expand Down
2 changes: 2 additions & 0 deletions test/unit/controllersSpec.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
'use strict';

/* jasmine specs for controllers go here */

describe('MyCtrl1', function(){
Expand Down
2 changes: 2 additions & 0 deletions test/unit/directivesSpec.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
'use strict';

/* jasmine specs for directives go here */

describe('directives', function() {
Expand Down
2 changes: 2 additions & 0 deletions test/unit/filtersSpec.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
'use strict';

/* jasmine specs for filters go here */

describe('filter', function() {
Expand Down
2 changes: 2 additions & 0 deletions test/unit/servicesSpec.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
'use strict';

/* jasmine specs for services go here */

describe('service', function() {
Expand Down

0 comments on commit 11e1695

Please sign in to comment.