jscrollpane-rails 2.0.19 → 2.0.20

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,15 +1,7 @@
1
1
  ---
2
- !binary "U0hBMQ==":
3
- metadata.gz: !binary |-
4
- NjIxNGVhY2VjMmVkMDE1ZmM2YjNiZDFjYjMzY2JhNzBjMjQwODEzYQ==
5
- data.tar.gz: !binary |-
6
- ZDZkZWM2Y2Q0N2ExODA4NzNmYzc0NmM5NjFlYzQxODZlZDUxYWY4ZQ==
2
+ SHA1:
3
+ metadata.gz: edd9a57c4e871260580e534d6f4ef3fccddd62cb
4
+ data.tar.gz: 6d18cd77a426c557bbd7301419834300a2611c02
7
5
  SHA512:
8
- metadata.gz: !binary |-
9
- MzYzOGVhMmFjYzljYTIwYTExNDY3ZjA5YWQyMWFkZjA1ZWU4N2ZhZGU0YTY2
10
- MWI2NTM1MTA0OTU1NDgxYTlhNWE5OWU0ZjU4ZDI5MGQzYjgzOWFmOTJjOTcz
11
- ZTc5MTg1MTU4ZTMyODViMmZiMzg1ZjZjMzM1OTljNjExNGNhMWE=
12
- data.tar.gz: !binary |-
13
- NGJiMTU3NjkzNzY4NTg0NDRlNjgxMzc0Yjk4ZmM4YmRkZmFhODlkNDI1NzFj
14
- MDk3NzJiN2ZkNDBlOTVhZjNjZGZhMmZkNWM1MTMxY2E2NDgzOWFlYjdkYTRi
15
- MGU3MWM5YmU3YmMwYzdlOTAwYTU2NjQ0MDA4Nzg2ZDExZDQ4NGU=
6
+ metadata.gz: 7d0499243572596ce789e7487a1c362b877e6b9d3a193ed838ad6a6b74e2c35e54e1af8c48aa104b38fa612b70c92540c15a1d0d1ebd4304a121082f0efbaccd
7
+ data.tar.gz: d5a16cdda5c9dae50a79e2852008a65fb6d43cddac3aaa252ba6b050c89df3d5c942468113c9fc5b346e39efca4a4a3a5cb1835022a0b763b201edb19a351428
data/README.md CHANGED
@@ -38,6 +38,10 @@ There is a gem `mwheelintent-rails` available:
38
38
 
39
39
  * https://github.com/bodrovis/mwheelintent-rails
40
40
 
41
+ FOR RUSSIAN SPEAKERS: There is a guide available describing basic usage of jScrollPane: http://www.radiant-wind.com/categories/javascript-css-html/posts/nestandartnaya-polosa-prokrutki-s-pomoschyu-javascript
42
+
43
+ FOR ENGLISH SPEAKERS: The same guide is now availble in English: http://www.radiant-wind.com/categories/javascript-css-html/posts/creating-custom-scrollpane-using-javascript
44
+
41
45
  ## Usage
42
46
 
43
47
  In your `application.js` you will need to add this line:
@@ -55,3 +59,9 @@ And in your `application.css` you will need to add this line:
55
59
  3. Commit your changes (`git commit -am 'Added some feature'`)
56
60
  4. Push to the branch (`git push origin my-new-feature`)
57
61
  5. Create new Pull Request
