Merge pull request liammclennan#21 from SaintGimp/master

Fixes and clarifications from a newbie

Author: liammclennan

topics/about_arrays.js

@@ -29,6 +29,6 @@ test("stack methods", function() {
     stack.push("first");
     stack.push("second");
 
-    equals(stack.pop(), __, 'what will be the first value poped off the stack?');
-    equals(stack.pop(), __, 'what will be the second value poped off the stack?');
+    equals(stack.pop(), __, 'what will be the first value popped off the stack?');
+    equals(stack.pop(), __, 'what will be the second value popped off the stack?');
 });

topics/about_functions_and_closure.js

@@ -37,6 +37,7 @@ test("arguments array", function() {
         var total = 0;
         for(var i = 0; i < arguments.length; i++) {
             // complete the implementation of this method so that it returns the sum of its arguments
+            // __
         }
         // __
     };

topics/about_prototypal_inheritance.js

@@ -34,7 +34,8 @@ test("calling functions added to a prototype after an object was created", funct
     Mammal.prototype.numberOfLettersInName = function() {
         return this.name.length;
     };
-    // for the following statement asks the paul object to call a function that was added to the Mammal prototype after paul was constructed.
+    // the following statement asks the paul object to call a function that was added
+    // to the Mammal prototype after paul was constructed.
     equals(paul.numberOfLettersInName(), __, "how long is Paul's name?");
 });
 

topics/about_prototype_chain.js

@@ -26,7 +26,12 @@ child.b = 2;
  * ---------------------- ---- ---- ----
  * */
 
-test("Is there an 'a' and 'b' own property on childObj?", function () {
+test("Is there an 'a' and 'b' own property on child?", function () {
+  equals(child.hasOwnProperty('a'), __, 'child.hasOwnProperty(\'a\')?');
+  equals(child.hasOwnProperty('b'), __, 'child.hasOwnProperty(\'b\')?');
+});
+
+test("Is there an 'a' and 'b' property on child?", function () {
   equals(child.a, __, 'what is \'a\' value?');
   equals(child.b, __, 'what is \'b\' value?');
 });
@@ -37,22 +42,22 @@ test("If 'b' was removed, whats b value?", function () {
 });
 
 
-// Is there a 'c' own property on childObj? No, check its prototype
-// Is there a 'c' own property on childObj.[[Prototype]]? Yes, its value is...
-test("Is there a 'c' own property on childObj.[[Prototype]]?", function () {
-  equals(child.hasOwnProperty('c'), __, 'childObj.hasOwnProperty(\'c\')?');
+test("Is there a 'c' own property on child?", function () {
+  equals(child.hasOwnProperty('c'), __, 'child.hasOwnProperty(\'c\')?');
 });
 
-test("Is there a 'c' own property on childObj.[[Prototype]]?", function () {
-  equals(child.c, __, 'childObj.c?');
+// Is there a 'c' own property on child? No, check its prototype
+// Is there a 'c' own property on child.[[Prototype]]? Yes, its value is...
+test("Is there a 'c' property on child?", function () {
+  equals(child.c, __, 'what is the value of child.c?');
 });
 
 
-// Is there a 'd' own property on childObj? No, check its prototype
-// Is there a 'd' own property on childObj.[[Prototype]]? No, check it prototype
-// childObj.[[Prototype]].[[Prototype]] is null, stop searching, no property found, return...
-test("Is there an 'd' own property on childObj?", function () {
-  equals(child.d, __, 'what is the value of childObj.d?');
+// Is there a 'd' own property on child? No, check its prototype
+// Is there a 'd' own property on child.[[Prototype]]? No, check it prototype
+// child.[[Prototype]].[[Prototype]] is null, stop searching, no property found, return...
+test("Is there an 'd' property on child?", function () {
+  equals(child.d, __, 'what is the value of child.d?');
 });
 
 

topics/about_scope.js

@@ -18,11 +18,5 @@ test("variables declared inside of a function", function() {
     })();
 
     equals(outerVariable, __, 'is outerVariable defined in this scope?');
-    var isInnerVariableDefined = true;
-    try {
-        innerVariable
-    } catch(e) {
-        isInnerVariableDefined = false;
-    }
-    equals(isInnerVariableDefined, __, 'is innerVariable defined in this scope?');
+    equals(typeof(innerVariable), "undefined", 'is innerVariable defined in this scope?');
 });

topics/about_this.js

@@ -12,25 +12,25 @@ test("'this' inside a method", function () {
 
 test("'this' on unattached function", function () {
 	var person = {
-		handle: 'bob',
+		name: 'bob',
 		intro: function () {
-			return "Hello, my name is " + this.handle;
+			return "Hello, my name is " + this.name;
 		} 
 	}
 
 	var alias = person.intro;
 
-	// if the function called as an object property 'this' is the global context 
+	// if the function is not called as an object property 'this' is the global context 
 	// (window in a browser)
 	window.__ = 'Peter';
 	equals("Hello, my name is Peter", alias());
 });
 
 test("'this' set explicitly", function () {
 	var person = {
-		handle: 'bob',
+		name: 'bob',
 		intro: function () {
-			return "Hello, my name is " + this.handle;
+			return "Hello, my name is " + this.name;
 		} 
 	}