Merge pull request #7218 from AnalyticalGraphicsInc/revert-7137

Reverts #7137

Author: Hannah

CHANGES.md

@@ -25,7 +25,6 @@ Change Log
 * Fixed clipping plane crash when adding a plane to an empty collection. [#7168](https://github.com/AnalyticalGraphicsInc/cesium/pull/7168)
 * Fixed texture coordinate calculation for polygon entities with `perPositionHeight` [#7188](https://github.com/AnalyticalGraphicsInc/cesium/pull/7188)
 * Fixed clipping planes on tilesets not taking into account the tileset model matrix. [#7182](https://github.com/AnalyticalGraphicsInc/cesium/pull/7182)
-* Fixed middle mouse button locked glitch [#7137](https://github.com/AnalyticalGraphicsInc/cesium/pull/7137)
 * Fixed an issue where dynamic Entities on terrain would cause a crash in platforms that do not support depth textures such as Internet Explorer [#7103](https://github.com/AnalyticalGraphicsInc/cesium/issues/7103)
 * Fixed an issue that would cause a crash when removing a post process stage. [#7210](https://github.com/AnalyticalGraphicsInc/cesium/issues/7210)
 

CONTRIBUTORS.md

@@ -117,7 +117,6 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for details on how to contribute to Cesiu
    * [Chris Cooper](https://github.com/chris-cooper)
    * [Andrew McDowell](https://github.com/madole)
    * [Tony Luk](https://github.com/impactblue573)
-   * [Daniel Cooper](https://github.com/moodragon46)
 * [GeoFS](https://www.geo-fs.com)
    * [Xavier Tassin](https://github.com/xtassin/)
 

Source/Core/ScreenSpaceEventHandler.js

@@ -176,7 +176,29 @@ define([
         position : new Cartesian2()
     };
 
-    function cancelMouseEvent(screenSpaceEventHandler, screenSpaceEventType, clickScreenSpaceEventType, event) {
+    function handleMouseUp(screenSpaceEventHandler, event) {
+        if (!canProcessMouseEvent(screenSpaceEventHandler)) {
+            return;
+        }
+
+        var button = event.button;
+        screenSpaceEventHandler._buttonDown = undefined;
+
+        var screenSpaceEventType;
+        var clickScreenSpaceEventType;
+        if (button === MouseButton.LEFT) {
+            screenSpaceEventType = ScreenSpaceEventType.LEFT_UP;
+            clickScreenSpaceEventType = ScreenSpaceEventType.LEFT_CLICK;
+        } else if (button === MouseButton.MIDDLE) {
+            screenSpaceEventType = ScreenSpaceEventType.MIDDLE_UP;
+            clickScreenSpaceEventType = ScreenSpaceEventType.MIDDLE_CLICK;
+        } else if (button === MouseButton.RIGHT) {
+            screenSpaceEventType = ScreenSpaceEventType.RIGHT_UP;
+            clickScreenSpaceEventType = ScreenSpaceEventType.RIGHT_CLICK;
+        } else {
+            return;
+        }
+
         var modifier = getModifier(event);
 
         var action = screenSpaceEventHandler.getInputAction(screenSpaceEventType, modifier);
@@ -206,23 +228,6 @@ define([
         }
     }
 
-    function handleMouseUp(screenSpaceEventHandler, event) {
-        if (!canProcessMouseEvent(screenSpaceEventHandler)) {
-            return;
-        }
-
-        var button = event.button;
-        screenSpaceEventHandler._buttonDown = undefined;
-
-        if (button !== MouseButton.LEFT && button !== MouseButton.MIDDLE && button !== MouseButton.RIGHT){
-            return;
-        }
-
-        cancelMouseEvent(screenSpaceEventHandler, ScreenSpaceEventType.LEFT_UP, ScreenSpaceEventType.LEFT_CLICK, event);
-        cancelMouseEvent(screenSpaceEventHandler, ScreenSpaceEventType.MIDDLE_UP, ScreenSpaceEventType.MIDDLE_CLICK, event);
-        cancelMouseEvent(screenSpaceEventHandler, ScreenSpaceEventType.RIGHT_UP, ScreenSpaceEventType.RIGHT_CLICK, event);
-    }
-
     var mouseMoveEvent = {
         startPosition : new Cartesian2(),
         endPosition : new Cartesian2()

Specs/Scene/CameraEventAggregatorSpec.js

@@ -216,28 +216,10 @@ defineSuite([
         expect(handler.anyButtonDown).toEqual(true);
 
         simulateMouseUp(options);
+        expect(handler.anyButtonDown).toEqual(true);
 
         options.button = MouseButtons.LEFT;
         simulateMouseUp(options);
-
-        expect(handler.anyButtonDown).toEqual(false);
-    });
-
-    it('cancels anyButtonDown on any button up', function() {
-        expect(handler.anyButtonDown).toEqual(false);
-
-        var options = {
-            button : MouseButtons.LEFT,
-            clientX : 0,
-            clientY : 0
-        };
-        simulateMouseDown(options);
-
-        options.button = MouseButtons.RIGHT;
-        simulateMouseDown(options);
-
-        simulateMouseUp(options);
-
         expect(handler.anyButtonDown).toEqual(false);
     });