finishing metacode select

This commit is contained in:
Connor Turland 2017-01-29 20:22:54 +00:00 committed by Devin Howard
parent 34c9598b63
commit 2d4ecf7cc1
3 changed files with 8 additions and 12 deletions

View file

@ -521,9 +521,6 @@ cursor: pointer;
display: inline-block; display: inline-block;
} }
#metacodeOptions {
display:none;
}
.CardOnGraph .metacodeSelect { .CardOnGraph .metacodeSelect {
display:none; display:none;
width:auto; width:auto;

View file

@ -11,6 +11,7 @@ const Views = {
init: (serverData) => { init: (serverData) => {
$(document).on(JUNTO_UPDATED, () => ExploreMaps.render()) $(document).on(JUNTO_UPDATED, () => ExploreMaps.render())
ChatView.init([serverData['sounds/MM_sounds.mp3'], serverData['sounds/MM_sounds.ogg']]) ChatView.init([serverData['sounds/MM_sounds.mp3'], serverData['sounds/MM_sounds.ogg']])
TopicCard.init(serverData)
}, },
ExploreMaps, ExploreMaps,
ChatView, ChatView,

View file

@ -101,19 +101,19 @@ class Metacode extends Component {
<div id="metacodeOptions"> <div id="metacodeOptions">
<ul> <ul>
{this.props.metacodeSets.map(set => { {this.props.metacodeSets.map(set => {
<li key={set.name}> return (<li key={set.name}>
<span>{set.name}</span> <span>{set.name}</span>
<div class="expandMetacodeSet"></div> <div className="expandMetacodeSet"></div>
<ul> <ul>
{set.metacodes.map(m => { {set.metacodes.map(m => {
<li key={m.id} data-id={m.id}> return (<li key={m.id} data-id={m.id}>
<img width="24" height="24" src={m.icon_path} alt={m.name} /> <img width="24" height="24" src={m.icon_path} alt={m.name} />
<div class="mSelectName">{m.name}</div> <div className="mSelectName">{m.name}</div>
<div class="clearfloat"></div> <div className="clearfloat"></div>
</li> </li>)
})} })}
</ul> </ul>
</li> </li>)
})} })}
</ul> </ul>
</div> </div>
@ -123,8 +123,6 @@ class Metacode extends Component {
render = () => { render = () => {
const { metacode } = this.props const { metacode } = this.props
// the code for this is stored in /views/main/_metacodeOptions.html.erb
const metacodeSelectHTML = $('#metacodeOptions').html()
return ( return (
<div className="linkItem icon"> <div className="linkItem icon">