mirror
/
turtlestitch
kopia lustrzana https://github.com/backface/turtlestitch
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Morphic: support optional “onBeforeDrop” callback parameter in Morph.slideBackTo()

pull/29/head
jmoenig 2016-11-22 14:22:34 +01:00
rodzic f37977f320
commit 4f3d282d95
1 zmienionych plików z 3 dodań i 2 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

5
morphic.js
Wyświetl plik

@ -1103,7 +1103,7 @@
/*global window, HTMLCanvasElement, FileReader, Audio, FileList*/ /*global window, HTMLCanvasElement, FileReader, Audio, FileList*/
var morphicVersion = '2016-October-27'; var morphicVersion = '2016-November-22';
var modules = {}; // keep track of additional loaded modules var modules = {}; // keep track of additional loaded modules
var useBlurredShadows = getBlurredShadowSupport(); // check for Chrome-bug var useBlurredShadows = getBlurredShadowSupport(); // check for Chrome-bug
@ -3605,7 +3605,7 @@ Morph.prototype.situation = function () {
return null; return null;
}; };
Morph.prototype.slideBackTo = function (situation, inSteps) { Morph.prototype.slideBackTo = function (situation, inSteps, onBeforeDrop) {
var steps = inSteps || 5, var steps = inSteps || 5,
pos = situation.origin.position().add(situation.position), pos = situation.origin.position().add(situation.position),
xStep = -(this.left() - pos.x) / steps, xStep = -(this.left() - pos.x) / steps,
@ -3621,6 +3621,7 @@ Morph.prototype.slideBackTo = function (situation, inSteps) {
stepCount += 1; stepCount += 1;
if (stepCount === steps) { if (stepCount === steps) {
situation.origin.add(myself); situation.origin.add(myself);
if (onBeforeDrop) {onBeforeDrop(); }
if (situation.origin.reactToDropOf) { if (situation.origin.reactToDropOf) {
situation.origin.reactToDropOf(myself); situation.origin.reactToDropOf(myself);
} }