infinitescrolling-rails 0.1.6 → 0.2.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (4) hide show
  1. data/Gemfile.lock +17 -17
  2. data/infinitescrolling-rails.gemspec +2 -2
  3. data/vendor/assets/javascripts/infinitescrolling.js +3 -10
  4. metadata +9 -9
data/Gemfile.lock CHANGED
@@ -1,40 +1,40 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- infinitescrolling-rails (0.1.6)
4
+ infinitescrolling-rails (0.2.0)
5
5
  jquery-rails
6
6
  railties (~> 3.1.0)
7
7
 
8
8
  GEM
9
9
  remote: http://rubygems.org/
10
10
  specs:
11
- actionpack (3.1.1)
12
- activemodel (= 3.1.1)
13
- activesupport (= 3.1.1)
11
+ actionpack (3.1.3)
12
+ activemodel (= 3.1.3)
13
+ activesupport (= 3.1.3)
14
14
  builder (~> 3.0.0)
15
15
  erubis (~> 2.7.0)
16
16
  i18n (~> 0.6)
17
- rack (~> 1.3.2)
17
+ rack (~> 1.3.5)
18
18
  rack-cache (~> 1.1)
19
19
  rack-mount (~> 0.8.2)
20
20
  rack-test (~> 0.6.1)
21
- sprockets (~> 2.0.2)
22
- activemodel (3.1.1)
23
- activesupport (= 3.1.1)
21
+ sprockets (~> 2.0.3)
22
+ activemodel (3.1.3)
23
+ activesupport (= 3.1.3)
24
24
  builder (~> 3.0.0)
25
25
  i18n (~> 0.6)
26
- activesupport (3.1.1)
26
+ activesupport (3.1.3)
27
27
  multi_json (~> 1.0)
28
28
  builder (3.0.0)
29
29
  erubis (2.7.0)
30
30
  hike (1.2.1)
31
31
  i18n (0.6.0)
32
- jquery-rails (1.0.18)
32
+ jquery-rails (1.0.19)
33
33
  railties (~> 3.0)
34
34
  thor (~> 0.14)
35
- json (1.6.1)
36
- multi_json (1.0.3)
37
- rack (1.3.5)
35
+ json (1.6.5)
36
+ multi_json (1.0.4)
37
+ rack (1.3.6)
38
38
  rack-cache (1.1)
39
39
  rack (>= 0.4)
40
40
  rack-mount (0.8.3)
@@ -43,15 +43,15 @@ GEM
43
43
  rack
44
44
  rack-test (0.6.1)
45
45
  rack (>= 1.0)
46
- railties (3.1.1)
47
- actionpack (= 3.1.1)
48
- activesupport (= 3.1.1)
46
+ railties (3.1.3)
47
+ actionpack (= 3.1.3)
48
+ activesupport (= 3.1.3)
49
49
  rack-ssl (~> 1.3.2)
50
50
  rake (>= 0.8.7)
51
51
  rdoc (~> 3.4)
52
52
  thor (~> 0.14.6)
53
53
  rake (0.9.2.2)
54
- rdoc (3.11)
54
+ rdoc (3.12)
55
55
  json (~> 1.4)
56
56
  sprockets (2.0.3)
57
57
  hike (~> 1.2)
data/infinitescrolling-rails.gemspec CHANGED
@@ -2,7 +2,7 @@
2
2
 
3
3
  Gem::Specification.new do |s|
4
4
  s.name = "infinitescrolling-rails"
5
- s.version = "0.1.6"
5
+ s.version = "0.2.0"
6
6
  s.platform = Gem::Platform::RUBY
7
7
  s.authors = ["Leif Bladt"]
8
8
  s.email = ["leif.bladt@gmx.de"]
@@ -19,4 +19,4 @@ Gem::Specification.new do |s|
19
19
  s.files = `git ls-files`.split("\n")
20
20
  s.executables = `git ls-files`.split("\n").select{|f| f =~ /^bin/}
21
21
  s.require_path = 'lib'
22
- end
22
+ end
data/vendor/assets/javascripts/infinitescrolling.js CHANGED
@@ -21,16 +21,9 @@
21
21
  },
22
22
 
23
23
  lowEnough: function() {
24
- var pageHeight = Math.max(document.body.scrollHeight,
25
- document.body.offsetHeight);
26
- var viewportHeight = window.innerHeight ||
27
- document.documentElement.clientHeight ||
28
- document.body.clientHeight || 0;
29
- var scrollHeight = window.pageYOffset ||
30
- document.documentElement.scrollTop ||
31
- document.body.scrollTop || 0;
32
-
33
- // Trigger for scrolls within 20 pixels from page bottom
24
+ var pageHeight = $(document).height();
25
+ var viewportHeight = $(window).height();
26
+ var scrollHeight = $(document).scrollTop();
34
27
  return pageHeight - viewportHeight - scrollHeight < my.marginThreshold;
35
28
  }
36
29
  };
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: infinitescrolling-rails
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.6
4
+ version: 0.2.0
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2011-11-23 00:00:00.000000000Z
12
+ date: 2012-02-28 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: railties
16
- requirement: &2156430260 !ruby/object:Gem::Requirement
16
+ requirement: &2151899100 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ~>
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: 3.1.0
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *2156430260
24
+ version_requirements: *2151899100
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: jquery-rails
27
- requirement: &2156428400 !ruby/object:Gem::Requirement
27
+ requirement: &2151897800 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: '0'
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *2156428400
35
+ version_requirements: *2151897800
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: bundler
38
- requirement: &2156419440 !ruby/object:Gem::Requirement
38
+ requirement: &2151896440 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ~>
@@ -43,7 +43,7 @@ dependencies:
43
43
  version: 1.0.0
44
44
  type: :development
45
45
  prerelease: false
46
- version_requirements: *2156419440
46
+ version_requirements: *2151896440
47
47
  description: This gem provides the infinite scrolling jQuery plugin for your Rails
48
48
  3.1 application.
49
49
  email:
@@ -83,7 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
83
83
  version: 1.3.6
84
84
  requirements: []
85
85
  rubyforge_project:
86
- rubygems_version: 1.8.6
86
+ rubygems_version: 1.8.15
87
87
  signing_key:
88
88
  specification_version: 3
89
89
  summary: Use the infinite scrolling jQuery plugin with Rails 3.1