Merge pull request #867 from reactjs/fix-762

fix(#762): ensure react is mounted in Jquery3
reactjs · Feb 5, 2018 · f17376f · f17376f
2 parents 318ae5b + 23d6e2a
commit f17376f
Show file tree

Hide file tree

Showing 7 changed files with 97 additions and 130 deletions.
diff --git a/gemfiles/.bundle/config b/gemfiles/.bundle/config
@@ -0,0 +1,2 @@
+---
+BUNDLE_RETRY: "1"
diff --git a/lib/assets/javascripts/react_ujs.js b/lib/assets/javascripts/react_ujs.js
@@ -128,14 +128,7 @@ module.exports = function(ujs) {
     nativeEvents.teardown(ujs);
   }
 
-  if (ujs.jQuery) {
-    ujs.handleEvent = function(eventName, callback) {
-      ujs.jQuery(document).on(eventName, callback);
-    };
-    ujs.removeEvent = function(eventName, callback) {
-      ujs.jQuery(document).off(eventName, callback);
-    }
-  } else if ('addEventListener' in window) {
+  if ('addEventListener' in window) {
     ujs.handleEvent = function(eventName, callback) {
       document.addEventListener(eventName, callback);
     };
@@ -387,10 +380,7 @@ module.exports = {
   // Attach handlers to browser events to mount
   // (There are no unmount handlers since the page is destroyed on navigation)
   setup: function(ujs) {
-    if (ujs.jQuery) {
-      // Use jQuery if it's present:
-      ujs.handleEvent("ready", ujs.handleMount);
-    } else if ('addEventListener' in window) {
+    if ('addEventListener' in window) {
       ujs.handleEvent('DOMContentLoaded', ujs.handleMount);
     } else {
       // add support to IE8 without jQuery
@@ -399,7 +389,6 @@ module.exports = {
   },
 
   teardown: function(ujs) {
-    ujs.removeEvent("ready", ujs.handleMount);
     ujs.removeEvent('DOMContentLoaded', ujs.handleMount);
     ujs.removeEvent('onload', ujs.handleMount);
   }

diff --git a/package.json b/package.json
@@ -14,6 +14,6 @@
     "webpack": "^2.3.3"
   },
   "dependencies": {
-    "react_ujs": "^2.4.2"
+    "react_ujs": "^2.4.3"
   }
 }
diff --git a/react_ujs/dist/react_ujs.js b/react_ujs/dist/react_ujs.js
@@ -128,14 +128,7 @@ module.exports = function(ujs) {
     nativeEvents.teardown(ujs);
   }
 
-  if (ujs.jQuery) {
-    ujs.handleEvent = function(eventName, callback) {
-      ujs.jQuery(document).on(eventName, callback);
-    };
-    ujs.removeEvent = function(eventName, callback) {
-      ujs.jQuery(document).off(eventName, callback);
-    }
-  } else if ('addEventListener' in window) {
+  if ('addEventListener' in window) {
     ujs.handleEvent = function(eventName, callback) {
       document.addEventListener(eventName, callback);
     };
@@ -387,10 +380,7 @@ module.exports = {
   // Attach handlers to browser events to mount
   // (There are no unmount handlers since the page is destroyed on navigation)
   setup: function(ujs) {
-    if (ujs.jQuery) {
-      // Use jQuery if it's present:
-      ujs.handleEvent("ready", ujs.handleMount);
-    } else if ('addEventListener' in window) {
+    if ('addEventListener' in window) {
       ujs.handleEvent('DOMContentLoaded', ujs.handleMount);
     } else {
       // add support to IE8 without jQuery
@@ -399,7 +389,6 @@ module.exports = {
   },
 
   teardown: function(ujs) {
-    ujs.removeEvent("ready", ujs.handleMount);
     ujs.removeEvent('DOMContentLoaded', ujs.handleMount);
     ujs.removeEvent('onload', ujs.handleMount);
   }

diff --git a/react_ujs/src/events/detect.js b/react_ujs/src/events/detect.js
@@ -18,14 +18,7 @@ module.exports = function(ujs) {
     nativeEvents.teardown(ujs);
   }
 
-  if (ujs.jQuery) {
-    ujs.handleEvent = function(eventName, callback) {
-      ujs.jQuery(document).on(eventName, callback);
-    };
-    ujs.removeEvent = function(eventName, callback) {
-      ujs.jQuery(document).off(eventName, callback);
-    }
-  } else if ('addEventListener' in window) {
+  if ('addEventListener' in window) {
     ujs.handleEvent = function(eventName, callback) {
       document.addEventListener(eventName, callback);
     };

diff --git a/react_ujs/src/events/native.js b/react_ujs/src/events/native.js
@@ -2,10 +2,7 @@ module.exports = {
   // Attach handlers to browser events to mount
   // (There are no unmount handlers since the page is destroyed on navigation)
   setup: function(ujs) {
-    if (ujs.jQuery) {
-      // Use jQuery if it's present:
-      ujs.handleEvent("ready", ujs.handleMount);
-    } else if ('addEventListener' in window) {
+    if ('addEventListener' in window) {
       ujs.handleEvent('DOMContentLoaded', ujs.handleMount);
     } else {
       // add support to IE8 without jQuery
@@ -14,7 +11,6 @@ module.exports = {
   },
 
   teardown: function(ujs) {
-    ujs.removeEvent("ready", ujs.handleMount);
     ujs.removeEvent('DOMContentLoaded', ujs.handleMount);
     ujs.removeEvent('onload', ujs.handleMount);
   }