skrollr-rails 0.6.10 → 0.6.11
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/skrollr-rails/version.rb +1 -1
- data/vendor/assets/javascripts/skrollr.js +8 -4
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: fb34fa2e1b2ca62c6b68054373f28854ff545c52
|
|
4
|
+
data.tar.gz: c1e98ffdddcc45515a4a43028969fc5ac80a2145
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 2d8be55cb4575df26d8ed5daca3de45dff80818e10a2a8bb76ada7f99ee29923fe4d7cfe7faeecdfd2d2703c15bb28fea688b8b7101752be49bf6f4fa9c065d4
|
|
7
|
+
data.tar.gz: 926a2e74c7b6418b48740d954fc10f64a5c6dc3eccbe10093b18ad6feacd832f6765d74eb5136d68bdcd57182661954de45ab35fa71b0840eb0fa9244eaf5cde
|
|
@@ -19,7 +19,7 @@
|
|
|
19
19
|
init: function(options) {
|
|
20
20
|
return _instance || new Skrollr(options);
|
|
21
21
|
},
|
|
22
|
-
VERSION: '0.6.
|
|
22
|
+
VERSION: '0.6.11'
|
|
23
23
|
};
|
|
24
24
|
|
|
25
25
|
//Minify optimization.
|
|
@@ -48,7 +48,7 @@
|
|
|
48
48
|
|
|
49
49
|
var DEFAULT_EASING = 'linear';
|
|
50
50
|
var DEFAULT_DURATION = 1000;//ms
|
|
51
|
-
var
|
|
51
|
+
var DEFAULT_MOBILE_DECELERATION = 0.004;//pixel/ms²
|
|
52
52
|
|
|
53
53
|
var DEFAULT_SMOOTH_SCROLLING_DURATION = 200;//ms
|
|
54
54
|
|
|
@@ -244,6 +244,8 @@
|
|
|
244
244
|
_scale = options.scale || 1;
|
|
245
245
|
}
|
|
246
246
|
|
|
247
|
+
_mobileDeceleration = options.mobileDeceleration || DEFAULT_MOBILE_DECELERATION;
|
|
248
|
+
|
|
247
249
|
_smoothScrollingEnabled = options.smoothScrolling !== false;
|
|
248
250
|
_smoothScrollingDuration = options.smoothScrollingDuration || DEFAULT_SMOOTH_SCROLLING_DURATION;
|
|
249
251
|
|
|
@@ -667,8 +669,8 @@
|
|
|
667
669
|
//Cap speed at 3 pixel/ms.
|
|
668
670
|
speed = Math.max(Math.min(speed, 3), -3);
|
|
669
671
|
|
|
670
|
-
var duration = Math.abs(speed /
|
|
671
|
-
var targetOffset = speed * duration + 0.5 *
|
|
672
|
+
var duration = Math.abs(speed / _mobileDeceleration);
|
|
673
|
+
var targetOffset = speed * duration + 0.5 * _mobileDeceleration * duration * duration;
|
|
672
674
|
var targetTop = _instance.getScrollTop() - targetOffset;
|
|
673
675
|
|
|
674
676
|
//Relative duration change for when scrolling above bounds.
|
|
@@ -1443,6 +1445,8 @@
|
|
|
1443
1445
|
var _scale = 1;
|
|
1444
1446
|
var _constants;
|
|
1445
1447
|
|
|
1448
|
+
var _mobileDeceleration;
|
|
1449
|
+
|
|
1446
1450
|
//Current direction (up/down).
|
|
1447
1451
|
var _direction = 'down';
|
|
1448
1452
|
|