1
0
mirror of https://github.com/moparisthebest/kaiwa synced 2025-01-12 06:08:23 -05:00

shuffling a few things around. Adding stanza.io changing some text.

This commit is contained in:
Henrik Joreteg 2013-06-03 16:41:02 -07:00
parent d906a0494b
commit 84e5623c5c
11 changed files with 46591 additions and 21785 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -24,6 +24,7 @@ module.exports = {
}).render();
// init our api
/*
this.api = window.api = new Conversatio({
token: accessToken,
url: 'http://localhost:3008',
@ -32,6 +33,7 @@ module.exports = {
log: true
});
this.api.on('user', function (user) {
me.set(user);
tracking.identify(me);
@ -55,6 +57,7 @@ module.exports = {
this.api.on('unlocked', function () {
me.roomKey = '';
});
*/
new Router();
app.history = Backbone.history;

View File

@ -8,7 +8,7 @@ var BasePage = require('pages/base'),
module.exports = BasePage.extend({
template: templates.pages.create,
events: {
'submit #createRoom': 'handleFormSubmit'
'submit #loginForm': 'handleFormSubmit'
},
initialize: function (spec) {
this.url = spec.url;

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

View File

@ -88,7 +88,7 @@ exports.pages.create = function anonymous(locals, attrs, escape, rethrow, merge)
var buf = [];
with (locals || {}) {
var interp;
buf.push('<section class="page create"><a href="/"><h1 id="logo"><img src="conversatio.png" height="64" width="480" alt="Conversat.io"/></h1></a><h2><span id="title">Get a room.</span><p class="desc">Video chat with up to 6 people.</p></h2><form id="createRoom"><input id="sessionInput" placeholder="Name the conversation" autofocus="autofocus"/><button type="submit">Lets go!</button></form><p class="about">Requires Chrome or Firefox Nightly with peer connection enabled.<br/> conversat.io uses <a href="https://github.com/henrikjoreteg/SimpleWebRTC">the simple WebRTC library</a> from <a href="http://andyet.com">&yet</a> and so can you.</p></section>');
buf.push('<section class="page create"><a href="/"><h1 id="logo"><img src="conversatio.png" height="64" width="480" alt="Conversat.io"/></h1></a><h2><span id="title">Log in with XMPP</span><p class="desc">WebRTC capable XMPP client</p></h2><form id="createRoom"><input id="sessionInput" placeholder="you@reaweso.me" autofocus="autofocus"/><input id="sessionInput" placeholder="password" type="password"/><button type="submit">Lets go!</button></form><p class="about">Requires Chrome or Firefox Nightly with peer connection enabled.<br/> conversat.io uses <a href="https://github.com/henrikjoreteg/SimpleWebRTC">the simple WebRTC library</a> from <a href="http://andyet.com">&yet</a> and so can you.</p></section>');
}
return buf.join("");
};

View File

@ -3,10 +3,11 @@ section.page.create
h1#logo
img(src='conversatio.png', height='64', width='480', alt='Conversat.io')
h2
span#title Get a room.
p.desc Video chat with up to 6 people.
span#title Log in with XMPP
p.desc WebRTC capable XMPP client
form#createRoom
input#sessionInput(placeholder='Name the conversation', autofocus='autofocus')
input#sessionInput(placeholder='you@reaweso.me', autofocus=true)
input#sessionInput(placeholder='password', type='password')
button(type='submit') Lets go!
p.about Requires Chrome or Firefox Nightly with peer connection enabled.<br/> conversat.io uses <a href="https://github.com/henrikjoreteg/SimpleWebRTC">the simple WebRTC library</a> from <a href="http://andyet.com">&yet</a> and so can you.

View File

@ -54,7 +54,7 @@ var clientApp = new Moonboots({
'jquery.js',
'jquery.slidingmessage.js',
'ui.js',
'socket.io.js',
'stanza.io.js',
'init.js'
],
server: app