Merge branch 'master' into fix-triangle-exercise

danielj-jordan · web-flow · commit 2e48fceb75ea · 2017-11-22T06:08:03.000-08:00
diff --git a/.eslintignore b/.eslintignore
@@ -35,4 +35,4 @@ exercises/scrabble-score
 exercises/secret-handshake
 exercises/simple-cipher
 exercises/simple-linked-list
-exercises/trinary
+exercises/trinary
diff --git a/exercises/wordy/example.js b/exercises/wordy/example.js
@@ -47,11 +47,11 @@ WordProblem.prototype.evaluate = function () {
   var out = 0;
   var m   = this.matches;
 
-  if (m[1] !== undefined && m[2] !== undefined && m[3] !== undefined) {
+  if ( (typeof m[1]) === 'string'  && (typeof m[2]) === 'string'  && (typeof m[3]) === 'string') {
     out = this.operate(m[2], m[1], m[3]);
   }
 
-  if (m[4] !== undefined && m[5] !== undefined) {
+  if ( (typeof m[4]) === 'string' && (typeof m[5]) === 'string') {
     out = this.operate(m[4], out, m[5]);
   }
 

Original file line number	Diff line number	Diff line change
`@@ -47,11 +47,11 @@ WordProblem.prototype.evaluate = function () {`
`47`	`47`	`var out = 0;`
`48`	`48`	`var m = this.matches;`
`49`	`49`
`50`		`- if (m[1] !== undefined && m[2] !== undefined && m[3] !== undefined) {`
	`50`	`+ if ( (typeof m[1]) === 'string' && (typeof m[2]) === 'string' && (typeof m[3]) === 'string') {`
`51`	`51`	`out = this.operate(m[2], m[1], m[3]);`
`52`	`52`	`}`
`53`	`53`
`54`		`- if (m[4] !== undefined && m[5] !== undefined) {`
	`54`	`+ if ( (typeof m[4]) === 'string' && (typeof m[5]) === 'string') {`
`55`	`55`	`out = this.operate(m[4], out, m[5]);`
`56`	`56`	`}`
`57`	`57`