greensock-rails 1.11.7.0 → 1.11.8.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/greensock/rails/version.rb +1 -1
- data/vendor/assets/javascripts/greensock/TimelineLite.js +3 -3
- data/vendor/assets/javascripts/greensock/TimelineMax.js +5 -5
- data/vendor/assets/javascripts/greensock/TweenLite.js +4 -4
- data/vendor/assets/javascripts/greensock/TweenMax.js +22 -18
- data/vendor/assets/javascripts/greensock/plugins/AttrPlugin.js +13 -8
- data/vendor/assets/javascripts/greensock/plugins/CSSPlugin.js +4 -4
- data/vendor/assets/javascripts/greensock/utils/Draggable.js +26 -12
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 38c5524257822c2084f9ad2e2efe907a19945f30
|
4
|
+
data.tar.gz: 777b1fb10821016774770ae0589aca84a661a8ad
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: acbfb96c8bacdfb9f06f1801b1f7573ce976db532d3e6e74020f17414f51a1c12e53d5e68ada7887fd0bd9a053d1f65b61cb522f21ca03754ce10cedcd6c859e
|
7
|
+
data.tar.gz: 5e8aa4d4d15ffabc5a83d9cd7470279f33a10a6c46c09cb7d3dc2aea270ab757732d0469b6cf664565df81d92de50a6caee528c1ad62a85b7d6811366121411b
|
@@ -1,6 +1,6 @@
|
|
1
1
|
/*!
|
2
|
-
* VERSION: 1.11.
|
3
|
-
* DATE: 2014-
|
2
|
+
* VERSION: 1.11.8
|
3
|
+
* DATE: 2014-05-13
|
4
4
|
* UPDATES AND DOCS AT: http://www.greensock.com
|
5
5
|
*
|
6
6
|
* @license Copyright (c) 2008-2014, GreenSock. All rights reserved.
|
@@ -56,7 +56,7 @@
|
|
56
56
|
_slice = _blankArray.slice,
|
57
57
|
p = TimelineLite.prototype = new SimpleTimeline();
|
58
58
|
|
59
|
-
TimelineLite.version = "1.11.
|
59
|
+
TimelineLite.version = "1.11.8";
|
60
60
|
p.constructor = TimelineLite;
|
61
61
|
p.kill()._gc = false;
|
62
62
|
|
@@ -1,6 +1,6 @@
|
|
1
1
|
/*!
|
2
|
-
* VERSION: 1.11.
|
3
|
-
* DATE: 2014-
|
2
|
+
* VERSION: 1.11.8
|
3
|
+
* DATE: 2014-05-13
|
4
4
|
* UPDATES AND DOCS AT: http://www.greensock.com
|
5
5
|
*
|
6
6
|
* @license Copyright (c) 2008-2014, GreenSock. All rights reserved.
|
@@ -31,7 +31,7 @@
|
|
31
31
|
|
32
32
|
p.constructor = TimelineMax;
|
33
33
|
p.kill()._gc = false;
|
34
|
-
TimelineMax.version = "1.11.
|
34
|
+
TimelineMax.version = "1.11.8";
|
35
35
|
|
36
36
|
p.invalidate = function() {
|
37
37
|
this._yoyo = (this.vars.yoyo === true);
|
@@ -65,7 +65,7 @@
|
|
65
65
|
|
66
66
|
p.tweenTo = function(position, vars) {
|
67
67
|
vars = vars || {};
|
68
|
-
var copy = {ease:_easeNone, overwrite:2, useFrames:this.usesFrames(), immediateRender:false},
|
68
|
+
var copy = {ease:_easeNone, overwrite:(vars.delay ? 2 : 1), useFrames:this.usesFrames(), immediateRender:false},//note: set overwrite to 1 (true/all) by default unless there's a delay so that we avoid a racing situation that could happen if, for example, an onmousemove creates the same tweenTo() over and over again.
|
69
69
|
duration, p, t;
|
70
70
|
for (p in vars) {
|
71
71
|
copy[p] = vars[p];
|
@@ -495,7 +495,7 @@
|
|
495
495
|
_slice = _blankArray.slice,
|
496
496
|
p = TimelineLite.prototype = new SimpleTimeline();
|
497
497
|
|
498
|
-
TimelineLite.version = "1.11.
|
498
|
+
TimelineLite.version = "1.11.8";
|
499
499
|
p.constructor = TimelineLite;
|
500
500
|
p.kill()._gc = false;
|
501
501
|
|
@@ -1,6 +1,6 @@
|
|
1
1
|
/*!
|
2
|
-
* VERSION: 1.11.
|
3
|
-
* DATE: 2014-
|
2
|
+
* VERSION: 1.11.8
|
3
|
+
* DATE: 2014-05-13
|
4
4
|
* UPDATES AND DOCS AT: http://www.greensock.com
|
5
5
|
*
|
6
6
|
* @license Copyright (c) 2008-2014, GreenSock. All rights reserved.
|
@@ -872,7 +872,7 @@
|
|
872
872
|
p._firstPT = p._targets = p._overwrittenProps = p._startAt = null;
|
873
873
|
p._notifyPluginsOfEnabled = false;
|
874
874
|
|
875
|
-
TweenLite.version = "1.11.
|
875
|
+
TweenLite.version = "1.11.8";
|
876
876
|
TweenLite.defaultEase = p._ease = new Ease(null, null, 1, 1);
|
877
877
|
TweenLite.defaultOverwrite = "auto";
|
878
878
|
TweenLite.ticker = _ticker;
|
@@ -1096,7 +1096,7 @@
|
|
1096
1096
|
};
|
1097
1097
|
|
1098
1098
|
p._initProps = function(target, propLookup, siblings, overwrittenProps) {
|
1099
|
-
var p, i, initPlugins, plugin,
|
1099
|
+
var p, i, initPlugins, plugin, pt, v;
|
1100
1100
|
if (target == null) {
|
1101
1101
|
return false;
|
1102
1102
|
}
|
@@ -1,6 +1,6 @@
|
|
1
1
|
/*!
|
2
|
-
* VERSION: 1.11.
|
3
|
-
* DATE: 2014-
|
2
|
+
* VERSION: 1.11.8
|
3
|
+
* DATE: 2014-05-13
|
4
4
|
* UPDATES AND DOCS AT: http://www.greensock.com
|
5
5
|
*
|
6
6
|
* Includes all of the following: TweenLite, TweenMax, TimelineLite, TimelineMax, EasePack, CSSPlugin, RoundPropsPlugin, BezierPlugin, AttrPlugin, DirectionalRotationPlugin
|
@@ -34,7 +34,7 @@
|
|
34
34
|
p = TweenMax.prototype = TweenLite.to({}, 0.1, {}),
|
35
35
|
_blankArray = [];
|
36
36
|
|
37
|
-
TweenMax.version = "1.11.
|
37
|
+
TweenMax.version = "1.11.8";
|
38
38
|
p.constructor = TweenMax;
|
39
39
|
p.kill()._gc = false;
|
40
40
|
TweenMax.killTweensOf = TweenMax.killDelayedCallsTo = TweenLite.killTweensOf;
|
@@ -611,7 +611,7 @@
|
|
611
611
|
_slice = _blankArray.slice,
|
612
612
|
p = TimelineLite.prototype = new SimpleTimeline();
|
613
613
|
|
614
|
-
TimelineLite.version = "1.11.
|
614
|
+
TimelineLite.version = "1.11.8";
|
615
615
|
p.constructor = TimelineLite;
|
616
616
|
p.kill()._gc = false;
|
617
617
|
|
@@ -1210,7 +1210,7 @@
|
|
1210
1210
|
|
1211
1211
|
p.constructor = TimelineMax;
|
1212
1212
|
p.kill()._gc = false;
|
1213
|
-
TimelineMax.version = "1.11.
|
1213
|
+
TimelineMax.version = "1.11.8";
|
1214
1214
|
|
1215
1215
|
p.invalidate = function() {
|
1216
1216
|
this._yoyo = (this.vars.yoyo === true);
|
@@ -1244,7 +1244,7 @@
|
|
1244
1244
|
|
1245
1245
|
p.tweenTo = function(position, vars) {
|
1246
1246
|
vars = vars || {};
|
1247
|
-
var copy = {ease:_easeNone, overwrite:2, useFrames:this.usesFrames(), immediateRender:false},
|
1247
|
+
var copy = {ease:_easeNone, overwrite:(vars.delay ? 2 : 1), useFrames:this.usesFrames(), immediateRender:false},//note: set overwrite to 1 (true/all) by default unless there's a delay so that we avoid a racing situation that could happen if, for example, an onmousemove creates the same tweenTo() over and over again.
|
1248
1248
|
duration, p, t;
|
1249
1249
|
for (p in vars) {
|
1250
1250
|
copy[p] = vars[p];
|
@@ -2238,7 +2238,7 @@
|
|
2238
2238
|
p = CSSPlugin.prototype = new TweenPlugin("css");
|
2239
2239
|
|
2240
2240
|
p.constructor = CSSPlugin;
|
2241
|
-
CSSPlugin.version = "1.11.
|
2241
|
+
CSSPlugin.version = "1.11.8";
|
2242
2242
|
CSSPlugin.API = 2;
|
2243
2243
|
CSSPlugin.defaultTransformPerspective = 0;
|
2244
2244
|
CSSPlugin.defaultSkewType = "compensated";
|
@@ -3256,7 +3256,7 @@
|
|
3256
3256
|
|
3257
3257
|
|
3258
3258
|
//transform-related methods and properties
|
3259
|
-
var _transformProps = ("scaleX,scaleY,scaleZ,x,y,z,skewX,rotation,rotationX,rotationY,perspective").split(","),
|
3259
|
+
var _transformProps = ("scaleX,scaleY,scaleZ,x,y,z,skewX,skewY,rotation,rotationX,rotationY,perspective").split(","),
|
3260
3260
|
_transformProp = _checkPropPrefix("transform"), //the Javascript (camelCase) transform property, like msTransform, WebkitTransform, MozTransform, or OTransform.
|
3261
3261
|
_transformPropCSS = _prefixCSS + "transform",
|
3262
3262
|
_transformOriginProp = _checkPropPrefix("transformOrigin"),
|
@@ -3657,7 +3657,6 @@
|
|
3657
3657
|
};
|
3658
3658
|
|
3659
3659
|
_registerComplexSpecialProp("transform,scale,scaleX,scaleY,scaleZ,x,y,z,rotation,rotationX,rotationY,rotationZ,skewX,skewY,shortRotation,shortRotationX,shortRotationY,shortRotationZ,transformOrigin,transformPerspective,directionalRotation,parseTransform,force3D,skewType", {parser:function(t, e, p, cssp, pt, plugin, vars) {
|
3660
|
-
//TODO: when plugins use this, don't assume we're done with all the transforms. If bezier handles x/y and the user does a separate rotation tween outside of the bezier, this would break it and ignore the rotation part.
|
3661
3660
|
if (cssp._transform) { return pt; } //only need to parse the transform once, and only if the browser supports it.
|
3662
3661
|
var m1 = cssp._transform = _getTransform(t, _cs, true, vars.parseTransform),
|
3663
3662
|
style = t.style,
|
@@ -4584,20 +4583,24 @@
|
|
4584
4583
|
window._gsDefine.plugin({
|
4585
4584
|
propName: "attr",
|
4586
4585
|
API: 2,
|
4587
|
-
version: "0.
|
4586
|
+
version: "0.3.0",
|
4588
4587
|
|
4589
4588
|
//called when the tween renders for the first time. This is where initial values should be recorded and any setup routines should run.
|
4590
4589
|
init: function(target, value, tween) {
|
4591
|
-
var p;
|
4590
|
+
var p, start, end;
|
4592
4591
|
if (typeof(target.setAttribute) !== "function") {
|
4593
4592
|
return false;
|
4594
4593
|
}
|
4595
4594
|
this._target = target;
|
4596
4595
|
this._proxy = {};
|
4596
|
+
this._start = {}; // we record start and end values exactly as they are in case they're strings (not numbers) - we need to be able to revert to them cleanly.
|
4597
|
+
this._end = {};
|
4598
|
+
this._endRatio = tween.vars.runBackwards ? 0 : 1;
|
4597
4599
|
for (p in value) {
|
4598
|
-
|
4599
|
-
|
4600
|
-
|
4600
|
+
this._start[p] = this._proxy[p] = start = target.getAttribute(p);
|
4601
|
+
this._end[p] = end = value[p];
|
4602
|
+
this._addTween(this._proxy, p, parseFloat(start), end, p);
|
4603
|
+
this._overwriteProps.push(p);
|
4601
4604
|
}
|
4602
4605
|
return true;
|
4603
4606
|
},
|
@@ -4607,14 +4610,15 @@
|
|
4607
4610
|
this._super.setRatio.call(this, ratio);
|
4608
4611
|
var props = this._overwriteProps,
|
4609
4612
|
i = props.length,
|
4613
|
+
lookup = (ratio !== 0 && ratio !== 1) ? this._proxy : (ratio === this._endRatio) ? this._end : this._start,
|
4610
4614
|
p;
|
4611
4615
|
while (--i > -1) {
|
4612
4616
|
p = props[i];
|
4613
|
-
this._target.setAttribute(p,
|
4617
|
+
this._target.setAttribute(p, lookup[p] + "");
|
4614
4618
|
}
|
4615
4619
|
}
|
4616
4620
|
|
4617
|
-
})
|
4621
|
+
})
|
4618
4622
|
|
4619
4623
|
|
4620
4624
|
|
@@ -5917,7 +5921,7 @@
|
|
5917
5921
|
p._firstPT = p._targets = p._overwrittenProps = p._startAt = null;
|
5918
5922
|
p._notifyPluginsOfEnabled = false;
|
5919
5923
|
|
5920
|
-
TweenLite.version = "1.11.
|
5924
|
+
TweenLite.version = "1.11.8";
|
5921
5925
|
TweenLite.defaultEase = p._ease = new Ease(null, null, 1, 1);
|
5922
5926
|
TweenLite.defaultOverwrite = "auto";
|
5923
5927
|
TweenLite.ticker = _ticker;
|
@@ -6141,7 +6145,7 @@
|
|
6141
6145
|
};
|
6142
6146
|
|
6143
6147
|
p._initProps = function(target, propLookup, siblings, overwrittenProps) {
|
6144
|
-
var p, i, initPlugins, plugin,
|
6148
|
+
var p, i, initPlugins, plugin, pt, v;
|
6145
6149
|
if (target == null) {
|
6146
6150
|
return false;
|
6147
6151
|
}
|
@@ -1,6 +1,6 @@
|
|
1
1
|
/*!
|
2
|
-
* VERSION: 0.
|
3
|
-
* DATE:
|
2
|
+
* VERSION: 0.3.0
|
3
|
+
* DATE: 2014-05-13
|
4
4
|
* UPDATES AND DOCS AT: http://www.greensock.com
|
5
5
|
*
|
6
6
|
* @license Copyright (c) 2008-2014, GreenSock. All rights reserved.
|
@@ -16,20 +16,24 @@
|
|
16
16
|
window._gsDefine.plugin({
|
17
17
|
propName: "attr",
|
18
18
|
API: 2,
|
19
|
-
version: "0.
|
19
|
+
version: "0.3.0",
|
20
20
|
|
21
21
|
//called when the tween renders for the first time. This is where initial values should be recorded and any setup routines should run.
|
22
22
|
init: function(target, value, tween) {
|
23
|
-
var p;
|
23
|
+
var p, start, end;
|
24
24
|
if (typeof(target.setAttribute) !== "function") {
|
25
25
|
return false;
|
26
26
|
}
|
27
27
|
this._target = target;
|
28
28
|
this._proxy = {};
|
29
|
+
this._start = {}; // we record start and end values exactly as they are in case they're strings (not numbers) - we need to be able to revert to them cleanly.
|
30
|
+
this._end = {};
|
31
|
+
this._endRatio = tween.vars.runBackwards ? 0 : 1;
|
29
32
|
for (p in value) {
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
+
this._start[p] = this._proxy[p] = start = target.getAttribute(p);
|
34
|
+
this._end[p] = end = value[p];
|
35
|
+
this._addTween(this._proxy, p, parseFloat(start), end, p);
|
36
|
+
this._overwriteProps.push(p);
|
33
37
|
}
|
34
38
|
return true;
|
35
39
|
},
|
@@ -39,10 +43,11 @@
|
|
39
43
|
this._super.setRatio.call(this, ratio);
|
40
44
|
var props = this._overwriteProps,
|
41
45
|
i = props.length,
|
46
|
+
lookup = (ratio !== 0 && ratio !== 1) ? this._proxy : (ratio === this._endRatio) ? this._end : this._start,
|
42
47
|
p;
|
43
48
|
while (--i > -1) {
|
44
49
|
p = props[i];
|
45
|
-
this._target.setAttribute(p,
|
50
|
+
this._target.setAttribute(p, lookup[p] + "");
|
46
51
|
}
|
47
52
|
}
|
48
53
|
|
@@ -1,6 +1,6 @@
|
|
1
1
|
/*!
|
2
|
-
* VERSION: 1.11.
|
3
|
-
* DATE: 2014-
|
2
|
+
* VERSION: 1.11.8
|
3
|
+
* DATE: 2014-05-13
|
4
4
|
* UPDATES AND DOCS AT: http://www.greensock.com
|
5
5
|
*
|
6
6
|
* @license Copyright (c) 2008-2014, GreenSock. All rights reserved.
|
@@ -29,7 +29,7 @@
|
|
29
29
|
p = CSSPlugin.prototype = new TweenPlugin("css");
|
30
30
|
|
31
31
|
p.constructor = CSSPlugin;
|
32
|
-
CSSPlugin.version = "1.11.
|
32
|
+
CSSPlugin.version = "1.11.8";
|
33
33
|
CSSPlugin.API = 2;
|
34
34
|
CSSPlugin.defaultTransformPerspective = 0;
|
35
35
|
CSSPlugin.defaultSkewType = "compensated";
|
@@ -1047,7 +1047,7 @@
|
|
1047
1047
|
|
1048
1048
|
|
1049
1049
|
//transform-related methods and properties
|
1050
|
-
var _transformProps = ("scaleX,scaleY,scaleZ,x,y,z,skewX,rotation,rotationX,rotationY,perspective").split(","),
|
1050
|
+
var _transformProps = ("scaleX,scaleY,scaleZ,x,y,z,skewX,skewY,rotation,rotationX,rotationY,perspective").split(","),
|
1051
1051
|
_transformProp = _checkPropPrefix("transform"), //the Javascript (camelCase) transform property, like msTransform, WebkitTransform, MozTransform, or OTransform.
|
1052
1052
|
_transformPropCSS = _prefixCSS + "transform",
|
1053
1053
|
_transformOriginProp = _checkPropPrefix("transformOrigin"),
|
@@ -1,6 +1,6 @@
|
|
1
1
|
/*!
|
2
|
-
* VERSION: 0.10.
|
3
|
-
* DATE: 2014-
|
2
|
+
* VERSION: 0.10.3
|
3
|
+
* DATE: 2014-05-13
|
4
4
|
* UPDATES AND DOCS AT: http://www.greensock.com
|
5
5
|
*
|
6
6
|
* Requires TweenLite and CSSPlugin version 1.11.0 or later (TweenMax contains both TweenLite and CSSPlugin). ThrowPropsPlugin is required for momentum-based continuation of movement after the mouse/touch is released (ThrowPropsPlugin is a membership benefit of Club GreenSock - http://www.greensock.com/club/).
|
@@ -76,6 +76,12 @@
|
|
76
76
|
}
|
77
77
|
return obj;
|
78
78
|
},
|
79
|
+
_getDocScrollTop = function() {
|
80
|
+
return (window.pageYOffset != null) ? window.pageYOffset : (_doc.scrollTop != null) ? _doc.scrollTop : _docElement.scrollTop || _doc.body.scrollTop || 0;
|
81
|
+
},
|
82
|
+
_getDocScrollLeft = function() {
|
83
|
+
return (window.pageXOffset != null) ? window.pageXOffset : (_doc.scrollLeft != null) ? _doc.scrollLeft : _docElement.scrollLeft || _doc.body.scrollLeft || 0;
|
84
|
+
},
|
79
85
|
|
80
86
|
//just used for IE8 and earlier to normalize events and populate pageX/pageY
|
81
87
|
_populateIEEvent = function(e, preventDefault) {
|
@@ -252,12 +258,10 @@
|
|
252
258
|
return decoratee;
|
253
259
|
},
|
254
260
|
_getOffset2DMatrix = function(e, offsetOrigin, parentOffsetOrigin) {
|
255
|
-
var cs, m, parent, offsetParent;
|
261
|
+
var cs, m, parent, offsetParent, isRoot;
|
256
262
|
if (e === window || !e || !e.parentNode) {
|
257
263
|
return [1,0,0,1,0,0];
|
258
264
|
}
|
259
|
-
parent = e.parentNode;
|
260
|
-
offsetParent = e.offsetParent;
|
261
265
|
cs = _getComputedStyle(e);
|
262
266
|
m = cs ? cs.getPropertyValue(_transformCSSProp) : e.currentStyle ? e.currentStyle[_transformProp] : "1,0,0,1,0,0";
|
263
267
|
m = (m + "").match(/(?:\-|\b)[\d\-\.e]+\b/g) || [1,0,0,1,0,0];
|
@@ -265,8 +269,15 @@
|
|
265
269
|
m = [m[0], m[1], m[4], m[5], m[12], m[13]];
|
266
270
|
}
|
267
271
|
if (offsetOrigin) {
|
268
|
-
|
269
|
-
|
272
|
+
parent = e.parentNode;
|
273
|
+
offsetParent = e.offsetParent;
|
274
|
+
isRoot = (parent === _docElement || parent === _doc.body);
|
275
|
+
m[4] = Number(m[4]) + offsetOrigin.x + e.offsetLeft - parentOffsetOrigin.x - (isRoot ? 0 : parent.scrollLeft) + (offsetParent ? parseInt(_getStyle(offsetParent, "borderLeftWidth"), 10) || 0 : 0);
|
276
|
+
m[5] = Number(m[5]) + offsetOrigin.y + e.offsetTop - parentOffsetOrigin.y - (isRoot ? 0 : parent.scrollTop) + (offsetParent ? parseInt(_getStyle(offsetParent, "borderTopWidth"), 10) || 0 : 0);
|
277
|
+
if (!offsetParent && _getStyle(e, "position", cs) === "fixed") { //fixed position elements should factor in the scroll position of the document.
|
278
|
+
m[4] += _getDocScrollLeft();
|
279
|
+
m[5] += _getDocScrollTop();
|
280
|
+
}
|
270
281
|
|
271
282
|
//some browsers (like Chrome 31) have a bug that causes the offsetParent not to report correctly when a transform is applied to an element's parent, so the offsetTop and offsetLeft are measured from the parent instead of whatever the offsetParent reports as. For example, put an absolutely-positioned child div inside a position:static parent, then check the child's offsetTop before and after you apply a transform, like rotate(1deg). You'll see that it changes, but the offsetParent doesn't. So we must sense this condition here (and we can only do it after the body has loaded, as browsers don't accurately report offsets otherwise) and set a variable that we can easily reference later.
|
272
283
|
if (_hasReparentBug === undefined && _doc.body && _transformProp) {
|
@@ -350,8 +361,8 @@
|
|
350
361
|
_getElementBounds = function(e, context) {
|
351
362
|
var origin, left, right, top, bottom, mLocalToGlobal, mGlobalToLocal, p1, p2, p3, p4;
|
352
363
|
if (e === window) {
|
353
|
-
top = (
|
354
|
-
left = (
|
364
|
+
top = _getDocScrollTop();
|
365
|
+
left = _getDocScrollLeft();
|
355
366
|
right = left + (_docElement.clientWidth || e.innerWidth || _doc.body.clientWidth || 0);
|
356
367
|
bottom = top + ((e.innerHeight - 20 < _docElement.clientHeight) ? _docElement.clientHeight : e.innerHeight || _doc.body.clientHeight || 0); //some browsers (like Firefox) ignore absolutely positioned elements, and collapse the height of the documentElement, so it could be 8px, for example, if you have just an absolutely positioned div. In that case, we use the innerHeight to resolve this.
|
357
368
|
} else {
|
@@ -914,7 +925,7 @@
|
|
914
925
|
}
|
915
926
|
}
|
916
927
|
}
|
917
|
-
self.tween = tween = ThrowPropsPlugin.to(scrollProxy || target, {throwProps:throwProps, ease:(vars.ease || Power3.easeOut), onComplete:vars.onThrowComplete, onCompleteParams:vars.onThrowCompleteParams, onCompleteScope:(vars.onThrowCompleteScope || self), onUpdate:(vars.fastMode ? vars.onThrowUpdate : syncXY), onUpdateParams:vars.onThrowUpdateParams, onUpdateScope:(vars.onThrowUpdateScope || self)}, (isNaN(vars.maxDuration) ? 2 : vars.maxDuration), (isNaN(vars.minDuration) ? 0.5 : vars.minDuration), (isNaN(vars.overshootTolerance) ? (1 - self.edgeResistance) + 0.2 : vars.overshootTolerance));
|
928
|
+
self.tween = tween = ThrowPropsPlugin.to(scrollProxy || target, {throwProps:throwProps, ease:(vars.ease || Power3.easeOut), onComplete:vars.onThrowComplete, onCompleteParams:vars.onThrowCompleteParams, onCompleteScope:(vars.onThrowCompleteScope || self), onUpdate:(vars.fastMode ? vars.onThrowUpdate : syncXY), onUpdateParams:(vars.fastMode ? vars.onThrowUpdateParams : null), onUpdateScope:(vars.onThrowUpdateScope || self)}, (isNaN(vars.maxDuration) ? 2 : vars.maxDuration), (isNaN(vars.minDuration) ? 0.5 : vars.minDuration), (isNaN(vars.overshootTolerance) ? (1 - self.edgeResistance) + 0.2 : vars.overshootTolerance));
|
918
929
|
if (!vars.fastMode) {
|
919
930
|
//to populate the end values, we just scrub the tween to the end, record the values, and then jump back to the beginning.
|
920
931
|
if (scrollProxy) {
|
@@ -1066,6 +1077,9 @@
|
|
1066
1077
|
self.tween.kill();
|
1067
1078
|
}
|
1068
1079
|
TweenLite.killTweensOf(scrollProxy || target, true, killProps); //in case the user tries to drag it before the last tween is done.
|
1080
|
+
if (scrollProxy) {
|
1081
|
+
TweenLite.killTweensOf(target, true, {scrollTo:1}); //just in case the original target's scroll position is being tweened somewhere else.
|
1082
|
+
}
|
1069
1083
|
startMouseY = self.pointerY = e.pageY; //record the starting x and y so that we can calculate the movement from the original in _onMouseMove
|
1070
1084
|
startMouseX = self.pointerX = e.pageX;
|
1071
1085
|
recordStartPositions();
|
@@ -1393,7 +1407,6 @@
|
|
1393
1407
|
if (!rotationMode) {
|
1394
1408
|
_setStyle(trigger, "cursor", null);
|
1395
1409
|
}
|
1396
|
-
TweenLite.killTweensOf(scrollProxy || target, true, killProps);
|
1397
1410
|
trigger.ondragstart = trigger.onselectstart = null;
|
1398
1411
|
_setStyle(trigger, "userSelect", "text");
|
1399
1412
|
_setStyle(trigger, "touchCallout", "default");
|
@@ -1423,6 +1436,7 @@
|
|
1423
1436
|
};
|
1424
1437
|
|
1425
1438
|
this.kill = function() {
|
1439
|
+
TweenLite.killTweensOf(scrollProxy || target, true, killProps);
|
1426
1440
|
self.disable();
|
1427
1441
|
delete _lookup[target._gsDragID];
|
1428
1442
|
return self;
|
@@ -1469,7 +1483,7 @@
|
|
1469
1483
|
p.constructor = Draggable;
|
1470
1484
|
p.pointerX = p.pointerY = 0;
|
1471
1485
|
p.isDragging = p.isPressed = false;
|
1472
|
-
Draggable.version = "0.10.
|
1486
|
+
Draggable.version = "0.10.3";
|
1473
1487
|
Draggable.zIndex = 1000;
|
1474
1488
|
|
1475
1489
|
_addListener(_doc, "touchcancel", function() {
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: greensock-rails
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.11.
|
4
|
+
version: 1.11.8.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Robert Pataki, Greensock Team
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2014-05-
|
11
|
+
date: 2014-05-16 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: bundler
|