62
+
63
+ ## License
64
+
65
+ This plugin is licensed under the [MIT License](https://github.com/bodrovis/RadiantScroller/blob/master/LICENSE).
66
+
67
+ Copyright (c) 2014 [Ilya Bodrov](http://radiant-wind.com)
@@ -1,5 +1,5 @@
1
1
  module JScrollPane
2
2
  module Rails
3
- VERSION = "2.0.19"
3
+ VERSION = "2.0.20"
4
4
  end
5
5
  end
@@ -1,14 +1,14 @@
1
1
  /*!
2
- * jScrollPane - v2.0.19 - 2013-11-16
2
+ * jScrollPane - v2.0.20 - 2014-10-23
3
3
  * http://jscrollpane.kelvinluck.com/
4
4
  *
5
- * Copyright (c) 2013 Kelvin Luck
5
+ * Copyright (c) 2014 Kelvin Luck
6
6
  * Dual licensed under the MIT or GPL licenses.
7
7
  */
8
8
 
9
9
  // Script: jScrollPane - cross browser customisable scrollbars
10
10
  //
11
- // *Version: 2.0.19, Last updated: 2013-11-16*
11
+ // *Version: 2.0.20, Last updated: 2014-10-23*
12
12
  //
13
13
  // Project Home - http://jscrollpane.kelvinluck.com/
14
14
  // GitHub - http://github.com/vitch/jScrollPane
@@ -17,7 +17,7 @@
17
17
  //
18
18
  // About: License
19
19
  //
20
- // Copyright (c) 2013 Kelvin Luck
20
+ // Copyright (c) 2014 Kelvin Luck
21
21
  // Dual licensed under the MIT or GPL Version 2 licenses.
22
22
  // http://jscrollpane.kelvinluck.com/MIT-LICENSE.txt
23
23
  // http://jscrollpane.kelvinluck.com/GPL-LICENSE.txt
@@ -39,6 +39,7 @@
39
39
  //
40
40
  // About: Release History
41
41
  //
42
+ // 2.0.20 - (2014-10-23) Adds AMD support (thanks @carlosrberto) and support for overflow-x/overflow-y (thanks @darimpulso)
42
43
  // 2.0.19 - (2013-11-16) Changes for more reliable scroll amount with latest mousewheel plugin (thanks @brandonaaron)
43
44
  // 2.0.18 - (2013-10-23) Fix for issue with gutters and scrollToElement (thanks @Dubiy)
44
45
  // 2.0.17 - (2013-08-17) Working correctly when box-sizing is set to border-box (thanks @pieht)
@@ -61,7 +62,21 @@
61
62
  // elements and dynamically sized elements.
62
63
  // 1.x - (2006-12-31 - 2010-07-31) Initial version, hosted at googlecode, deprecated
63
64
 
64
- (function($,window,undefined){
65
+ (function (plugin, window) {
66
+ var factory = function($){
67
+ return plugin($, window);
68
+ }
69
+ if ( typeof define === 'function' && define.amd ) {
70
+ // AMD. Register as an anonymous module.
71
+ define(['jquery'], factory);
72
+ } else if (typeof exports === 'object') {
73
+ // Node/CommonJS style for Browserify
74
+ module.exports = factory;
75
+ } else {
76
+ // Browser globals
77
+ factory(jQuery);
78
+ }
79
+ }(function($,window,undefined){
65
80
 
66
81
  $.fn.jScrollPane = function(settings)
67
82
  {
@@ -705,7 +720,7 @@
705
720
  }
706
721
 
707
722
  container.scrollTop(0);
708
- verticalDragPosition = destY;
723
+ verticalDragPosition = destY || 0;
709
724
 
710
725
  var isAtTop = verticalDragPosition === 0,
711
726
  isAtBottom = verticalDragPosition == dragMaxY,
@@ -752,7 +767,7 @@
752
767
  }
753
768
 
754
769
  container.scrollTop(0);
755
- horizontalDragPosition = destX;
770
+ horizontalDragPosition = destX ||0;
756
771
 
757
772
  var isAtLeft = horizontalDragPosition === 0,
758
773
  isAtRight = horizontalDragPosition == dragMaxX,
@@ -879,6 +894,10 @@
879
894
  container.unbind(mwEvent).bind(
880
895
  mwEvent,
881
896
  function (event, delta, deltaX, deltaY) {
897
+
898
+ if (!horizontalDragPosition) horizontalDragPosition = 0;
899
+ if (!verticalDragPosition) verticalDragPosition = 0;
900
+
882
901
  var dX = horizontalDragPosition, dY = verticalDragPosition, factor = event.deltaFactor || settings.mouseWheelSpeed;
883
902
  jsp.scrollBy(deltaX * factor, -deltaY * factor, false);
884
903
  // return true if there was no movement so rest of screen can scroll
@@ -1445,4 +1464,4 @@
1445
1464
  scrollPagePercent : .8 // Percent of visible area scrolled when pageUp/Down or track area pressed
1446
1465
  };
1447
1466
 
1448
- })(jQuery,this);
1467
+ },this));
metadata CHANGED
@@ -1,43 +1,44 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: jscrollpane-rails
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.19
4
+ version: 2.0.20
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ilya Bodrov
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2013-11-19 00:00:00.000000000 Z
11
+ date: 2014-10-24 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: railties
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - ! '>='
17
+ - - '>='
18
18
  - !ruby/object:Gem::Version
19
19
  version: '3.1'
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
- - - ! '>='
24
+ - - '>='
25
25
  - !ruby/object:Gem::Version
26
26
  version: '3.1'
27
- description: ! "A ruby gem that uses the Rails asset pipeline to include the jScrollPane
28
- plugin by Kelvin Luck\n (www.kelvinluck.com)."
27
+ description: |-
28
+ A ruby gem that uses the Rails asset pipeline to include the jScrollPane plugin by Kelvin Luck
29
+ (www.kelvinluck.com).
29
30
  email:
30
31
  - golosizpru@gmail.com
31
32
  executables: []
32
33
  extensions: []
33
34
  extra_rdoc_files: []
34
35
  files:
35
- - lib/jscrollpane-rails/version.rb
36
+ - LICENSE
37
+ - README.md
36
38
  - lib/jscrollpane-rails.rb
39
+ - lib/jscrollpane-rails/version.rb
37
40
  - vendor/assets/javascripts/jquery.jscrollpane.js
38
41
  - vendor/assets/stylesheets/jscrollpane.css
39
- - LICENSE
40
- - README.md
41
42
  homepage: https://github.com/bodrovis/jscrollpane-rails
42
43
  licenses:
43
44
  - MIT
@@ -48,17 +49,17 @@ require_paths:
48
49
  - lib
49
50
  required_ruby_version: !ruby/object:Gem::Requirement
50
51
  requirements:
51
- - - ! '>='
52
+ - - '>='
52
53
  - !ruby/object:Gem::Version
53
54
  version: '0'
54
55
  required_rubygems_version: !ruby/object:Gem::Requirement
55
56
  requirements:
56
- - - ! '>='
57
+ - - '>='
57
58
  - !ruby/object:Gem::Version
58
59
  version: '0'
59
60
  requirements: []
60
61
  rubyforge_project:
61
- rubygems_version: 2.1.11
62
+ rubygems_version: 2.4.2
62
63
  signing_key:
63
64
  specification_version: 4
64
65
  summary: Includes javascript and css files for the jScrollPane plugin.