diff --git a/src/components/stop-event-propagation.js b/src/components/stop-event-propagation.js index b12be3fa99da119e4e548ae77e9b5f991f6825ac..a4ed7a311b239ee750fd1ae8b70771922e75b983 100644 --- a/src/components/stop-event-propagation.js +++ b/src/components/stop-event-propagation.js @@ -1,6 +1,5 @@ const handler = e => { e.stopPropagation(); - e.preventDefault(); }; AFRAME.registerComponent("stop-event-propagation", { diff --git a/src/hub.html b/src/hub.html index d8a95dee96caa125622ec5b66a31f4d8182c4cfc..4e71703ce38f7fc8229105f1484922433dd30809 100644 --- a/src/hub.html +++ b/src/hub.html @@ -191,7 +191,7 @@ > <a-entity class="ui interactable-ui" stop-event-propagation__grab-start="event: grab-start" stop-event-propagation__grab-end="event: grab-end"> <a-entity class="freeze-menu" visible-while-frozen="withinDistance: 10;"> - <a-entity mixin="rounded-text-action-button" pin-networked-object-button="labelSelector:.pin-button-label; hideWhenPinnedSelector:.hide-when-pinned; uiSelector:.interactable-ui" position="0 0.125 0.01"> </a-entity> + <a-entity mixin="rounded-text-action-button" pin-networked-object-button="labelSelector:.pin-button-label; hideWhenPinnedSelector:.hide-when-pinned;" position="0 0.125 0.01"> </a-entity> <a-entity class="pin-button-label" text=" value:pin; width:1.75; align:center;" text-raycast-hack position="0 0.125 0.02"></a-entity> <a-entity mixin="rounded-text-button" class="hide-when-pinned" remove-networked-object-button position="0 -0.125 0.01"> </a-entity> <a-entity text=" value:remove; width:1.75; align:center;" class="hide-when-pinned" text-raycast-hack position="0 -0.125 0.02"></a-entity> diff --git a/src/systems/userinput/bindings/oculus-touch-user.js b/src/systems/userinput/bindings/oculus-touch-user.js index b2dd9566484733c9fb4537e539ae68098d1796df..9fb929fbcd524aa086371d57d91792d93ff94066 100644 --- a/src/systems/userinput/bindings/oculus-touch-user.js +++ b/src/systems/userinput/bindings/oculus-touch-user.js @@ -492,7 +492,7 @@ export const oculusTouchUserBindings = addSetsToBindings({ { src: { value: rightTriggerPressed2 }, dest: { value: paths.actions.cursor.grab }, - xform: xforms.falling, + xform: xforms.rising, priority: 2 } ],