Sync sidebar order

This commit is contained in:
Mattias Erming 2014-09-24 12:42:36 -07:00
parent b1bd39f7f4
commit 8793551371
6 changed files with 73 additions and 7 deletions

View File

@ -684,7 +684,17 @@ $(function() {
placeholder: "network-placeholder", placeholder: "network-placeholder",
forcePlaceholderSize: true, forcePlaceholderSize: true,
update: function() { update: function() {
// .. var order = [];
sidebar.find(".network").each(function() {
var id = $(this).data("id");
order.push(id);
});
socket.emit(
"sort", {
type: "networks",
order: order
}
);
} }
}); });
sidebar.find(".network").sortable({ sidebar.find(".network").sortable({
@ -694,8 +704,20 @@ $(function() {
items: ".chan:not(.lobby)", items: ".chan:not(.lobby)",
placeholder: "chan-placeholder", placeholder: "chan-placeholder",
forcePlaceholderSize: true, forcePlaceholderSize: true,
update: function() { update: function(e, ui) {
// .. var order = [];
var network = ui.item.parent();
network.find(".chan").each(function() {
var id = $(this).data("id");
order.push(id);
});
socket.emit(
"sort", {
type: "channels",
target: network.data("id"),
order: order
}
);
} }
}); });
} }

View File

@ -114,7 +114,9 @@ templates['network'] = template({"1":function(depth0,helpers,partials,data) {
var helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression; var helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression;
return "<section id=\"network-" return "<section id=\"network-"
+ escapeExpression(((helper = (helper = helpers.id || (depth0 != null ? depth0.id : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"id","hash":{},"data":data}) : helper))) + escapeExpression(((helper = (helper = helpers.id || (depth0 != null ? depth0.id : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"id","hash":{},"data":data}) : helper)))
+ "\" class=\"network\">\n " + "\" class=\"network\" data-id=\""
+ escapeExpression(((helper = (helper = helpers.id || (depth0 != null ? depth0.id : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"id","hash":{},"data":data}) : helper)))
+ "\">\n "
+ escapeExpression(((helpers.partial || (depth0 && depth0.partial) || helperMissing).call(depth0, "chan", {"name":"partial","hash":{},"data":data}))) + escapeExpression(((helpers.partial || (depth0 && depth0.partial) || helperMissing).call(depth0, "chan", {"name":"partial","hash":{},"data":data})))
+ "\n</section>\n"; + "\n</section>\n";
},"compiler":[6,">= 2.0.0-beta.1"],"main":function(depth0,helpers,partials,data) { },"compiler":[6,">= 2.0.0-beta.1"],"main":function(depth0,helpers,partials,data) {

View File

@ -1,5 +1,5 @@
{{#each networks}} {{#each networks}}
<section id="network-{{id}}" class="network"> <section id="network-{{id}}" class="network" data-id="{{id}}">
{{partial "chan"}} {{partial "chan"}}
</section> </section>
{{/each}} {{/each}}

View File

@ -1,7 +1,7 @@
{ {
"name": "shout", "name": "shout",
"description": "The self-hosted web IRC client", "description": "The self-hosted web IRC client",
"version": "0.33.1", "version": "0.33.2",
"author": "Mattias Erming", "author": "Mattias Erming",
"preferGlobal": true, "preferGlobal": true,
"bin": { "bin": {

View File

@ -246,6 +246,42 @@ Client.prototype.open = function(data) {
} }
}; };
Client.prototype.sort = function(data) {
var self = this;
var type = data.type;
var order = data.order || [];
switch (type) {
case "networks":
var sorted = [];
_.each(order, function(i) {
var find = _.find(self.networks, {id: i});
if (find) {
sorted.push(find);
}
});
self.networks = sorted;
break;
case "channels":
var target = data.target;
var network = _.find(self.networks, {id: target});
if (!network) {
return;
}
var sorted = [];
_.each(order, function(i) {
var find = _.find(network.channels, {id: i});
if (find) {
sorted.push(find);
}
});
network.channels = sorted;
break;
}
};
Client.prototype.quit = function() { Client.prototype.quit = function() {
this.networks.forEach(function(network) { this.networks.forEach(function(network) {
var irc = network.irc; var irc = network.irc;

View File

@ -85,7 +85,13 @@ function init(socket, client, token) {
function(data) { function(data) {
client.open(data); client.open(data);
} }
) );
socket.on(
"sort",
function(data) {
client.sort(data);
}
);
socket.join(client.id); socket.join(client.id);
socket.emit("init", { socket.emit("init", {
active: client.activeChannel, active: client.activeChannel,