flex_infinite_scroll 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c06e8d3f9cc52fcfb5f27ecf04f9aa527fe9d8a68605ab27c8655b9e59a110f6
-  data.tar.gz: e38bd3e917d5cf558d7c501d450c1331e7bb9ba7e64ab6b34fc5703907a9195e
+  metadata.gz: 125e4f628fdad23f1e968f3cc131cd18903577db0450880253f9658aeefd73dc
+  data.tar.gz: 2c1ec04e55f76d94fe8444bcd15fd32dcf31c3694d2934e79f7168cb225cf846
 SHA512:
-  metadata.gz: 3c289900ff552c532db39185bb4405b2500de066160ee5c4752e2fab2855660be01233d5d16e9e4d4ccbd01bfa5c5e87dd4b6c03bae5b2b0d431e61ae3ca59db
-  data.tar.gz: 7b9c06824b812f18b52454a520051b0a9d5b1e3b4c5be807b5311a972a7ee44dcd50b6c40026fb547e0f3db5b9e678efe50d3da927defe02db9d2b9591d87199
+  metadata.gz: f88222c0722ed0ba5c2fb51464b1ce43019e28daf99494615b807fab79d256d0d854883888f701aa6add9539ae344df447fc4c3419fcf384f4628e67d5f0e34d
+  data.tar.gz: d2cd42824a91fca0561c034b548fa87c03e6ad20a7154a4d163594fa54ca661d73b1d4112ea17c7bd091775769aaa4c432f10736e8825d89ae7738c6cbb6809c

data/lib/flex_infinite_scroll.rb

@@ -1,11 +1,19 @@
+# frozen_string_literal: true
+
 # Infinite scroll module
+require 'flex_infinite_scroll/view_helpers'
+require 'sanitize'
+
 module FlexInfiniteScroll
-  class Engine < ::Rails::Engine; end
+  class Engine < ::Rails::Engine
+    ActionView::Base.send :include, FlexInfiniteScroll::ViewHelpers
+  end
   extend ActiveSupport::Concern
   def infinite_scroll(page = 1, page_size = (ENV['FIS_PAGE_SIZE'] || 20))
+    page ||= 1
     page = page.to_i if page.class == String
     offset_skip = (page - 1) * page_size
-    total_page = (count / page_size.to_f).ceil
+    total_page = (count('*') / page_size.to_f).ceil
     {
       data: offset(offset_skip).limit(page_size),
       total_page: total_page,

data/lib/flex_infinite_scroll/view_helpers.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module FlexInfiniteScroll
+  module ViewHelpers
+    include ActionView::Helpers::TagHelper
+    include ActionView::Context
+
+    def fis_init_list(data, partial, config = {})
+      result = content_tag :div, class: "fis-container #{config[:container_class] || ''}" do
+        fis_get_list(data, partial, 'html')
+      end
+      config[:scrollContainer] ||= 'body'
+      config[:targetContainer] ||= '.fis-container'
+      result += javascript_tag do
+        "$('#{config[:scrollContainer]}').flexInfiniteScroll(#{config.to_json})".html_safe
+      end
+      Sanitize.fragment(result,
+                        Sanitize::Config.merge(Sanitize::Config::RELAXED,
+                                               elements: Sanitize::Config::RELAXED[:elements] + %w(script))).html_safe
+    end
+
+    def fis_next_page(data, partial)
+      data[:data] = fis_get_list(data, partial, 'json')
+      data
+    end
+
+    def fis_get_list(data, partial, format)
+      result = ''
+      data[:data].each do |member|
+        result += if format == 'json'
+                    render_to_string(partial: partial, locals: { fis_object: member })
+                  else
+                    render partial: partial, locals: { fis_object: member }
+                  end
+      end
+      Sanitize.fragment(result, Sanitize::Config::RELAXED).html_safe
+    end
+  end
+end

data/vendor/assets/javascript/flex_infinite_scroll.js

@@ -10,7 +10,7 @@ $.fn.extend({
     var queryParams = config.queryParams;
     var dataProcess = config.dataProcess;
     var initialLoad = config.initialLoad;
-    var loadMargin = config.loadMargin || 50;
+    var loadMargin = config.loadMargin || 150;
     var beforeAction = config.beforeAction;
     var afterAction = config.afterAction;
     var targetContainer = config.targetContainer || scrollContainer ;
@@ -19,7 +19,6 @@ $.fn.extend({
     scrollContainer.dataset.fisNextPage = nextPage;
     scrollContainer.dataset.fisUrl = dataUrl;
     scrollContainer.dataset.fisLoading = 0;
-    
     function getData(page = 1){
       // Check for loading process and last page
       if (scrollContainer.dataset.fisLoading === '1' || page == 'last') return false
@@ -77,7 +76,10 @@ $.fn.extend({
     	var scrollTop=$(eventTarget).scrollTop();
     	var containerSize=$(scrollContainer).innerHeight();
     	var scrollSize=scrollContainer.scrollHeight;
+      console.log(scrollSize - loadMargin)
+      console.log(scrollTop + containerSize)
     	if (scrollTop + containerSize > scrollSize - loadMargin && scrollContainer.dataset.fisNextPage != 'last'){
+        console.log(1)
         getData(scrollContainer.dataset.fisNextPage);
     	};
     })

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: flex_infinite_scroll
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Anton Ignatov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-14 00:00:00.000000000 Z
-dependencies: []
+date: 2019-04-20 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: sanitize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: belmek@me.com
 executables: []
@@ -17,6 +31,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/flex_infinite_scroll.rb
+- lib/flex_infinite_scroll/view_helpers.rb
 - vendor/assets/javascript/flex_infinite_scroll.js
 homepage: https://github.com/aignatov-bio/flex_infinite_scroll
 licenses:
@@ -36,7 +51,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-requirements: []
+requirements:
+- Rails
+- jQuery
 rubyforge_project: 
 rubygems_version: 2.7.6
 signing_key: