seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Load genres from ajax. Add clientId to jamkazam. Add genre and clientId to createSession call

This commit is contained in:
Jonathon Wilson 2012-10-25 21:24:05 -06:00
parent 072be0062f
commit f3868ede2b
4 changed files with 51 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/assets/javascripts/createSession.js
View File

@ -25,9 +25,11 @@ Message from Seth on sequence for creating/joining sessions:
function submitForm(evt) {
var $this = $(this);
var data = $this.formToObject();
data.client_id = app.clientId;
var url = "/api/sessions";
$.ajax({
type: "POST",
dataType: "json",
url: url,
data: data
}).done(
@ -45,8 +47,26 @@ Message from Seth on sequence for creating/joining sessions:
$('#create-session-form').submit(submitForm);
}
function loadGenres() {
var url = "/api/genres";
$.ajax({
type: "GET",
url: url
}).done(function(response) {
var options = [];
var optionTemplate = $('#template-genre-option').html();
$.each(response, function() {
var d = {value: this.description, label: this.description};
var opt = context.JK.fillTemplate(optionTemplate, d);
options.push(opt);
});
$('#create-session-form select[name="genre"]').html(options.join(''));
});
}
this.initialize = function() {
events();
loadGenres();
screenBindings = { 'afterShow': afterShow };
app.bindScreen('session', screenBindings);
};

20
app/assets/javascripts/jamkazam.js
View File

@ -77,11 +77,20 @@
context.JK.JamServer.send(message);
}
function loggedIn(header, payload) {
app.clientId = payload.client_id;
}
function registerLoginAck() {
context.JK.JamServer.registerMessageCallback(
context.JK.MessageType.LOGIN_ACK, loggedIn);
}
/**
* Register for all known types, logging events as they happen, and
* notifying subscribers (see this.subscribe) as they occur.
*/
function _registerMessages() {
function registerMessages() {
for (var message in context.JK.MessageType) {
logger.debug("registering " + message);
context.JK.JamServer.registerMessageCallback(message, handleMessage);
@ -130,7 +139,8 @@
this.layout = new JK.Layout();
this.layout.initialize();
routing();
_registerMessages();
registerMessages();
registerLoginAck();
events();
hash = location.hash;
@ -141,6 +151,12 @@
self.location = url;
};
/**
* Expose clientId as a public variable.
* Will be set upon LOGIN_ACK
*/
this.clientId = null;
return this;
};

5
app/assets/stylesheets/client/jamkazam.css.scss
View File

@ -59,10 +59,15 @@ fieldset.unstyled {
border: 1px solid #555;
float:left;
}
label {
display:block;
}
.hidden {
display:none;
}
.curtain {
background-color: shade($color7, 10%);
}

29
app/views/clients/index.html.erb
View File

@ -169,33 +169,15 @@
</label>
</label>
</div>
-->
<div class="formrow">
<label>Genre
<select>
<option>African</option>
<option>Ambient</option>
<option>Asian</option>
<option>Blues</option>
<option>Classical</option>
<option>Country</option>
<option>Electronic</option>
<option>Folk</option>
<option>Hop Hop</option>
<option>Jazz</option>
<option>Latin</option>
<option>Metal</option>
<option>Pop</option>
<option>R&amp;B</option>
<option>Reggae</option>
<option>Religious</option>
<option>Rock</option>
<option>Ska</option>
<option>Other</option>
<select name="genre">
</select>
</label>
<input type="text" class="hidden"/>
</div>
-->
<div class="formrow">
<label>Session Description</label>
@ -240,6 +222,11 @@
</form>
</div>
<!-- Genre option template -->
<script type="text/template" id="template-genre-option">
<option value="{value}">{label}</option>
</script>
<!-- Create Session:Audio Screen -->
<!-- Keeping as this will move into a user settings dialog... -->
<div layout="screen" layout-id="createSessionAudio" class="screen secondary">