flex_infinite_scroll 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 3cb41835798253e2a4d88bdcfe92c12777f14b68c8ed69b1983f59d70ef17253
-  data.tar.gz: 50e727fdb17ba2d7fbf6990197e4d083e281fe0cfdd79cc10c0a449f156ec243
+SHA1:
+  metadata.gz: 6dca995d94c2ad3e09019b7d273940ba9aaab2c7
+  data.tar.gz: 11616db0db37cbefd5d5a303d528440baa5c11f5
 SHA512:
-  metadata.gz: ed2d0f945d3afe55c13e162cce7f4c8ef87bb8de0f644de7bd48e818b24e5c0c3d58a1e96769436a513976bd36bf119abf528d35d0e2327101cae85b28f4e415
-  data.tar.gz: 0e80acdf4f616b7bb78374bed03b75598d4fc25c267fa2fcf22643ad4da39b5e477fdfb6ab73221dd03d7cfeeb1e609069ea7926d1699b82bd9e2b7148bbf807
+  metadata.gz: cd01ef3e67277c1805e030e6cce972978eb8e0f88839eb5fcf5166c7a7fb9497c1f1ecb5c504c979d45e3292cf5458d6315339cdd93855e65b3beeaeba7b402c
+  data.tar.gz: 83e655f62ab35e6c8f2375bddfeca4996dafb9add85de27eb1ef24d557133e63cfd71069f26d197b767bbb6fd206576b517160ab12508fdd21f152e2c3ccf8c6

data/lib/flex_infinite_scroll/view_helpers.rb

@@ -6,24 +6,24 @@ module FlexInfiniteScroll
     include ActionView::Context
 
     def fis_init_list(data, partial, config = {})
+      data = kaminari_prepare(data) if config[:kaminari]
       result = if config[:targetContainer]
                  fis_get_list(data, partial, 'html')
                else
-                 content_tag :div, class: "fis-container #{config[:container_class] || ''}" do
+                 content_tag :div, id: 'fis-container', class: (config[:container_class] || '').to_s do
                    fis_get_list(data, partial, 'html')
                  end
                end
       config[:scrollContainer] ||= (config[:targetContainer] || 'body')
-      config[:targetContainer] ||= '.fis-container'
+      config[:targetContainer] ||= 'fis-container'
       result += javascript_tag do
-        "$('#{config[:scrollContainer]}').flexInfiniteScroll(#{config.to_json})".html_safe
+        "flexInfiniteScroll('#{config[:scrollContainer]}',#{config.to_json})".html_safe
       end
-      Sanitize.fragment(result,
-                        Sanitize::Config.merge(Sanitize::Config::RELAXED,
-                                               elements: Sanitize::Config::RELAXED[:elements] + %w(script))).html_safe
+      result.html_safe
     end
 
-    def fis_next_page(data, partial)
+    def fis_next_page(data, partial, config = {})
+      data = kaminari_prepare(data) if config[:kaminari]
       data[:data] = fis_get_list(data, partial, 'json')
       data
     end
@@ -37,7 +37,16 @@ module FlexInfiniteScroll
                     render partial: partial, locals: { fis_object: member }
                   end
       end
-      Sanitize.fragment(result, Sanitize::Config::RELAXED).html_safe
+      result.html_safe
+    end
+
+    private
+
+    def kaminari_prepare(data)
+      {
+        data: data,
+        next_page: data.next_page
+      }
     end
   end
 end

data/lib/flex_infinite_scroll.rb

@@ -2,7 +2,6 @@
 
 # Infinite scroll module
 require 'flex_infinite_scroll/view_helpers'
-require 'sanitize'
 
 module FlexInfiniteScroll
   class Engine < ::Rails::Engine

data/vendor/assets/javascript/flex_infinite_scroll.js

@@ -1,12 +1,12 @@
 // Flex Infinite Scroll initialization
 
