e2m/dispatch
4
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Made backspace work on input history items

Browse Source
This commit is contained in:
khlieng 2015-02-12 02:14:56 +01:00
parent 8a790a6fe2
commit b7cafc5327
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/js/components/MessageInput.jsx
View File

@ -48,6 +48,8 @@ var MessageInput = React.createClass({
inputHistoryActions.increment(); inputHistoryActions.increment();
} else if (e.which === 40) { } else if (e.which === 40) {
inputHistoryActions.decrement(); inputHistoryActions.decrement();
} else if (e.key === 'Backspace' || e.key === 'Delete') {
inputHistoryActions.reset();
} else if (e.key === 'Unidentified') { } else if (e.key === 'Unidentified') {
inputHistoryActions.reset(); inputHistoryActions.reset();
} }

4
client/src/js/socket.js
View File

@ -2,6 +2,8 @@ var EventEmitter = require('events').EventEmitter;
var _ = require('lodash'); var _ = require('lodash');
var ws = new WebSocket('ws://' + window.location.host + '/ws');
var socket = { var socket = {
send: function(type, data) { send: function(type, data) {
ws.send(JSON.stringify({ type: type, request: data })); ws.send(JSON.stringify({ type: type, request: data }));
@ -10,8 +12,6 @@ var socket = {
_.extend(socket, EventEmitter.prototype); _.extend(socket, EventEmitter.prototype);
var ws = new WebSocket('ws://' + window.location.host + '/ws');
ws.onopen = function() { ws.onopen = function() {
socket.emit('connect'); socket.emit('connect');
}; };

6
client/src/js/stores/inputHistory.js
View File

@ -31,8 +31,10 @@ var inputHistoryStore = Reflux.createStore({
}, },
reset: function() { reset: function() {
index = -1; if (index !== -1) {
this.trigger(history[index]); index = -1;
this.trigger(history[index]);
}
}, },
increment: function() { increment: function() {

2
storage/user.go
View File

@ -20,7 +20,7 @@ type Server struct {
type Channel struct { type Channel struct {
Server string `json:"server"` Server string `json:"server"`
Name string `json:"name"` Name string `json:"name"`
Users []string `json:"users"` Users []string `json:"users,omitempty"`
Topic string `json:"topic,omitempty"` Topic string `json:"topic,omitempty"`
} }