matth
/
daapr
1
0
Fork 0
Code Releases Activity

Ooooohh so silly :\

Browse Source
master
Matthieu Lalonde 12 years ago committed by xSmurf
parent f3146522fc
commit 6f0c2fada8
6 changed files with 115 additions and 62 deletions
Show Stats Download Patch File Download Diff File

4
index.html
Unescape View File

@ -1,3 +1,7 @@
<!--
- - Copyleft Matthieu Lalonde 2012 LGPL, no guarantee given.
- - This software includes other similarly licensed software in /resources/vendors, see there for licenses
-->
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>

115
resources/js/app.js
Unescape View File

@ -51,9 +51,22 @@ _
) { ) {
"use strict"; "use strict";
return { var App = Backbone.Router.extend({
init: function() { routes: {
"playlist": "_routerActionPlaylist"
, "servers/:server": "_routerActionClient"
, "playlist/:item": "_routerActionPlaylistItem"
, ":server/items/:item": "_routerActionServerItem"
//"*actions": "defaultRoute" // matches http://example.com/#anything-here
}
, initialize: function() {
_.bindAll(this _.bindAll(this
, "_routerActionPlaylist"
, "_routerActionClient"
, "_routerActionItem"
, "_routerActionServerItem"
, "_serverInit" , "_serverInit"
); );
@ -65,39 +78,12 @@ _
// Setup underscore templates with mustache styles // Setup underscore templates with mustache styles
_.templateSettings.interpolate = /\{\{(.+?)\}\}/g; _.templateSettings.interpolate = /\{\{(.+?)\}\}/g;
var Router = Backbone.Router.extend({
routes: {
"playlist": "_routerActionPlaylist"
, "servers": "_routerActionClient"
, "items/:id": "_routerActionItem"
, ":server/items/:id": "_routerActionServerItem"
//"*actions": "defaultRoute" // matches http://example.com/#anything-here
}
});
this.Router = new Router();
Backbone.history.start({
pushState: true
, root: "/"
});
this.servers = new ServerCollection(); this.servers = new ServerCollection();
this.servers.on("add", function (server) { this.servers.on("add", function (server) {
server.save(); server.save();
}); });
this.servers.on("client:unauthorized", function __fnAppEventClientUnauthorized(event) {
var client = event.shift()
;
console.log(arguments);
});
this.loadingStates = 0;
this.loadingModal = $(tmplModalLoading);
this.loadingTimeout = null;
async.waterfall([ async.waterfall([
function __asyncAppFetchServerCollection(callback) { function __asyncAppFetchServerCollection(callback) {
that.servers.fetch({ that.servers.fetch({
@ -143,6 +129,15 @@ _
$(event.target).remove(); $(event.target).remove();
}); });
Backbone.history.start({
pushState: true
, root: "/"
});
// For now let's reset the state when we start up
that.navigate("", false);
App.__super__.initialize.apply(that, that.routes);
}); });
return this; return this;
@ -153,10 +148,24 @@ _
} }
, _routerActionClient: function (hostname) { , _routerActionClient: function (hostname) {
var server = this.servers.get(hostname)
, client = server.client
;
if (client) {
if (client.sate < 4) {
client.on("inited", function __fnAppEventClientInitited(_client) {
_client.fetchDatabases(_client.fetchDatabase);
});
client.init();
} else if (client.state === 4) {
client.fetchDatabases(client.fetchDatabase);
}
}
} }
, _routerActionItem: function (item) { , _routerActionPlaylistItem: function (item) {
} }
@ -168,10 +177,14 @@ _
var that = this var that = this
; ;
that.loadingStates = 0;
that.loadingModal = $(tmplModalLoading);
that.loadingTimeout = null;
server.client.off("all");
server.client.on("state", function __fnAppEventClientStateChange(client, state) { server.client.on("state", function __fnAppEventClientStateChange(client, state) {
console.log(state);
if (state === ClientModel.defaults._states.loading) { if (state === ClientModel.defaults._states.loading) {
if (that.loadingStates === 0) { if (that.loadingStates === 0) {
that.loadingTimeout = setTimeout(function __fnAppTimeoutLoadingStat() { that.loadingTimeout = setTimeout(function __fnAppTimeoutLoadingStat() {
that.loadingModal.modal(); that.loadingModal.modal();
@ -193,13 +206,49 @@ _
server.client.on("unauthorized", function __fnAppEventClientUnauthorized(client, xhr) { server.client.on("unauthorized", function __fnAppEventClientUnauthorized(client, xhr) {
var tmplHtml = _.template(tmplModalLogin)({ dmap_itemname: client.url() }) var tmplHtml = _.template(tmplModalLogin)({ dmap_itemname: client.url() })
, $tmpl = $(tmplHtml) , $tmpl = $(tmplHtml)
, serverModel = that.servers.get(client.attributes.hostname)
; ;
$tmpl.modal(); $tmpl.modal();
$tmpl.find("form").on("submit", function __fnAppEventModalLogin(event) {
var username = $(event.target).find("input[type='text']").val()
, password = $(event.target).find("input[type='password']").val()
, saveCredentials = $(event.target).find("input[type='checkbox']").is(':checked')
;
client.setAuth(username, password);
if (saveCredentials) {
var newModel = (_.clone({}, serverModel.attributes, {username: username, password: password}));
console.log(newModel);
serverModel.set("username", username, {silent: true});
serverModel.set("password", password, {silent: true});
serverModel.save(newModel, {silence: true});
}
$tmpl.modal("hide");
setTimeout(client.init, 250);
event.preventDefault();
});
$tmpl.delegate("input[type='checkbox']", "click", function __fnEventModalRemember(event) {
if (event.target.checked === true) {
if (!confirm("Using this feature will save the login and password locally in clear text, are you sure?")) {
event.target.checked = false;
event.preventDefault();
}
}
});
}); });
server.client.init(); server.client.init();
} }
}; });
return App;
}); });

2
resources/js/main.js
Unescape View File

@ -88,7 +88,7 @@ require(
$.curCSS = $.css; $.curCSS = $.css;
$("body").ready(function __fnAppRequireLoader(){ $("body").ready(function __fnAppRequireLoader(){
App.init(); window.App = new App();
}); });
} }
); );

6
resources/js/models/client.js
Unescape View File

@ -95,11 +95,11 @@ define([
this.setState("connecting"); this.setState("connecting");
console.debug("Fetching content types"); //console.debug("Fetching content types");
that.fetchContentTypes(function __fnClientCbFetchContentTypes(contentTypes) { that.fetchContentTypes(function __fnClientCbFetchContentTypes(contentTypes) {
console.debug("Fetching server info"); //console.debug("Fetching server info");
that.fetchServerInfo(function __fnClientCbFetchServerInfo(serverInfo) { that.fetchServerInfo(function __fnClientCbFetchServerInfo(serverInfo) {
console.debug("Fetching login"); //console.debug("Fetching login");
that.fetchLogin(function __fnClientCbFetchLogin(sessionInfo) { that.fetchLogin(function __fnClientCbFetchLogin(sessionInfo) {
// TODO: Here we need to request /update for the database version // TODO: Here we need to request /update for the database version
//console.debug("Fetching databases info"); //console.debug("Fetching databases info");

2
resources/js/views/sidebar.js
Unescape View File

@ -186,7 +186,7 @@ _
console.log(item.client.collections); console.log(item.client.collections);
} }
*/ */
Backbone.Router.prototype.navigate("servers/" + item.id, false); Backbone.Router.prototype.navigate("servers/" + item.id, true);
}); });
} }

12
resources/templates/app/modal-login.html
Unescape View File

@ -1,6 +1,6 @@
<div class="modal" data-show="true" tabindex="-1" role="dialog" aria-hidden="true"> <div class="modal" data-show="true" tabindex="-1" role="dialog" aria-hidden="true">
<form action="javascript:void(0);">
<div class="modal-body" style="font-size: 1.2em"> <div class="modal-body" style="font-size: 1.2em">
<form>
<fieldset> <fieldset>
<legend>{{dmap_itemname}} login</legend> <legend>{{dmap_itemname}} login</legend>
<p> <p>
@ -9,14 +9,14 @@
<p> <p>
<input type="password" class="input-large" placeholder="Password"> <input type="password" class="input-large" placeholder="Password">
</p> </p>
<!--label class="checkbox"> <label class="checkbox">
<input type="checkbox"> Remember me <input type="checkbox"> Remember me
</label--> </label>
</fieldset> </fieldset>
</form>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button class="btn btn-mini" data-dismiss="modal" aria-hidden="true"><i class="icon-remove"></i>&nbsp;Cancel</button> <a class="btn btn-mini" data-dismiss="modal" aria-hidden="true"><i class="icon-remove"></i>&nbsp;Cancel</a>
<button class="btn btn-mini btn-primary" data-dismiss="modal" aria-hidden="true"><i class="icon-ok"></i>&nbsp;Login</button> <button class="btn btn-mini btn-primary" data-dismiss="action" aria-hidden="true"><i class="icon-ok"></i>&nbsp;Login</button>
</div> </div>
</form>
</div> </div>
Write Preview
Loading…
Cancel
Save