Merge pull request #75 from chalin/patch-chap6-etc

kwalrath · kwalrath · commit 3adc45bfccf1 · 2014-02-10T13:35:06.000-08:00
Chap 6 made consistent with previous chap; and follow Dart Style Guide
diff --git a/Chapter_03/web/index.html b/Chapter_03/web/index.html
@@ -17,8 +17,8 @@ <h3>Recipe List</h3>
       </li>
     </ul>
     
-    <h3>Recipe Details</h3>
     <div ng-if="ctrl.selectedRecipe != null">
+      <h3>Recipe Details</h3>
       <div><strong>Name: </strong>{{ctrl.selectedRecipe.name}}</div>
       <div><strong>Category: </strong>{{ctrl.selectedRecipe.category}}</div>
       <div><strong>Rating: </strong>
diff --git a/Chapter_04/web/index.html b/Chapter_04/web/index.html
@@ -19,8 +19,8 @@ <h3>Recipe List</h3>
       </li>
     </ul>
     
-    <h3>Recipe Details</h3>
     <div ng-if="ctrl.selectedRecipe != null">
+      <h3>Recipe Details</h3>
       <div><strong>Name: </strong>{{ctrl.selectedRecipe.name}}</div>
       <div><strong>Category: </strong>{{ctrl.selectedRecipe.category}}</div>
       <div><strong>Rating: </strong>
diff --git a/Chapter_05/web/index.html b/Chapter_05/web/index.html
@@ -5,7 +5,7 @@
     <link rel="stylesheet" href="style.css">
 </head>
 <body ng-cloak>
- 
+
   <div recipe-book>
     <div ng-if="!ctrl.recipesLoaded || !ctrl.categoriesLoaded">
       {{ctrl.message}}
diff --git a/Chapter_05/web/main.dart b/Chapter_05/web/main.dart
@@ -28,4 +28,3 @@ class MyAppModule extends Module {
 main() {
   ngBootstrap(module: new MyAppModule());
 }
-
diff --git a/Chapter_06/lib/component/search_recipe_component.dart b/Chapter_06/lib/component/search_recipe_component.dart
@@ -12,9 +12,9 @@ class SearchRecipeComponent {
   String nameFilterString = "";
   
   @NgTwoWay('category-filter-map')
-  Map categoryFilterMap;
+  Map<String, bool> categoryFilterMap;
 
-  get categories {
+  List<String> get categories {
     return categoryFilterMap.keys.toList();
   }
 
diff --git a/Chapter_06/lib/component/view_recipe_component.dart b/Chapter_06/lib/component/view_recipe_component.dart
@@ -15,7 +15,7 @@ class ViewRecipeComponent {
   
   String _recipeId;
 
-  get recipe {
+  Recipe get recipe {
     return recipeMap[_recipeId];
   }
 
diff --git a/Chapter_06/lib/component/view_recipe_component.html b/Chapter_06/lib/component/view_recipe_component.html
@@ -1,4 +1,4 @@
-<div>
+<div id="recipe-details">
   <h3>Recipe Details</h3>
   <div ng-if="ctrl.recipe != null">
     <a class="extra-space" href="#/recipe/{{ctrl.recipe.id}}/edit">
diff --git a/Chapter_06/lib/recipe_book.dart b/Chapter_06/lib/recipe_book.dart
@@ -25,11 +25,11 @@ kitchen and took the recipe book with him!""";
   bool categoriesLoaded = false;
 
   // Data objects that are loaded from the server side via json
-  List _categories = [];
-  get categories => _categories;
+  List<String> _categories = [];
+  List<String> get categories => _categories;
   Map<String, Recipe> _recipeMap = {};
-  get recipeMap => _recipeMap;
-  get allRecipes => _recipeMap.values.toList();
+  Map<String, Recipe> get recipeMap => _recipeMap;
+  List<Recipe> get allRecipes => _recipeMap.values.toList();
 
   // Filter box
   Map<String, bool> categoryFilterMap = {};
diff --git a/Chapter_06/web/index.html b/Chapter_06/web/index.html
@@ -7,16 +7,12 @@
 <body ng-cloak>
 
   <div recipe-book>
-  
-    <header id="header">
-      <h2>Angular is fun! Here's a recipe book to prove it!</h2>
-    </header>
-    
     <div ng-if="!ctrl.recipesLoaded || !ctrl.categoriesLoaded">
       {{ctrl.message}}
     </div>
-    
     <div ng-if="ctrl.recipesLoaded && ctrl.categoriesLoaded">
+      <h3>Recipe List</h3>
+
       <nav id="controls">
         <search-recipe 
             name-filter-string="ctrl.nameFilter"

Original file line number	Diff line number	Diff line change
`@@ -28,4 +28,3 @@ class MyAppModule extends Module {`
`28`	`28`	`main() {`
`29`	`29`	`ngBootstrap(module: new MyAppModule());`
`30`	`30`	`}`
`31`		`-`
Original file line number	Diff line number	Diff line change
`@@ -12,9 +12,9 @@ class SearchRecipeComponent {`
`12`	`12`	`String nameFilterString = "";`
`13`	`13`
`14`	`14`	`@NgTwoWay('category-filter-map')`
`15`		`- Map categoryFilterMap;`
	`15`	`+ Map<String, bool> categoryFilterMap;`
`16`	`16`
`17`		`- get categories {`
	`17`	`+ List<String> get categories {`
`18`	`18`	`return categoryFilterMap.keys.toList();`
`19`	`19`	`}`
`20`	`20`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ class ViewRecipeComponent {`
`15`	`15`
`16`	`16`	`String _recipeId;`
`17`	`17`
`18`		`- get recipe {`
	`18`	`+ Recipe get recipe {`
`19`	`19`	`return recipeMap[_recipeId];`
`20`	`20`	`}`
`21`	`21`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<div>`
	`1`	`+<div id="recipe-details">`
`2`	`2`	`<h3>Recipe Details</h3>`
`3`	`3`	`<div ng-if="ctrl.recipe != null">`
`4`	`4`	`<a class="extra-space" href="#/recipe/{{ctrl.recipe.id}}/edit">`