Merge pull request #13 from TheHalcyonSavant/master

petebacondarwin · petebacondarwin · commit 941ce5babfcd · 2014-03-23T15:06:42.000Z
trivial fixes part 1
diff --git a/1820EN_03_Code/05 - promise api/promises.spec.js b/1820EN_03_Code/05 - promise api/promises.spec.js
@@ -79,7 +79,6 @@ describe('pizza pit', function () {
 
       it('should illustrate promise rejection', function () {
 
-        pizzaPit = new Restaurant($q, $rootScope);
         var pizzaDelivered = pizzaPit.takeOrder('Capricciosa');
         pizzaDelivered.then(pawel.eat, pawel.beHungry);
 
@@ -100,10 +99,6 @@ describe('pizza pit', function () {
 
       it('should illustrate successful promise chaining', function () {
 
-        var slice = function(pizza) {
-          return "sliced "+pizza;
-        };
-
         pizzaPit.takeOrder('Margherita').then(slice).then(pawel.eat);
 
         pizzaPit.deliverOrder();
diff --git a/1820EN_03_Code/07 - resource/index.html b/1820EN_03_Code/07 - resource/index.html
@@ -11,7 +11,7 @@
 <button ng-click="add()">Add new user - class level</button>
 <ul>
     <li ng-repeat="user in users">
-        <a ng-click="remove(user)">{{user}} - {{user.getFullName()}}</a>
+        <a ng-click="remove(user,$index)">{{user}} - {{user.getFullName()}}</a>
     </li>
 </ul>
 </body>
diff --git a/1820EN_03_Code/07 - resource/resource.js b/1820EN_03_Code/07 - resource/resource.js
@@ -17,9 +17,10 @@ angular.module('resource', ['ngResource'])
       console.log($scope.users.length);
     });
 
-    $scope.remove = function (user) {
+    $scope.remove = function (user, index) {
       Users['delete']({}, user);
       //user.$delete();
+      $scope.users.splice(index, 1);
     };
 
     $scope.add = function () {
@@ -36,4 +37,4 @@ angular.module('resource', ['ngResource'])
       Users.save(user);
     };
 
-  });
+  });
diff --git a/1820EN_04_Code/08 -filters - array filters full example/arrayFilters.js b/1820EN_04_Code/08 -filters - array filters full example/arrayFilters.js
@@ -53,6 +53,9 @@ angular.module('arrayFilters', [])
       }
     });
 
+    $scope.criteria = '';
+    $scope.pageNo = 0;
+
     $scope.setActivePage = function (pageNo) {
       if (pageNo >=0 && pageNo < $scope.pages.length) {
         $scope.pageNo = pageNo;
diff --git a/1820EN_09_Code/02_button_directive/index.html b/1820EN_09_Code/02_button_directive/index.html
@@ -1,5 +1,5 @@
 <!doctype html>
-<html ng-app="directives">
+<html ng-app="button-directive">
 <head>
   <meta charset="utf-8">
   <title>AngularJS Book - Chapter 9 - Button Directive</title>
diff --git a/1820EN_09_Code/04_validate-equals_directive/directive.spec.js b/1820EN_09_Code/04_validate-equals_directive/directive.spec.js
@@ -54,7 +54,7 @@ describe('validateEquals directive', function() {
       expect(modelValue.testValue).toBe(undefined);
     });
 
-    it('should be invalid if the input value changes to be the same as the reference', function() {
+    it('should be valid if the input value changes to be the same as the reference', function() {
       modelValue.compareTo = 'different';
       $scope.$digest();
       expect(modelCtrl.$valid).toBeFalsy();
diff --git a/1820EN_09_Code/04_validate-equals_directive/index.html b/1820EN_09_Code/04_validate-equals_directive/index.html
@@ -1,5 +1,5 @@
 <!doctype html>
-<html ng-app="directives">
+<html ng-app="directives.validate-equals">
 <head>
   <meta charset="utf-8">
   <title>AngularJS Book - Chapter 9 - validateEquals Directive</title>

Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,9 @@ angular.module('arrayFilters', [])`
`53`	`53`	`}`
`54`	`54`	`});`
`55`	`55`
	`56`	`+ $scope.criteria = '';`
	`57`	`+ $scope.pageNo = 0;`
	`58`	`+`
`56`	`59`	`$scope.setActivePage = function (pageNo) {`
`57`	`60`	`if (pageNo >=0 && pageNo < $scope.pages.length) {`
`58`	`61`	`$scope.pageNo = pageNo;`