diff --git a/ChartsSpace/TimeMachine.js b/ChartsSpace/TimeMachine.js index ecbc7e56d..032e57669 100644 --- a/ChartsSpace/TimeMachine.js +++ b/ChartsSpace/TimeMachine.js @@ -177,7 +177,7 @@ function newTimeMachine () { return thisObject.container } else { if (purpose === GET_CONTAINER_PURPOSE.MOUSE_OVER) { - thisObject.container.eventHandler.raiseEvent('onMouseNotOverMe') + thisObject.container.eventHandler.raiseEvent('onMouseNotOver') if (thisObject.timeScale !== undefined) { thisObject.timeScale.visible = false } diff --git a/Scales/RateScale.js b/Scales/RateScale.js index 9de0f83c7..eb83d9d01 100644 --- a/Scales/RateScale.js +++ b/Scales/RateScale.js @@ -65,6 +65,7 @@ function newRateScale () { } function onMouseOver () { + thisObject.visible = true isMouseOver = true } diff --git a/Scales/TimeFrameScale.js b/Scales/TimeFrameScale.js index 130056f07..f9442c203 100644 --- a/Scales/TimeFrameScale.js +++ b/Scales/TimeFrameScale.js @@ -25,6 +25,7 @@ function newTimeFrameScale () { let onMouseWheelEventSubscriptionId let onZoomChangedEventSubscriptionId + let onMouseOverEventSubscriptionId setupContainer() return thisObject @@ -36,6 +37,7 @@ function newTimeFrameScale () { thisObject.container.isDraggeable = false thisObject.container.isClickeable = false thisObject.container.isWheelable = true + thisObject.container.detectMouseOver = true thisObject.container.frame.width = 190 thisObject.container.frame.height = 25 @@ -44,6 +46,7 @@ function newTimeFrameScale () { function finalize () { thisObject.container.eventHandler.stopListening(onMouseWheelEventSubscriptionId) viewPort.eventHandler.stopListening(onZoomChangedEventSubscriptionId) + thisObject.container.eventHandler.stopListening(onMouseOverEventSubscriptionId) objectStorage = undefined @@ -53,12 +56,16 @@ function newTimeFrameScale () { } function initialize () { - onMouseWheelEventSubscriptionId = thisObject.container.eventHandler.listenToEvent('onMouseWheel', onMouseWheel) - readObjectState() newTimeFrame() + onMouseWheelEventSubscriptionId = thisObject.container.eventHandler.listenToEvent('onMouseWheel', onMouseWheel) onZoomChangedEventSubscriptionId = viewPort.eventHandler.listenToEvent('Zoom Changed', onZoomChanged) + onMouseOverEventSubscriptionId = thisObject.container.eventHandler.listenToEvent('onMouseOver', onMouseOver) + + function onMouseOver () { + thisObject.visible = true + } } function physics () { diff --git a/Scales/TimeScale.js b/Scales/TimeScale.js index eea2a89f3..f70cbcbe9 100644 --- a/Scales/TimeScale.js +++ b/Scales/TimeScale.js @@ -65,6 +65,7 @@ function newTimeScale () { } function onMouseOver () { + thisObject.visible = true isMouseOver = true } @@ -216,4 +217,3 @@ function newTimeScale () { drawScaleDisplay(label1, label2, 10, 60, thisObject.container, thisObject.fitFunction) } } -