diff --git a/CHANGES.md b/CHANGES.md index 0526574ca4e9..0cad6b2bb327 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -10,6 +10,7 @@ Change Log * `ArcGisImageServerTerrainProvider` will be removed in 1.32 due to missing TIFF support in web browsers. * Breaking changes * Corrected spelling of `Color.FUCHSIA` from `Color.FUSCHIA`. [#4977](https://github.com/AnalyticalGraphicsInc/cesium/pull/4977) + * The enums `MIDDLE_DOUBLE_CLICK` and `RIGHT_DOUBLE_CLICK` from `ScreenSpaceEventType` have been removed. [#5052](https://github.com/AnalyticalGraphicsInc/cesium/pull/5052) * Added support to `DebugCameraPrimitive` to draw multifrustum planes. The attribute `debugShowFrustumPlanes` of `Scene` and `frustumPlanes` of `CesiumInspector` toggles this. `FrameState` has been augmented to include `frustumSplits` which is a `Number[]` of the near/far planes of the camera frustums. * Enable rendering `GroundPrimitives` on hardware without the `EXT_frag_depth` extension; however, this could cause artifacts for certain viewing angles. * Always outline KML line extrusions so that they show up properly in 2D and other straight down views. diff --git a/Source/Core/ScreenSpaceEventHandler.js b/Source/Core/ScreenSpaceEventHandler.js index a22670eb7688..ba63e2e20f02 100644 --- a/Source/Core/ScreenSpaceEventHandler.js +++ b/Source/Core/ScreenSpaceEventHandler.js @@ -4,7 +4,6 @@ define([ './Cartesian2', './defaultValue', './defined', - './deprecationWarning', './destroyObject', './DeveloperError', './FeatureDetection', @@ -16,7 +15,6 @@ define([ Cartesian2, defaultValue, defined, - deprecationWarning, destroyObject, DeveloperError, FeatureDetection, @@ -272,10 +270,6 @@ define([ var screenSpaceEventType; if (button === MouseButton.LEFT) { screenSpaceEventType = ScreenSpaceEventType.LEFT_DOUBLE_CLICK; - } else if (button === MouseButton.MIDDLE) { - screenSpaceEventType = ScreenSpaceEventType.MIDDLE_DOUBLE_CLICK; - } else if (button === MouseButton.RIGHT) { - screenSpaceEventType = ScreenSpaceEventType.RIGHT_DOUBLE_CLICK; } else { return; } @@ -686,14 +680,6 @@ define([ registerListeners(this); } - function checkForDoubleClick(type) { - if (type === ScreenSpaceEventType.MIDDLE_DOUBLE_CLICK) { - deprecationWarning('MIDDLE_DOUBLE_CLICK', 'ScreenSpaceEventType.MIDDLE_DOUBLE_CLICK was deprecated in Cesium 1.30. It will be removed in 1.31.'); - } else if (type === ScreenSpaceEventType.RIGHT_DOUBLE_CLICK) { - deprecationWarning('RIGHT_DOUBLE_CLICK', 'ScreenSpaceEventType.RIGHT_DOUBLE_CLICK was deprecated in Cesium 1.30. It will be removed in 1.31.'); - } - } - /** * Set a function to be executed on an input event. * @@ -715,8 +701,6 @@ define([ } //>>includeEnd('debug'); - checkForDoubleClick(type); - var key = getInputEventKey(type, modifier); this._inputEvents[key] = action; }; @@ -738,8 +722,6 @@ define([ } //>>includeEnd('debug'); - checkForDoubleClick(type); - var key = getInputEventKey(type, modifier); return this._inputEvents[key]; }; @@ -761,8 +743,6 @@ define([ } //>>includeEnd('debug'); - checkForDoubleClick(type); - var key = getInputEventKey(type, modifier); delete this._inputEvents[key]; }; diff --git a/Source/Core/ScreenSpaceEventType.js b/Source/Core/ScreenSpaceEventType.js index 9cc2428da497..3c4388123f91 100644 --- a/Source/Core/ScreenSpaceEventType.js +++ b/Source/Core/ScreenSpaceEventType.js @@ -67,16 +67,6 @@ define([ */ RIGHT_CLICK : 7, - /** - * Represents a mouse right double click event. - * - * @type {Number} - * @constant - * - * @deprecated - */ - RIGHT_DOUBLE_CLICK : 8, - /** * Represents a mouse middle button down event. * @@ -101,16 +91,6 @@ define([ */ MIDDLE_CLICK : 12, - /** - * Represents a mouse middle double click event. - * - * @type {Number} - * @constant - * - * @deprecated - */ - MIDDLE_DOUBLE_CLICK : 13, - /** * Represents a mouse move event. * diff --git a/Specs/Core/ScreenSpaceEventHandlerSpec.js b/Specs/Core/ScreenSpaceEventHandlerSpec.js index 3ec9a6dba305..440a0f0f2104 100644 --- a/Specs/Core/ScreenSpaceEventHandlerSpec.js +++ b/Specs/Core/ScreenSpaceEventHandlerSpec.js @@ -387,9 +387,9 @@ defineSuite([ expect(action).not.toHaveBeenCalled(); } - var possibleButtons = [MouseButton.LEFT, MouseButton.MIDDLE, MouseButton.RIGHT]; + var possibleButtons = [MouseButton.LEFT]; var possibleModifiers = [undefined, KeyboardEventModifier.SHIFT, KeyboardEventModifier.CTRL, KeyboardEventModifier.ALT]; - var possibleEventTypes = [ScreenSpaceEventType.LEFT_DOUBLE_CLICK, ScreenSpaceEventType.MIDDLE_DOUBLE_CLICK, ScreenSpaceEventType.RIGHT_DOUBLE_CLICK]; + var possibleEventTypes = [ScreenSpaceEventType.LEFT_DOUBLE_CLICK]; createAllMouseSpecCombinations(testMouseDoubleClickEvent, possibleButtons, possibleModifiers, possibleEventTypes); });