Resolving browser incompatibities

Also update author credits.
1904labs · Sep 11, 2024 · e7d6ab0 · e7d6ab0
1 parent d330547
commit e7d6ab0
Show file tree

Hide file tree

Showing 6 changed files with 64 additions and 55 deletions.
diff --git a/README.md b/README.md
@@ -386,7 +386,7 @@ DOLCIMASCOLO (packaging), Zee (ZM) @zm-cttae (many major updates), Joshua Walsh
 @nstuyvesant (fixes), King Wang @eachmawzw (CORS image proxy), TMM Schmit @tmmschmit
 (useCredentialsFilters), Aravind @codesculpture (fix overridden props), Shi Wenyu @cWenyu
 (shadow slot fix), David Burns @davidburns573 and Yujia Cheng @YujiaCheng1996 (font copy
-optional)
+optional), Julien Dorra @juliendorra (documentation)
 
 ## License
 

diff --git a/dist/dom-to-image-more.min.js b/dist/dom-to-image-more.min.js
diff --git a/dist/dom-to-image-more.min.js.map b/dist/dom-to-image-more.min.js.map
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,11 +1,11 @@
 {
     "name": "dom-to-image-more",
-    "version": "3.4.3",
+    "version": "3.4.4",
     "description": "Generates an image from a DOM node using HTML5 canvas and SVG",
     "main": "dist/dom-to-image-more.min.js",
     "devDependencies": {
         "chai": "^4.3.10",
-        "eslint": "^9.9.1",
+        "eslint": "^9.10.0",
         "grunt": "^1.6.1",
         "grunt-cli": "^1.5.0",
         "grunt-contrib-jshint": "^3.2.0",
@@ -68,7 +68,8 @@
         "Aravind @codesculpture",
         "Shi Wenyu @cWenyu",
         "David Burns @davidburns573",
-        "Yujia Cheng @YujiaCheng1996"
+        "Yujia Cheng @YujiaCheng1996",
+        "Julien Dorra @juliendorra"
     ],
     "license": "MIT",
     "bugs": {

diff --git a/src/dom-to-image-more.js b/src/dom-to-image-more.js
@@ -663,11 +663,9 @@
         }
 
         function isInShadowRoot(value) {
-            return (
-                value !== null &&
-                'getRootNode' in value &&
-                isShadowRoot(value.getRootNode())
-            );
+            // not calling the method, getting the method
+            if (value === null || value === undefined || value.getRootNode === undefined) return false;
+            return isShadowRoot(value.getRootNode());
         }
 
         function isElement(value) {
@@ -1123,7 +1121,8 @@
             function getCssRules(styleSheets) {
                 const cssRules = [];
                 styleSheets.forEach(function (sheet) {
-                    if ('cssRules' in Object.getPrototypeOf(sheet)) {
+                    const sheetProto = Object.getPrototypeOf(sheet);
+                    if (Object.prototype.hasOwnProperty.call(sheetProto, 'cssRules')) {
                         try {
                             util.asArray(sheet.cssRules || []).forEach(
                                 cssRules.push.bind(cssRules)