Merge pull request #2913 from AnalyticalGraphicsInc/fixTiltOnFirefoxMac

Also bind tilt to ctrl-right-drag.
CesiumGS · Aug 2, 2015 · d9b43e8 · d9b43e8
2 parents 994a272 + c6a4417
commit d9b43e8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/CHANGES.md b/CHANGES.md
@@ -12,6 +12,7 @@ Change Log
 * Added ArcGIS token-based authentication support to `ArcGisMapServerImageryProvider`.
 * `ArcGisMapServerImageryProvider` now supports a proxy for `pickFeatures` requests.
 * Added `MapboxImageryProvider` to load imagery from [Mapbox](https://www.mapbox.com).
+* The default `CTRL + Left Click Drag` mouse behavior is now duplicated for `CTRL + Right Click Drag` for better compatibility with Firefox on Mac OS [#2872](https://github.com/AnalyticalGraphicsInc/cesium/pull/2913).
 * Fixed incorrect texture coordinates for `WallGeometry` [#2872](https://github.com/AnalyticalGraphicsInc/cesium/issues/2872)
 * Fixed `WallGeometry` bug that caused walls covering a short distance not to render. [#2897](https://github.com/AnalyticalGraphicsInc/cesium/issues/2897)
 * Fixed `PolygonGeometry` clockwise winding order bug. 

diff --git a/Source/Scene/ScreenSpaceCameraController.js b/Source/Scene/ScreenSpaceCameraController.js
@@ -206,11 +206,17 @@ define([
          * @default [{@link CameraEventType.MIDDLE_DRAG}, {@link CameraEventType.PINCH}, {
          *     eventType : {@link CameraEventType.LEFT_DRAG},
          *     modifier : {@link KeyboardEventModifier.CTRL}
+         * }, {
+         *     eventType : {@link CameraEventType.RIGHT_DRAG},
+         *     modifier : {@link KeyboardEventModifier.CTRL}
          * }]
          */
         this.tiltEventTypes = [CameraEventType.MIDDLE_DRAG, CameraEventType.PINCH, {
             eventType : CameraEventType.LEFT_DRAG,
             modifier : KeyboardEventModifier.CTRL
+        }, {
+            eventType : CameraEventType.RIGHT_DRAG,
+            modifier : KeyboardEventModifier.CTRL
         }];
         /**
          * The input that allows the user to change the direction the camera is viewing. This only applies in 3D and Columbus view modes.

diff --git a/Source/Widgets/NavigationHelpButton/NavigationHelpButton.js b/Source/Widgets/NavigationHelpButton/NavigationHelpButton.js
@@ -130,7 +130,7 @@ cesiumSvgPath: { path: _svgPath, width: 32, height: 32 }');
                     <td>\
                         <div class="cesium-navigation-help-rotate">Rotate view</div>\
                         <div class="cesium-navigation-help-details">Middle click + drag, or</div>\
-                        <div class="cesium-navigation-help-details">CTRL + Left click + drag</div>\
+                        <div class="cesium-navigation-help-details">CTRL + Left/Right click + drag</div>\
                     </td>\
                 </tr>\
             </table>';