-$.fn.extend({
-  flexInfiniteScroll: function(config = {}) {
+
+function flexInfiniteScroll(object_id,config = {}) {
     // Config preparing
     var startPage = config.startPage || 1;
     var nextPage = startPage + 1;
     var dataUrl = config.url;
-    var scrollContainer = this[0];
+    var scrollContainer = (object_id == 'body' ? document.body : document.getElementById(object_id));
     var queryParams = config.queryParams;
     var dataProcess = config.dataProcess;
     var initialLoad = config.initialLoad;
@@ -14,53 +14,68 @@ $.fn.extend({
     var beforeAction = config.beforeAction;
     var afterAction = config.afterAction;
     var targetContainer= config.targetContainer || scrollContainer ;
-    var eventTarget = (scrollContainer.localName == 'body' ? window : scrollContainer);
+    var eventTarget = (object_id == 'body' ? window : scrollContainer);
     if (config.lastPage) nextPage = 'last';
     scrollContainer.dataset.fisNextPage = nextPage;
     scrollContainer.dataset.fisUrl = dataUrl;
     scrollContainer.dataset.fisLoading = 0;
     
     function getScrollHeight(){
-      if (scrollContainer.localName == 'body'){
-        return document.documentElement.scrollHeight
+      if (object_id == 'body'){
+        return document.documentElement.scrollHeight;
       } else {
-        return eventTarget.scrollHeight
+        return eventTarget.scrollHeight;
       }
       
     }
+
+    function urlParams(object) {
+      var encodedString = '';
+      for (var prop in object) {
+          if (object.hasOwnProperty(prop)) {
+              if (encodedString.length > 0) {
+                  encodedString += '&';
+              }
+              encodedString += encodeURI(prop + '=' + object[prop]);
+          }
+      }
+      return encodedString;
+    }
     
     function getData(page = 1){
       // Check for loading process and last page
-      if (scrollContainer.dataset.fisLoading === '1' || page == 'last') return false
+      if (scrollContainer.dataset.fisLoading === '1' || page == 'last') return false;
       scrollContainer.dataset.fisLoading = 1;
       // before load action
       if (beforeAction) {
         if (typeof(beforeAction) == 'function') {
           beforeAction();
         }else if (typeof(beforeAction) == 'string') {
-          eval(beforeAction)
+          eval(beforeAction);
         }
       }
-      $.ajax({
-        url: scrollContainer.dataset.fisUrl,
-        // custom query params
-        data: (queryParams || {page: page}),
-        dataType: 'json',
-        type: 'GET',
-        success: function(json) {
-          
+      var xhr = new XMLHttpRequest();
+      var params = (queryParams || {page: page});
+      xhr.open('GET', scrollContainer.dataset.fisUrl + '?' + urlParams(params));
+      xhr.onload = function() {
+        var json = JSON.parse(xhr.response)
+        if (xhr.status === 200) {
           if (dataProcess){
             // custom user processor
-            dataProcess(json,$(targetContainer));
+            dataProcess(json,targetContainer);
           } else {
             // default data processor
-            $(json.data).appendTo($(targetContainer));
+            var div = document.createElement('div');
+            div.innerHTML = json.data;
+            while (div.children.length > 0) {
+              document.getElementById(targetContainer).appendChild(div.children[0]);
+            }
           }
           scrollContainer.dataset.fisNextPage = json.next_page || 'last';
           scrollContainer.dataset.fisLoading = 0;
           if (scrollNotApear()) {
             // check if on initial load not enough elements on screen
-            getData(scrollContainer.dataset.fisNextPage)
+            getData(scrollContainer.dataset.fisNextPage);
           }
           // after load action
           if (afterAction) {
@@ -69,17 +84,17 @@ $.fn.extend({
             }else if (typeof(afterAction) == 'string') {
               eval(afterAction)
             }
-          }
-        },
-        error: function() {
+          }   
+        } else {
           scrollContainer.dataset.fisLoading = 0;
         }
-      });
+      };
+      xhr.send();
     }
     
     // intial load
     if (initialLoad) {
-      getData(startPage)
+      getData(startPage);
     } else if (scrollNotApear()) {
       // check if on initial load not enough elements on screen
       getData(scrollContainer.dataset.fisNextPage);
@@ -88,14 +103,14 @@ $.fn.extend({
     // check if body scroll
     
     function scrollNotApear(){
-      var containerSize=$(eventTarget).innerHeight();
+      var containerSize=(object_id == 'body' ?  eventTarget.innerHeight : eventTarget.offsetHeight);
     	var scrollSize=getScrollHeight();
-      return (scrollSize - containerSize - loadMargin <= 0)
+      return (scrollSize - containerSize - loadMargin <= 0);
     }
 
-    $(eventTarget).on('scroll', () => {
-    	var scrollTop=$(eventTarget).scrollTop();
-    	var containerSize=$(eventTarget).innerHeight();
+    eventTarget.addEventListener('scroll', function() {
+    	var scrollTop= (object_id == 'body' ?  eventTarget.scrollY : eventTarget.scrollTop);
+    	var containerSize=(object_id == 'body' ?  eventTarget.innerHeight : eventTarget.offsetHeight);
     	var scrollSize=getScrollHeight();
     	if (scrollTop + containerSize > scrollSize - loadMargin && scrollContainer.dataset.fisNextPage != 'last'){
         getData(scrollContainer.dataset.fisNextPage);
@@ -104,5 +119,4 @@ $.fn.extend({
     
     
     
-  }
-})
+}

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: flex_infinite_scroll
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Anton Ignatov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-21 00:00:00.000000000 Z
+date: 2019-05-05 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: sanitize
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.6.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.6.3
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -65,11 +51,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-requirements:
-- jQuery
+requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.6.14.3
 signing_key: 
 specification_version: 4
-summary: Add infinite scrolling to models and views
+summary: Infinite scroll for Ruby on Rails applications on pure JavaScript. Also has
+  Kaminari support for pagination.
 test_files: []