Merge pull request #28 from willstocks-tech/develop

v0.0.8

Author: willstocks

README.md

@@ -11,7 +11,7 @@
 
 A little script that allows you to only polyfill a feature when absolutely necessary - no wasted requests on browsers that have native support! 😆🤓
 
-This script is ~4.03KB **un**minified (121 lines) _(1019B **un**minified and gzipped)_, ~8.37KB **un**minified with inline comments (121 lines) _(2.12KB **un**minified and gzipped)_, or ~1.75KB **minified** (1 line) _(697B minified and gzipped)_, so it's _fairly_ light. :smile:
+This script is ~4.2KB **un**minified (121 lines) _(1.04KB **un**minified and gzipped)_, ~8.37KB **un**minified with inline comments (121 lines) _(2.12KB **un**minified and gzipped)_, or ~1.9KB **minified** (1 line) _(743B minified and gzipped)_, so it's _fairly_ light. :smile:
 
 ## Getting Started
 

dynamicpolyfill.js

@@ -1,7 +1,7 @@
 const polyfillio = "https://polyfill.io/v3/polyfill.min.js?features=";
 
 function dynamicPolyfill(tocheck, scriptToPolyfill, functionToRunonLoad) {
-    if(typeof Promise !== "undefined" || "Promise" in this) {
+    if(typeof Promise !== "undefined" || window.hasOwnProperty("Promise")) {
         var polyfillReq = [];
         if(Array.isArray(tocheck)) {
             tocheck.forEach(
@@ -37,12 +37,12 @@ function promiFill(tocheck, scriptToPolyfill, functionToRunonLoad) {
 
 function checking(check) {
     var splitChars = ".";
-    if((check in window) !== true || (check in this) !== true) {
+    if(window.hasOwnProperty(check)!== true || (typeof this.check !== 'function') !== true || (check in this) !== true) {
         if (check.indexOf(splitChars) >= 1) {
             var split = check.split(".");
-            var firstWord = window[split[0]];
+            var firstWord = (split[0] === "window" ? split[0] : window[split[0]]);
             var lastWord = new Object(split[split.length - 1]);
-            if (lastWord in firstWord != true && lastWord in firstWord.prototype != true) {
+            if ((firstWord.prototype.hasOwnProperty(lastWord) !== true) && (firstWord.hasOwnProperty(lastWord) !== true) && (lastWord in firstWord !== true)) {
                 return check;
             }
         } else {