render_async 2.1.5 → 2.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a8461ed53ed7d4d5518985762d2f76dec99936336c4cbfaffb1ff5e3ae91e10
-  data.tar.gz: e5b013fb3116c1edf08532cff838c54b51042e88c40ef1354b0d2ad211c4793b
+  metadata.gz: e4395fdb879d841524916faed69721328699ce7e0a306eb90e1fc8884481b456
+  data.tar.gz: f46076b2751679131e34cfa171f57f669eeea03ff7a54dfa0f72ef7e62a5ae30
 SHA512:
-  metadata.gz: 75f915f3bdb92d38f5b9085377923423fbaa9bd72f39632d819c1114fa283bdd953a1fe3649d3c27f3609b01de951e24e8db008b8c9e5edf1ff2d1a792b809eb
-  data.tar.gz: d78fa9d2c96ee3676542ec6b4c0db93ad606917c225fd6386ed400c6ec9287ec70a9328eb2ae7e880faa04cb96e59e0ff3fc2ef3f469a3ee01bd720f8fe14849
+  metadata.gz: a489a71c7f80f9de03cb1d5c907b0e254e1dd40417432ff58c8a165f49b4e75a74d4338f20969be147bc5f1919d55f94f29189531f7822cb1803a6fc12ba0300
+  data.tar.gz: c045fe610ddbddde1083c1455c106e6024cb743a32d69f1c9e2720c5cba6bad1b9941af955383ee9c340d7f9d7538f7abbfd9eea58491f84428ee030b62f8ba9

data/CHANGELOG.md

