Skip to content

Commit dc402ca

Browse files
committed
bugfix: updatePinState was called before scrolloffset update
fixes janpaepke#303
1 parent 0561e0b commit dc402ca

File tree

2 files changed

+18
-17
lines changed

2 files changed

+18
-17
lines changed

dev/src/ScrollMagic/Scene.js

+2-17
Original file line numberDiff line numberDiff line change
@@ -86,31 +86,16 @@ ScrollMagic.Scene = function (options) {
8686
}
8787
// validate all options
8888
validateOption();
89-
// set event listeners
90-
Scene
91-
.on("change.internal", function (e) {
92-
if (e.what !== "loglevel" && e.what !== "tweenChanges") { // no need for a scene update scene with these options...
93-
if (e.what === "triggerElement") {
94-
updateTriggerElementPosition();
95-
} else if (e.what === "reverse") { // the only property left that may have an impact on the current scene state. Everything else is handled by the shift event.
96-
Scene.update();
97-
}
98-
}
99-
})
100-
.on("shift.internal", function (e) {
101-
updateScrollOffset();
102-
Scene.update(); // update scene to reflect new position
103-
});
10489
};
90+
91+
// @include('Scene/event-management.js')
10592

10693
// @include('Scene/core.js')
10794

10895
// @include('Scene/update-params.js')
10996

11097
// @include('Scene/getters-setters.js')
11198

112-
// @include('Scene/event-management.js')
113-
11499
// @include('Scene/feature-pinning.js')
115100

116101
// @include('Scene/feature-classToggles.js')

dev/src/ScrollMagic/Scene/core.js

+16
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
// set event listeners
2+
Scene
3+
.on("change.internal", function (e) {
4+
if (e.what !== "loglevel" && e.what !== "tweenChanges") { // no need for a scene update scene with these options...
5+
if (e.what === "triggerElement") {
6+
updateTriggerElementPosition();
7+
} else if (e.what === "reverse") { // the only property left that may have an impact on the current scene state. Everything else is handled by the shift event.
8+
Scene.update();
9+
}
10+
}
11+
})
12+
.on("shift.internal", function (e) {
13+
updateScrollOffset();
14+
Scene.update(); // update scene to reflect new position
15+
});
16+
117
// (BUILD) - REMOVE IN MINIFY - START
218
/**
319
* Send a debug message to the console.

0 commit comments

Comments
 (0)