dont override real jquery

mavenman · Oct 18, 2017 · 3642c14 · 3642c14
1 parent 8c9ffa9
commit 3642c14
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/utils/extender.js b/src/utils/extender.js
@@ -51,7 +51,7 @@ module.exports = ({$, Backbone}) => {
     };
   }
 
-  if ($) {
+  if ($ && $.prototype.constructor.name !== 'jQuery') {
     const fn = $.fn;
 
     const splitNamespace = function(name) {
@@ -293,8 +293,10 @@ module.exports = ({$, Backbone}) => {
       return ar;
     }
 
-    $.inArray = function(val, arr) {
-      return arr.indexOf(val);
+    const indexOf = Array.prototype.indexOf;
+
+    $.inArray = function(val, arr, i) {
+      return arr == null ? -1 : indexOf.call( arr, val, i );
     }
 
     $.Event = function(src, props) {