@@ -1,8 +1,33 @@
-### 2.1.1 (2019/8/17)
+### 2.1.6 (2020/5/9)
+
+* [#114](https://github.com/renderedtext/render_async/pull/114): Call render_async logic if document state is ready or interactive - [@nikolalsvk](https://github.com/nikolalsvk).
+* [#113](https://github.com/renderedtext/render_async/pull/113): Remove interval after Turbolinks visit event - [@nikolalsvk](https://github.com/nikolalsvk).
+* [#112](https://github.com/renderedtext/render_async/pull/112): Add X-Requested-With header in Vanilla JS - [@nikolalsvk](https://github.com/nikolalsvk).
+* [#110](https://github.com/renderedtext/render_async/pull/110): Remove preventDefault, and load toggle in stream - [@vanboom](https://github.com/vanboom).
+
+### 2.1.5 (2020/3/22)
+
+* [#105](https://github.com/renderedtext/render_async/pull/105): Load toggle listeners after page loads - [@nikolalsvk](https://github.com/nikolalsvk).
+* [#104](https://github.com/renderedtext/render_async/pull/104): Attach container to dispatched events - [@nikolalsvk](https://github.com/nikolalsvk).
+* [#103](https://github.com/renderedtext/render_async/pull/103): Add generic "load" and "error" events - [@lipsumar](https://github.com/lipsumar).
+* [#98](https://github.com/renderedtext/render_async/pull/98): Bump nonce pattern in the README to follow Rails CSP standard - [@colinxfleming](https://github.com/colinxfleming).
+
+### 2.1.4 (2019/11/11)
+
+* [#96](https://github.com/renderedtext/render_async/pull/96): Add once option to remove event once it's triggered #94 - [@fffx](https://github.com/fffx).
+
+### 2.1.3 (2019/9/24)
+
+* [#95](https://github.com/renderedtext/render_async/pull/95): Use double quotes for displaying error message - [@nikolalsvk](https://github.com/nikolalsvk).
+* [#93](https://github.com/renderedtext/render_async/pull/93): Fix: "Uncaught ReferenceError: \_interval" #92 - [@fffx](https://github.com/fffx).
+
+### 2.1.2 (2019/8/17)
+
 * [#89](https://github.com/renderedtext/render_async/pull/89): Bump version to 2.1.2 - [@nikolalsvk](https://github.com/nikolalsvk).
 * [#82](https://github.com/renderedtext/render_async/pull/88): When toggle true, do not fire `_renderAsyncFunc` on `turbolinks:load` - [@ThanhKhoaIT](https://github.com/ThanhKhoaIT).
 
 ### 2.1.1 (2019/8/17)
+
 * [#85](https://github.com/renderedtext/render_async/pull/85): Rename main JS function and support toggle feature with other features - [@nikolalsvk](https://github.com/nikolalsvk).
 * [#82](https://github.com/renderedtext/render_async/pull/82): Add toggle selector and event to render - [@ThanhKhoaIT](https://github.com/ThanhKhoaIT).
 * DEPRECATION WARNING - html_options is now a hash that you pass to render_async instead of an argument. If you passed for example a nonce: '21312aas...', you will need to pass

data/README.md

@@ -268,11 +268,11 @@ document.addEventListener('render_async_error', function(event) {
 });
 
 // with jQuery
-$(document).on('render_async_load', function(event, container) {
-  console.log('Async partial loaded in this container:', container);
+$(document).on('render_async_load', function(event) {
+  console.log('Async partial loaded in this container:', event.container);
 });
-$(document).on('render_async_error', function(event, container) {
-  console.log('Async partial could not load in this container:', container);
+$(document).on('render_async_error', function(event) {
+  console.log('Async partial could not load in this container:', event.container);
 });
 ```
 

data/app/views/render_async/_request_jquery.js.erb

@@ -18,11 +18,16 @@ if (window.jQuery) {
     }
 
     function _runAfterDocumentLoaded(callback) {
-      <% if turbolinks %>
-      $(document).one('turbolinks:load', callback);
-      <% else %>
-      $(document).ready(callback);
-      <% end %>
+      if (document.readyState === 'complete' || document.readyState === 'interactive') {
+        // Handle a case where nested partials get loaded after the document loads
+        callback();
+      } else {
+        <% if turbolinks %>
+        $(document).one('turbolinks:load', callback);
+        <% else %>
+        $(document).ready(callback);
+        <% end %>
+      }
     }
 
     function _makeRequest(currentRetryCount) {
@@ -91,18 +96,27 @@ if (window.jQuery) {
 
     var _renderAsyncFunction = _makeRequest;
 
-    <% if interval %>
     var _interval;
+    <% if interval %>
     var _renderAsyncFunction = function() {
       _makeRequest();
       _interval = setInterval(_makeRequest, <%= interval %>);
     }
+
+    <% if turbolinks %>
+    $(document).one('turbolinks:visit', function() {
+      if (typeof(_interval) === 'number') {
+        console.log('clearing the interval in jQuery part')
+        clearInterval(_interval)
+        _interval = undefined;
+      }
+    });
+    <% end %>
     <% end %>
 
     <% if toggle %>
     function _setUpToggle() {
       $(document).<%= toggle[:once] ? 'one' : 'on' %>('<%= toggle[:event] || 'click' %>', '<%= toggle[:selector] %>', function(event) {
-        event.preventDefault();
         if (typeof(_interval) === 'number') {
           clearInterval(_interval);
           _interval = undefined;
@@ -112,11 +126,11 @@ if (window.jQuery) {
       });
     }
 
-    _runAfterDocumentLoaded(_setUpToggle)
+    _runAfterDocumentLoaded(_setUpToggle);
     <% elsif !toggle %>
     _runAfterDocumentLoaded(_renderAsyncFunction)
     <% end %>
   }(jQuery));
 } else {
-  console.warn("Looks like you've enabled jQuery for render_async, but jQuery is not defined");
+  console.warn("Looks like you've enabled jQuery for render_async, but jQuery is not defined on the window object");
 };

data/app/views/render_async/_request_vanilla.js.erb

@@ -44,6 +44,8 @@
       request.setRequestHeader(key, headers[key]);
     });
 
+    request.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
+
     request.onreadystatechange = function() {
       if (request.readyState === 4) {
         if (request.status >= SUCCESS && request.status < ERROR) {
@@ -72,7 +74,6 @@
           var container = document.getElementById('<%= container_id %>');
           container.outerHTML = '<%= error_message.try(:html_safe) %>';
 
-          console.log(container)
           var errorEvent = createEvent('render_async_error', container);
           document.dispatchEvent(errorEvent);
 
@@ -105,19 +106,28 @@
 
   var _renderAsyncFunction = _makeRequest;
 
-  <% if interval %>
   var _interval;
+  <% if interval %>
   var _renderAsyncFunction = function() {
     _makeRequest();
     _interval = setInterval(_makeRequest, <%= interval %>);
   }
+
+  <% if turbolinks %>
+  document.addEventListener("turbolinks:visit", function(e) {
+    if (typeof(_interval) === 'number') {
+      console.log('clearing the interval')
+      clearInterval(_interval);
+      _interval = undefined;
+    }
+  });
+  <% end %>
   <% end %>
 
   <% if toggle %>
   function _setUpToggle() {
-    var selectors = document.querySelectorAll('<%= toggle[:selector] %>'), i;
+    var selectors = document.querySelectorAll('<%= toggle[:selector] %>');
     var handler = function(event) {
-      event.preventDefault();
       if (typeof(_interval) === 'number') {
         clearInterval(_interval);
         _interval = undefined;
@@ -129,7 +139,7 @@
       <% end %>
     };
 
-    for (i = 0; i < selectors.length; ++i) {
+    for (var i = 0; i < selectors.length; ++i) {
       selectors[i].addEventListener('<%= toggle[:event] || 'click' %>', handler)
     }
   }

data/lib/render_async/version.rb

@@ -1,3 +1,3 @@
 module RenderAsync
-  VERSION = "2.1.5".freeze
+  VERSION = "2.1.6".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: render_async
 version: !ruby/object:Gem::Version
-  version: 2.1.5
+  version: 2.1.6
 platform: ruby
 authors:
 - Kasper Grubbe
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-22 00:00:00.000000000 Z
+date: 2020-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -101,8 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Render parts of the page asynchronously with AJAX