render_async 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34364781d19ea77161a9be8861be690efc034fd1
-  data.tar.gz: 2cc3906d7c0c680f663694dc9d9224daf0091fc4
+  metadata.gz: 0e8f5232e6ce897923d42d8d7e13e12f2106596a
+  data.tar.gz: ffddc0b5d3b6844d443b2b38b3314ad42fbf2b21
 SHA512:
-  metadata.gz: 663f85b5338e9348745f4b515aa630b0e035fa7e598a6adfa7b7d8848e8fa25f20eec8eb1d65120f5885b3bc09314fa074cd617b4f002f028178b059757a1720
-  data.tar.gz: e5e3b70a41ae41946651c20204b7414bde2073cc70803fd8b1a1e46ab3a3766d0148d4267bc64f8d9d289bb289a69be4448b72b34abbb24a865efaad7be54ab1
+  metadata.gz: 7a3b034960837da35ba4afd002c2f7c9ea05d55cbc33a20f9b6644e965c17295a48d47156eb418d7346f0204b50e298cd60525d258c174001a382884c05b4dfe
+  data.tar.gz: 6a74359e25c505cdb82135fa671b966a54d41fc543e989f23e5086242de52bc6dc6ade032c647ea5abae6f1713bddbb25fae583b83241e4e7f1bd36ac826b60b

data/README.md

@@ -102,21 +102,7 @@ Rendered code in the view:
 
 <script nonce="lWaaV6eYicpt+oyOfcShYINsz0b70iR+Q1mohZqNaag=">
 //<![CDATA[
-  (function() {
-    var request = new XMLHttpRequest();
-    var asyncRequest = true;
-    var SUCCESS = 200;
-    var ERROR = 400;
-    request.open("GET", "/users", asyncRequest);
-
-    request.onload = function() {
-      if (request.status >= SUCCESS && request.status < ERROR) {
-        document.getElementById("render_async_18b41794481507226109").outerHTML = request.responseText;
-      }
-    };
-
-    request.send();
-  })();
+  ...
 //]]>
 </script>
 ```
@@ -142,21 +128,7 @@ Rendered code in the view:
 
 <script>
 //<![CDATA[
-  (function() {
-    var request = new XMLHttpRequest();
-    var asyncRequest = true;
-    var SUCCESS = 200;
-    var ERROR = 400;
-    request.open("GET", "/users", asyncRequest);
-
-    request.onload = function() {
-      if (request.status >= SUCCESS && request.status < ERROR) {
-        document.getElementById("render_async_14d7ac165d1505993721").outerHTML = request.responseText;
-      }
-    };
-
-    request.send();
-  })();
+  ...
 //]]>
 </script>
 ```
@@ -184,23 +156,9 @@ Rendered code in view:
 
 <script>
 //<![CDATA[
-  (function() {
-    var request = new XMLHttpRequest();
-    var asyncRequest = true;
-    var SUCCESS = 200;
-    var ERROR = 400;
-    request.open("GET", "/users", asyncRequest);
-
-    request.onload = function() {
-      if (request.status >= SUCCESS && request.status < ERROR) {
-        document.getElementById("render_async_04229e7abe1507987376").outerHTML = request.responseText;
-
-        document.dispatchEvent(new Event("users-loaded"));
-      }
-    };
-
-    request.send();
-  })();
+  ...
+    document.dispatchEvent(new Event("users-loaded"));
+  ...
 //]]>
 </script>
 ```

data/app/views/render_async/_render_async.html.erb

@@ -4,25 +4,37 @@
 
 <% content_for :render_async do %>
   <%= javascript_tag html_options do %>
-    (function() {
-      var request = new XMLHttpRequest();
-      var asyncRequest = true;
-      var SUCCESS = 200;
-      var ERROR = 400;
-
-      request.open("GET", "<%= path %>", asyncRequest);
-
-      request.onload = function() {
-        if (request.status >= SUCCESS && request.status < ERROR) {
-          document.getElementById("<%= container_id %>").outerHTML = request.responseText;
+    if (jQuery) {
+      (function($){
+        $.ajax({ url: "<%= path %>" }).always(function(response) {
+          $("#<%= container_id %>").replaceWith(response);
 
           <% if event_name.present? %>
             document.dispatchEvent(new Event("<%= event_name %>"));
           <% end %>
-        }
-      };
+        });
+      }(jQuery));
+    } else {
+      (function() {
+        var request = new XMLHttpRequest();
+        var asyncRequest = true;
+        var SUCCESS = 200;
+        var ERROR = 400;
+
+        request.open("GET", "<%= path %>", asyncRequest);
+
+        request.onload = function() {
+          if (request.status >= SUCCESS && request.status < ERROR) {
+            var container = document.getElementById("<%= container_id %>");
+
+            <% if event_name.present? %>
+              document.dispatchEvent(new Event("<%= event_name %>"));
+            <% end %>
+          }
+        };
 
-      request.send();
-    })();
+        request.send();
+      })();
+    }
   <% end %>
 <% end %>

data/lib/render_async/version.rb

@@ -1,3 +1,3 @@
 module RenderAsync
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: render_async
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Kasper Grubbe