updated gulp and bower files
This commit is contained in:
@@ -25,15 +25,14 @@
|
||||
"test",
|
||||
"tests"
|
||||
],
|
||||
"version": "0.6.29",
|
||||
"_release": "0.6.29",
|
||||
"version": "0.6.30",
|
||||
"_release": "0.6.30",
|
||||
"_resolution": {
|
||||
"type": "version",
|
||||
"tag": "0.6.29",
|
||||
"commit": "1da1627e80ffb5c569880e4c77845e116905cf9f"
|
||||
"tag": "0.6.30",
|
||||
"commit": "fec63e8b67bc59a1b33c4b5dc234050fc4b530f4"
|
||||
},
|
||||
"_source": "git://github.com/Prinzhorn/skrollr.git",
|
||||
"_source": "https://github.com/Prinzhorn/skrollr.git",
|
||||
"_target": "~0.6.29",
|
||||
"_originalSource": "skrollr",
|
||||
"_direct": true
|
||||
"_originalSource": "skrollr"
|
||||
}
|
@@ -1,3 +1,9 @@
|
||||
0.6.30 (2015-06-19)
|
||||
-------------------
|
||||
|
||||
* Respect result of beforerender callback on mobile (#717)
|
||||
* Allow for a duration of 0 when scrolling (#720)
|
||||
|
||||
0.6.29 (2014-11-17)
|
||||
-------------------
|
||||
|
||||
|
@@ -1,6 +1,6 @@
|
||||
[](http://travis-ci.org/Prinzhorn/skrollr)
|
||||
|
||||
skrollr 0.6.29
|
||||
skrollr 0.6.30
|
||||
==============
|
||||
|
||||
Stand-alone **parallax scrolling** JavaScript library for **mobile (Android, iOS, etc.) and desktop** in about 12k minified.
|
||||
@@ -534,6 +534,20 @@ skrollr ships with some built in functions:
|
||||
* outCubic
|
||||
* bounce: Bounces like a ball. See https://www.desmos.com/calculator/tbr20s8vd2 for a graphical representation.
|
||||
|
||||
**Custom easing**
|
||||
|
||||
* Use [this](http://www.timotheegroleau.com/Flash/experiments/easing_function_generator.htm) generator
|
||||
* Insert the given polynomial coeficients instead of t, t2, t3, t4 and t5
|
||||
```
|
||||
t5*(p*p*p*p*p) + t4*(p*p*p*p) + t3*(p*p*p) + t2*(p*p) + t*p
|
||||
```
|
||||
Example shown with the values for easeOutElasticBig
|
||||
```
|
||||
easeOutElasticBig: function(p) {
|
||||
return 56*(p*p*p*p*p) - 175*(p*p*p*p) + 200*(p*p*p) - 100*(p*p) + 20*p;
|
||||
}
|
||||
```
|
||||
|
||||
skrollr.get()
|
||||
-----
|
||||
|
||||
|
File diff suppressed because one or more lines are too long
@@ -2,7 +2,7 @@
|
||||
"name": "skrollr",
|
||||
"title": "skrollr",
|
||||
"description": "Stand-alone parallax scrolling library with zero dependencies.",
|
||||
"version": "0.6.29",
|
||||
"version": "0.6.30",
|
||||
"homepage": "https://github.com/Prinzhorn/skrollr",
|
||||
"author": {
|
||||
"name": "Alexander Prinzhorn",
|
||||
|
@@ -563,15 +563,16 @@
|
||||
|
||||
var now = _now();
|
||||
var scrollTop = _instance.getScrollTop();
|
||||
var duration = options.duration === undefined ? DEFAULT_DURATION : options.duration;
|
||||
|
||||
//Setting this to a new value will automatically cause the current animation to stop, if any.
|
||||
_scrollAnimation = {
|
||||
startTop: scrollTop,
|
||||
topDiff: top - scrollTop,
|
||||
targetTop: top,
|
||||
duration: options.duration || DEFAULT_DURATION,
|
||||
duration: duration,
|
||||
startTime: now,
|
||||
endTime: now + (options.duration || DEFAULT_DURATION),
|
||||
endTime: now + duration,
|
||||
easing: easings[options.easing || DEFAULT_EASING],
|
||||
done: options.done
|
||||
};
|
||||
@@ -1113,12 +1114,6 @@
|
||||
}
|
||||
}
|
||||
|
||||
//That's were we actually "scroll" on mobile.
|
||||
if(_isMobile && _skrollrBody) {
|
||||
//Set the transform ("scroll it").
|
||||
skrollr.setStyle(_skrollrBody, 'transform', 'translate(0, ' + -(_mobileOffset) + 'px) ' + _translateZ);
|
||||
}
|
||||
|
||||
//Did the scroll position even change?
|
||||
if(_forceRender || _lastTop !== renderTop) {
|
||||
//Remember in which direction are we scrolling?
|
||||
@@ -1141,6 +1136,12 @@
|
||||
//Now actually interpolate all the styles.
|
||||
_calcSteps(renderTop, _instance.getScrollTop());
|
||||
|
||||
//That's were we actually "scroll" on mobile.
|
||||
if(_isMobile && _skrollrBody) {
|
||||
//Set the transform ("scroll it").
|
||||
skrollr.setStyle(_skrollrBody, 'transform', 'translate(0, ' + -(_mobileOffset) + 'px) ' + _translateZ);
|
||||
}
|
||||
|
||||
//Remember when we last rendered.
|
||||
_lastTop = renderTop;
|
||||
|
||||
|
Reference in New Issue
Block a user