unnamespace menu.active -> menuActive

This commit is contained in:
Kevin Ngo
2018-10-15 16:44:38 -07:00
parent e6589b304d
commit 455fef5658
4 changed files with 22 additions and 22 deletions

View File

@@ -51,8 +51,8 @@
<a-entity
id="searchPrevPage"
mixin="searchPageButton"
bind-toggle__raycastable="search.hasPrev && menu.active"
raycaster-target="bindToggle: search.hasNext && menu.active; position: 0 0.08 0"
bind-toggle__raycastable="search.hasPrev && menuActive"
raycaster-target="bindToggle: search.hasNext && menuActive; position: 0 0.08 0"
position="-0 0.69 0.01"
proxy-event="event: click; to: a-scene; as: searchprevpage; captureBubbles: true"
bind__visible="search.hasPrev">
@@ -61,7 +61,7 @@
<a-entity
id="searchNextPage"
mixin="searchPageButton"
raycaster-target="bindToggle: search.hasNext && menu.active; position: 0 -0.08 0"
raycaster-target="bindToggle: search.hasNext && menuActive; position: 0 -0.08 0"
position="-0 -0.674 0.01"
proxy-event="event: click; to: a-scene; as: searchnextpage; captureBubbles: true"
bind__visible="search.hasNext">
@@ -84,7 +84,7 @@
bind-item__animation__mouseentervisible="enabled: menuSelectedChallenge.id !== item.id"
bind-item__animation__mouseleave="enabled: menuSelectedChallenge.id !== item.id"
bind-item__animation__mouseleavevisible="enabled: menuSelectedChallenge.id !== item.id"
bind-toggle__raycastable="menu.active"
bind-toggle__raycastable="menuActive"
geometry="primitive: plane; width: 1.1; height: 0.2"
material="shader: flat; color: #067197; transparent: true; opacity: 0.0"
position="0 -0.13 -0.002"
@@ -100,7 +100,7 @@
{% endraw %}
<!-- Menu container begins here. -->
<a-entity id="menu" bind__visible="menu.active" position="0 1.65 -2">
<a-entity id="menu" bind__visible="menuActive" position="0 1.65 -2">
<a-entity id="menuchallengeunselectground"
mixin="slice"
slice9="width: 2.5; height: 1.55"
@@ -146,7 +146,7 @@
bind-item__animation__mouseleave="enabled: menuSelectedChallenge.difficulty !== item"
bind-item__animation__mouseentervisible="enabled: menuSelectedChallenge.difficulty !== item"
bind-item__animation__mouseleavevisible="enabled: menuSelectedChallenge.difficulty !== item"
bind-toggle__raycastable="menu.active && !!menuSelectedChallenge.id && menuSelectedChallenge.difficulty !== item"
bind-toggle__raycastable="menuActive && !!menuSelectedChallenge.id && menuSelectedChallenge.difficulty !== item"
geometry="primitive: plane; width: 0.4; height: 0.2"
material="shader: flat; color: #067197; transparent: true; opacity: 0.0"
position="0 -0.005 0"
@@ -195,8 +195,8 @@
animation__mouseleave1="property: components.material.material.color; type: color; from: #FFF; to: #CCC; startEvents: mouseleave; pauseEvents: mouseenter; dur: 150"
animation__mouseenter2="property: scale; from: 1 1 1; to: 1.1 1.1 1.1; startEvents: mouseenter; pauseEvents: mouseleave; dur: 150"
animation__mouseleave2="property: scale; to: 1 1 1; from: 1.1 1.1 1.1; startEvents: mouseleave; pauseEvents: mouseenter; dur: 150"
bind-toggle__raycastable="menu.active && !!menuSelectedChallenge.id"
bind__visible="menu.active && !!menuSelectedChallenge.id"></a-plane>
bind-toggle__raycastable="menuActive && !!menuSelectedChallenge.id"
bind__visible="menuActive && !!menuSelectedChallenge.id"></a-plane>
</a-entity>
</a-entity>
@@ -207,8 +207,8 @@
animation__mouseleave1="property: slice9.color; type: color; from: #FFF; to: #999; startEvents: mouseleave; pauseEvents: mouseenter; dur: 150"
animation__mouseenter2="property: scale; from: 1 1 1; to: 1.1 1.1 1.1; startEvents: mouseenter; pauseEvents: mouseleave; dur: 150"
animation__mouseleave2="property: scale; to: 1 1 1; from: 1.1 1.1 1.1; startEvents: mouseleave; pauseEvents: mouseenter; dur: 150"
bind-toggle__raycastable="menu.active && !keyboardActive"
bind__visible="menu.active && !keyboardActive"
bind-toggle__raycastable="menuActive && !keyboardActive"
bind__visible="menuActive && !keyboardActive"
proxy-event="event: click; to: a-scene; as: keyboardopen">
<a-entity mixin="textFont" text="align: center; color: #AAA; wrapCount: 20; value: SEARCH SONGS" position="0 -0.07 0.01"></a-entity>
</a-entity>