Merge pull request #7 from wruth/second-edition

update Set values() and valuesLegacy() to return items values instead…

Author: loiane

chapter06/01-Set.js

@@ -49,8 +49,8 @@ function Set() {
  */
  this.sizeLegacy = function(){
  var count = 0;
- for(var prop in items) {
- if(items.hasOwnProperty(prop))
+ for(var key in items) {
+ if(items.hasOwnProperty(key))
  ++count;
  }
  return count;
@@ -62,15 +62,21 @@ function Set() {
  * @returns {Array}
  */
  this.values = function(){
- return Object.keys(items);
+ var values = [];
+ for (var i=0, keys=Object.keys(items); i<keys.length; i++) {
+ values.push(items[keys[i]]);
+ }
+ return values;
  };
 
  this.valuesLegacy = function(){
- var keys = [];
- for(var key in items){
- keys.push(key);
+ var values = [];
+ for(var key in items) {
+ if(items.hasOwnProperty(key)) {
+ values.push(items[key]);
+ }
  }
- return keys;
+ return values;
  };
 
  this.getItems = function(){

chapter06/02-UsingSets.js

@@ -1,18 +1,18 @@
 var set = new Set();
 
 set.add(1);
-console.log(set.values()); //outputs ["1"]
+console.log(set.values()); //outputs [1]
 console.log(set.has(1)); //outputs true
 console.log(set.size()); //outputs 1
 
 set.add(2);
-console.log(set.values()); //outputs ["1", "2"]
+console.log(set.values()); //outputs [1, 2]
 console.log(set.has(2)); //true
 console.log(set.size()); //2
 console.log(set.sizeLegacy()); //3
 
 set.remove(1);
-console.log(set.values()); //outputs ["2"]
+console.log(set.values()); //outputs [2]
 
 set.remove(2);
 console.log(set.values()); //outputs []