Merge branch 'nicky1038-jquery3-compatibility'

cytoscape · Oct 22, 2019 · 1a3e76d · 1a3e76d
2 parents a4a5179 + 38a1977
commit 1a3e76d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -19,7 +19,7 @@ A Cytoscape.js extension that wraps the [qTip jQuery library](http://qtip2.com)
 
 ## Dependencies
 
- * jQuery ^2.0 || ^1.10.0, as qTip requires it
+ * jQuery ^3.0 || ^2.0 || ^1.10.0, as qTip requires it
  * qTip ^3.0 || ^2.2.0
  * Cytoscape.js ^2.2.0 || ^3.0.0
 

diff --git a/cytoscape-qtip.js b/cytoscape-qtip.js
@@ -52,6 +52,10 @@ SOFTWARE.
     }
   };
 
+  var fixDomContainer = function(ele) {
+    return ele && ( ele[0] === window ) ? undefined : ele;
+  };
+
   var throttle = function(func, wait, options) {
     var leading = true,
         trailing = true;
@@ -196,8 +200,8 @@ SOFTWARE.
 
       // qtip should be positioned relative to cy dom container
       opts.position = opts.position || {};
-      opts.position.container = opts.position.container || $( document.body );
-      opts.position.viewport = opts.position.viewport || $( document.body );
+      opts.position.container = fixDomContainer(opts.position.container) || $( document.body );
+      opts.position.viewport = fixDomContainer(opts.position.viewport) || $( document.body );
       opts.position.target = [0, 0];
       opts.position.my = opts.position.my || 'top center';
       opts.position.at = opts.position.at || 'bottom center';

diff --git a/package.json b/package.json
@@ -36,7 +36,7 @@
     "run-sequence": "^1.0.0"
   },
   "dependencies": {
-    "jquery": "^2.0 || ^1.10.0",
+    "jquery": "^3.0.0 || ^2.0 || ^1.10.0",
     "qtip2": "^3.0 || ^2.2.0"
   },
   "peerDependencies": {