Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 9186130

Browse files
Master/View pair issue of 3rd state resolved
1 parent b99c73f commit 9186130

27 files changed

+457
-497
lines changed

‎master-detail-view-pair/index.html‎

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<meta charset="utf-8">
55
<link rel="stylesheet" href="css/styles.css">
6-
<title>Welcome to our Restaurant</title>
6+
<title>Restaurant</title>
77
</head>
88
<body>
99
<h1>Welcome to our Restaurant</h1>
@@ -16,27 +16,20 @@ <h1>Welcome to our Restaurant</h1>
1616
<script src="lib/angular-ui-router.min.js"></script>
1717

1818
<!-- Modules -->
19-
<script src="src/shoppinglist/menuapp.module.js"></script>
20-
<script src="src/shoppinglist/data.module.js"></script>
19+
<script src="src/menuapp.module.js"></script>
20+
<script src="src/data.module.js"></script>
2121

22-
<!-- Services -->
23-
<script src="src/shoppinglist/menudata.service.js"></script>
24-
25-
<!-- Routes -->
22+
<!-- Module artifacts -->
23+
<script src="src/menudata.service.js"></script>
24+
<scriptsrc="src/categories.component.js"></script>
25+
<scriptsrc="src/items.component.js"></script>
2626
<script src="src/routes.js"></script>
27-
<script src="src/spinner/spinner.module.js"></script>
28-
29-
<!-- Components -->
30-
<script src="src/shoppinglist/categories.component.js"></script>
31-
<script src="src/shoppinglist/items.component.js"></script>
27+
<script src="src/spinner/spinner.module.js"></script>
28+
<script src="src/categories.controller.js"></script>
29+
<script src="src/items.controller.js"></script>
3230

33-
<!-- Controllers -->
34-
<script src="src/shoppinglist/main-shoppinglist.controller.js"></script>
35-
<script src="src/shoppinglist/item-detail.controller.js"></script>
36-
37-
38-
<!-- 'Spinner' module artifacts -->
31+
<!-- 'Spinner' module artifacts -->
3932
<script src="src/spinner/loadingspinner.component.js"></script>
40-
33+
4134
</body>
42-
</html>
35+
</html>

‎master-detail-view-pair/lib/angular-ui-router.min.js‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎master-detail-view-pair/lib/angular.min.js‎

Lines changed: 314 additions & 328 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
(function() {
2+
'use strict';
3+
4+
angular.module('MenuApp')
5+
.component('categories', {
6+
templateUrl: 'src/categoriescomponent.template.html',
7+
bindings: {
8+
items: '<'
9+
}
10+
});
11+
12+
})();
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
(function () {
2+
'use strict';
3+
4+
angular.module('MenuApp')
5+
.controller('CategoriesController', CategoriesController);
6+
7+
// 'item' is injected through state's resolve
8+
CategoriesController.$inject = ['categories']
9+
function CategoriesController(categories) {
10+
var categoriesCtrl = this;
11+
categoriesCtrl.categories = categories;
12+
}
13+
14+
})();
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<a ui-sref="home">Home</a> &lt; <span>List</span>
2+
<h3>All Categories Menu</h3>
3+
<categories items="categoriesCtrl.categories"></categories>
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<ul>
2+
<li ng-repeat="item in $ctrl.items">
3+
<a ui-sref="items({category: item.short_name})">{{item.name}}</a>
4+
</li>
5+
</ul>
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
(function () {
2+
'use strict';
3+
4+
angular.module('data',[]);
5+
6+
})();
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<a ui-sref="categories">Categories</a>
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
(function() {
2+
'use strict';
3+
4+
angular.module('MenuApp')
5+
.component('items', {
6+
templateUrl: 'src/itemscomponent.template.html',
7+
bindings: {
8+
items: '<'
9+
}
10+
});
11+
12+
})();

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /