archive-gh-me/mapillary-js
1
0
Fork 0
mirror of https://github.com/mapillary/mapillary-js.git synced 2026-01-25 14:07:28 +00:00
Code Issues Projects Releases Wiki Activity

Check state in slider component before changing.

Browse Source
This commit is contained in:
Oscar Lorentzon 2016-03-02 14:36:37 +01:00
parent 0fe2b01603
commit 28ef13fddd
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/component/imageplane/SliderComponent.ts
View File

@ -4,7 +4,7 @@ import * as THREE from "three";
import * as rx from "rx";
import {Node} from "../../Graph";
import {ICurrentState, IFrame} from "../../State";
import {ICurrentState, IFrame, State} from "../../State";
import {Container, Navigator} from "../../Viewer";
import {IGLRenderHash, GLRenderStage} from "../../Render";
import {Component, ComponentService, ImagePlaneScene, ImagePlaneFactory} from "../../Component";
@ -194,7 +194,9 @@ export class SliderComponent extends Component {
}
protected _activate(): void {
this._navigator.stateService.wait();
if (this._navigator.stateService.state === State.Traversing) {
this._navigator.stateService.wait();
}
this._stateSubscription = this._navigator.stateService.currentState$
.map<ISliderStateOperation>(
@ -243,7 +245,9 @@ export class SliderComponent extends Component {
}
protected _deactivate(): void {
this._navigator.stateService.traverse();
if (this._navigator.stateService.state === State.Waiting) {
this._navigator.stateService.traverse();
}
this._stateSubscription.dispose();
this._mouseMoveSubscription.dispose();