Merge branch 'master' of https://github.com/N4m/command-line-args int…

…o next
75lb · Jul 30, 2016 · 7913ed3 · 7913ed3
2 parents 2a8b866 + 25d1eb2
commit 7913ed3
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/es5/definition.js b/es5/definition.js
@@ -41,11 +41,19 @@ var OptionDefinition = function () {
   }, {
     key: 'isBoolean',
     value: function isBoolean() {
-      return this.type === Boolean;
+      if (!this.type) {
+        return false;
+      } else { // Fall back to ES5 Method
+        var result = /^function\s+([\w\$]+)\s*\(/.exec( this.type.toString() );
+        if (result && result.length>=2 && result[1] == "Boolean") {
+            return true;
+        }
+      }
+      return false;
     }
   }]);
 
   return OptionDefinition;
 }();
 
-module.exports = OptionDefinition;
+module.exports = OptionDefinition;
diff --git a/lib/definition.js b/lib/definition.js
@@ -236,7 +236,17 @@ class OptionDefinition {
   }
 
   isBoolean () {
-    return this.type === Boolean
+    if (!this.type) {
+        return false;
+    } else if (this.type.name == "Boolean") { // First try ES6 Method
+        return true;
+    } else { // Fall back to ES5 Method
+        var result = /^function\s+([\w\$]+)\s*\(/.exec( this.type.toString() );
+        if (result && result.length>=2 && result[1] == "Boolean") {
+            return true;
+        }
+    }
+    return false;
   }
 }