Skip to content

Commit 5427ea5

Browse files
committed
Initial works with listen now
1 parent 9371f4c commit 5427ea5

File tree

7 files changed

+18
-22
lines changed

7 files changed

+18
-22
lines changed

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "anim8js-scrollmagic",
3-
"version": "1.0.1",
3+
"version": "1.0.2",
44
"homepage": "http://anim8js.github.io/anim8js-scrollmagic",
55
"authors": [
66
"Philip Diffenderfer <pdiffenderfer@gmail.com>"

build/anim8js-scrollmagic.js

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* anim8js-scrollmagic 1.0.1 - anim8 ScrollMagic by Philip Diffenderfer */
1+
/* anim8js-scrollmagic 1.0.2 - anim8 ScrollMagic by Philip Diffenderfer */
22
// UMD (Universal Module Definition)
33
(function (root, factory)
44
{
@@ -38,7 +38,7 @@ var Events = {
3838
DURING: 'DURING',
3939
AFTER: 'AFTER',
4040
ANY: '*',
41-
INITIAL: null
41+
INITIAL: ''
4242
};
4343

4444
Scene.setBackwards = function(backwards)
@@ -65,14 +65,12 @@ Scene.isEventMatch = function(actual, expected)
6565
case Events.ANY:
6666
return true;
6767
case Events.BEFORE:
68-
expected = this.getBefore();
69-
break;
68+
return actual === this.getBefore();
7069
case Events.AFTER:
71-
expected = this.getAfter();
72-
break;
70+
return actual === this.getAfter();
71+
default:
72+
return actual === expected;
7373
}
74-
75-
return actual == expected; // jshint ignore:line
7674
};
7775

7876
Scene.onProgress = function(callback)
@@ -121,7 +119,7 @@ Scene.getInvokeCallback = function(callback)
121119
Scene.transition = function(expectedPrevious, expectedCurrent, getCalls)
122120
{
123121
var builder = new CallEventBuilder(getCalls);
124-
var previous = null;
122+
var previous = Events.INITIAL;
125123
var listener = expectedPrevious === Events.INITIAL ? 'onStart' : 'onProgress';
126124

127125
return this[ listener ](function(current, progress)

build/anim8js-scrollmagic.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)