flex_infinite_scroll 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 125e4f628fdad23f1e968f3cc131cd18903577db0450880253f9658aeefd73dc
-  data.tar.gz: 2c1ec04e55f76d94fe8444bcd15fd32dcf31c3694d2934e79f7168cb225cf846
+  metadata.gz: 37a58fecb23bb9e79e62fd86a32f47175af166e28f6566434163a195383a2721
+  data.tar.gz: 8d4b8547f40dbc981787dad0f906cae3539e6e95c037bf9be3f5ac6744a80656
 SHA512:
-  metadata.gz: f88222c0722ed0ba5c2fb51464b1ce43019e28daf99494615b807fab79d256d0d854883888f701aa6add9539ae344df447fc4c3419fcf384f4628e67d5f0e34d
-  data.tar.gz: d2cd42824a91fca0561c034b548fa87c03e6ad20a7154a4d163594fa54ca661d73b1d4112ea17c7bd091775769aaa4c432f10736e8825d89ae7738c6cbb6809c
+  metadata.gz: 68f06d3befe1159605f7d2a0fcee111828e3ea067eb677a4ff7ec0530164810f5bf3933812e5b6459169a4290b34cd809d9f1ecba96b6195fc71369fc65940ce
+  data.tar.gz: b97012ddc994ffd764a16ae40ceac2702831894012380fb9dacf191792a0892fe892f365badf802f870e2e05823e82d9682d3e346ed77ad62e3abbf121e52f2c

data/lib/flex_infinite_scroll/view_helpers.rb

@@ -6,10 +6,14 @@ module FlexInfiniteScroll
     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'
+      result = if config[:targetContainer]
+                 fis_get_list(data, partial, 'html')
+               else
+                 content_tag :div, class: "fis-container #{config[:container_class] || ''}" do
+                   fis_get_list(data, partial, 'html')
+                 end
+               end
+      config[:scrollContainer] ||= (config[:targetContainer] || 'body')
       config[:targetContainer] ||= '.fis-container'
       result += javascript_tag do
         "$('#{config[:scrollContainer]}').flexInfiniteScroll(#{config.to_json})".html_safe

data/vendor/assets/javascript/flex_infinite_scroll.js

@@ -13,18 +13,34 @@ $.fn.extend({
     var loadMargin = config.loadMargin || 150;
     var beforeAction = config.beforeAction;
     var afterAction = config.afterAction;
-    var targetContainer = config.targetContainer || scrollContainer ;
-    var eventTarget;
+    var targetContainer= config.targetContainer || scrollContainer ;
+    var eventTarget = (scrollContainer.localName == '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
+      } else {
+        return eventTarget.scrollHeight
+      }
+      
+    }
+    
     function getData(page = 1){
       // Check for loading process and last page
       if (scrollContainer.dataset.fisLoading === '1' || page == 'last') return false
       scrollContainer.dataset.fisLoading = 1;
       // before load action
-      if (beforeAction) beforeAction;
+      if (beforeAction) {
+        if (typeof(beforeAction) == 'function') {
+          beforeAction();
+        }else if (typeof(beforeAction) == 'string') {
+          eval(beforeAction)
+        }
+      }
       $.ajax({
         url: scrollContainer.dataset.fisUrl,
         // custom query params
@@ -47,7 +63,13 @@ $.fn.extend({
             getData(scrollContainer.dataset.fisNextPage)
           }
           // after load action
-          if (afterAction) afterAction;
+          if (afterAction) {
+            if (typeof(afterAction) == 'function') {
+              afterAction();
+            }else if (typeof(afterAction) == 'string') {
+              eval(afterAction)
+            }
+          }
         },
         error: function() {
           scrollContainer.dataset.fisLoading = 0;
@@ -60,29 +82,27 @@ $.fn.extend({
       getData(startPage)
     } else if (scrollNotApear()) {
       // check if on initial load not enough elements on screen
-      getData(scrollContainer.dataset.fisNextPage)
+      getData(scrollContainer.dataset.fisNextPage);
     }
     
+    // check if body scroll
+    
     function scrollNotApear(){
-    	var containerSize=$(scrollContainer).innerHeight();
-    	var scrollSize=scrollContainer.scrollHeight;
-      return (scrollSize - containerSize - (loadMargin * 1.1) < 0)
+      var containerSize=$(eventTarget).innerHeight();
+    	var scrollSize=getScrollHeight();
+      return (scrollSize - containerSize - loadMargin <= 0)
     }
 
-    // check if body scroll
-    eventTarget = (scrollContainer.localName == 'body' ? window : scrollContainer);
-
     $(eventTarget).on('scroll', () => {
     	var scrollTop=$(eventTarget).scrollTop();
-    	var containerSize=$(scrollContainer).innerHeight();
-    	var scrollSize=scrollContainer.scrollHeight;
-      console.log(scrollSize - loadMargin)
-      console.log(scrollTop + containerSize)
+    	var containerSize=$(eventTarget).innerHeight();
+    	var scrollSize=getScrollHeight();
     	if (scrollTop + containerSize > scrollSize - loadMargin && scrollContainer.dataset.fisNextPage != 'last'){
-        console.log(1)
         getData(scrollContainer.dataset.fisNextPage);
     	};
     })
     
+    
+    
   }
 })

metadata

@@ -1,29 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: flex_infinite_scroll
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Anton Ignatov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-20 00:00:00.000000000 Z
+date: 2019-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sanitize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.1.1
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 description: 
 email: belmek@me.com
 executables: []
@@ -52,7 +66,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
-- Rails
 - jQuery
 rubyforge_project: 
 rubygems_version: 2.7.6