corn_starch 1.8.14 → 1.8.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ea829f6eb8e862b2f1b992f9fbc640afad472be
-  data.tar.gz: 0bbf743e31f95f82f1142089249d6d3c9561700c
+  metadata.gz: 62cf72ba8d4305c23eddabff203a5f4e3bd0df64
+  data.tar.gz: 130ad797a47daf8961879e1e27f8183866f6bf34
 SHA512:
-  metadata.gz: dbeb9febc4b42532e8661a9462c498c35014b447af59d5c6c4ec6ce8bf2126a2bfc355dbc9d98c8a3cb3ea4e55c0f0016e5a52ebbab1e6c9e8de753c0e249954
-  data.tar.gz: 053bb8505348b1268bb0004e85fb64c1b0195a5f7de646d99e4a58e9d6dd5e017dd2743ad183c5c4fb1a130a18eda0541d44d8b7b840308b1840d920f2906e19
+  metadata.gz: c1b5ab4a3c4579c54d71798ddc7df329976362e75b1f618592af7016399144ab984f3213d2476112ee8e63f238b5167f7108810630045293a9cf7aed0322cc71
+  data.tar.gz: 211d86440857289097fea369ee8b166f0658c363f6ef159c027008465aff2dd7bc8443b32591355ac970820b36bf966db9743e282d5687f50fbc4d60c85ec114

data/app/assets/javascripts/corn_starch/infiniscroll.js.coffee

@@ -5,7 +5,8 @@
 
 # Should Element Reload
 window.infiniscroll_should_reload = (container) ->
-	(container[0].scrollTop() + container[0].offsetHeight) >= (container[0].scrollHeight - container.attr('infiniscroll-margin'))
+	if container.attr('infiniscroll-control') == 'window' then e = $(window) else e = c[0]
+	(e.scrollTop + e.offsetHeight) >= (e.scrollHeight - container.attr('infiniscroll-margin'))
 
 # InfiniScroll
 window.infiniscroll = (container) ->
@@ -72,7 +73,7 @@ window.infiniscroll_reset = (container) ->
 window.infiniscroll_handler = (c) ->
 
 	# DEBUG
-	alert("infiniscroll_handler -> #{c.id}")
+	alert("infiniscroll_handler -> #{c[0].id}")
 
 	# Check Position
 	if infiniscroll_should_reload c
@@ -94,10 +95,6 @@ window.infiniscroll_init = ->
 
 		# Acquire
 		c = $(@)
-		
-		# DEBUG
-		alert "CONTAINER[0] : #{c[0].id}"
-		alert "CONTAINER : #{c.id}"
 
 		# Unbind Shit
 		c.unbind 'scroll'
@@ -105,15 +102,11 @@ window.infiniscroll_init = ->
 		# Check Scroll
 		if infiniscroll_should_reload c
 
-			# DEBUG
-			alert("infiniscroll_init -> #{c.id}")
-
 			# Scroll it, bitch !
-			infiniscroll c.id
+			infiniscroll c[0].id
 
 		# Handle Scroll Events
 		c.scroll infiniscroll_handler
 
 # Initialize InfiniScroll for the Page
-$(document).on 'page:load', infiniscroll_init
 $(document).ready infiniscroll_init

data/app/views/corn_starch/layouts/_modal.html.erb

@@ -8,5 +8,4 @@
 
 	<%# Init Modal %>
 	$(document).ready(function() { modal_init('<%= modal[:name] %>'); });
-	$(document).on('page:load', function() { modal_init('<%= modal[:name] %>'); });
-</script>
+</script>

data/lib/corn_starch/version.rb

@@ -1,3 +1,3 @@
 module CornStarch
-  VERSION = '1.8.14'
+  VERSION = '1.8.15'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: corn_starch
 version: !ruby/object:Gem::Version
-  version: 1.8.14
+  version: 1.8.15
 platform: ruby
 authors:
 - Eresse