From f9ea7ab0da080f06291b1258e409ecbf6e0211b1 Mon Sep 17 00:00:00 2001 From: Gail Matsushima Date: Wed, 28 Oct 2015 20:01:46 -1000 Subject: [PATCH 1/2] revised basics --- basics.js | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/basics.js b/basics.js index 944afa9..99be80a 100644 --- a/basics.js +++ b/basics.js @@ -1,24 +1,84 @@ /* Create a `myName` variable and assign it a String value */ +function Person (name) { + + var myName = name; + document.createElement(myName); + return myName; + } + console.log(Person('Gail')); + + /* Create a `person` variable and give it 2 properties, * `name`, assign it the same name as before, * as well as an `age` (number); */ +var Person = ['Gail', 40]; + /* Create a function called `greet`, * it should take a 1 parameter, `name` * and it should print "Hello, my name is {name}" */ +function greet (name) { +return "Hello, my name is " + name; +} +console.log(greet()); /* Create a variable called `canDrive`, * if it should be true if your person object is at least 16 years old */ +function canDrive (age) { +if (age >= 16) {return true;} +else if (age < 16) {return false;} +} +console.log(greet('Hector')); +console.log(canDrive(29)); /* Create an array called `dataTypes` with atleast 1 of every data type; * (there are 6 different data types); */ +var dataTypes = ['hello', true, null, undefined, 1020, ''] +var + +function findDataType (dataTypes) { + +var types = ['string', 'booleans', null, 'undefined', 'numbers', 'symbols']; + for ( var i = 0; i < dataTypes.length; i++ ) { + dataTypes = types[i]; + + if ( dataTypes[i] === null ) { + types.push( null ); + } + else { + types.push( typeof dataTypes[i] ); + } + } + } + + findDataType (); + types.should.include( 'string' ); + types.should.include( 'number' ); + types.should.include( 'undefined' ); + types.should.include( 'object' ); + types.should.include( 'boolean' ); + types.should.include( null ); + + /* Create a Dog object * it should have a `bark` function that makes your dog bark! * It should also have a name attribute with the value of 'Spot' */ +function bark (sound, name){ + + var dog = { + + name: 'Spot', + age: 15, + color: 'yellow', + }; + + return name + " " + "really likes to" + " " + sound + "!"; + } + console.log(bark('bark', 'Spot')); \ No newline at end of file From 177a9a72e4941f42019474e9c869cf89967f51d6 Mon Sep 17 00:00:00 2001 From: Gail Matsushima Date: Wed, 28 Oct 2015 21:44:37 -1000 Subject: [PATCH 2/2] revised II --- basics.js | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/basics.js b/basics.js index 99be80a..fe7b860 100644 --- a/basics.js +++ b/basics.js @@ -3,8 +3,7 @@ function Person (name) { var myName = name; - document.createElement(myName); - return myName; + return myName; } console.log(Person('Gail')); @@ -13,7 +12,10 @@ function Person (name) { * `name`, assign it the same name as before, * as well as an `age` (number); */ -var Person = ['Gail', 40]; +var Person = { + name: 'Gail', + age: 21, +}; /* Create a function called `greet`, @@ -24,7 +26,7 @@ function greet (name) { return "Hello, my name is " + name; } -console.log(greet()); +console.log(greet('Joe')); /* Create a variable called `canDrive`, * if it should be true if your person object is at least 16 years old */ @@ -33,29 +35,27 @@ function canDrive (age) { if (age >= 16) {return true;} else if (age < 16) {return false;} } -console.log(greet('Hector')); + console.log(canDrive(29)); /* Create an array called `dataTypes` with atleast 1 of every data type; * (there are 6 different data types); */ -var dataTypes = ['hello', true, null, undefined, 1020, ''] -var function findDataType (dataTypes) { -var types = ['string', 'booleans', null, 'undefined', 'numbers', 'symbols']; - for ( var i = 0; i < dataTypes.length; i++ ) { + var types = ['hello', true, null, undefined, 20, 'dog']; + + for ( var i = 0; i < types.length; i++ ) { dataTypes = types[i]; - if ( dataTypes[i] === null ) { - types.push( null ); + if ( dataTypes === null ) { + dataTypes.push( null ); } else { - types.push( typeof dataTypes[i] ); + dataTypes.push( typeof types ); } } } - findDataType (); types.should.include( 'string' ); types.should.include( 'number' ); @@ -77,6 +77,7 @@ function bark (sound, name){ name: 'Spot', age: 15, color: 'yellow', + sound: 'bark', }; return name + " " + "really likes to" + " " + sound + "!";