-
- {avatar}
- {this.props.title}
-
-
-
- {this.props.state === 'login' ?
- :
+
+ {avatar}
+
{this.props.title}
+ {this.props.state === 'login' ?
+
:
this.props.state === 'settings' ?
:
this.props.state === 'register' ?
:
this.props.state === 'contacts' ?
: null}
-
-
-
);
}
})
@@ -227,14 +224,11 @@
SideNavbar.MenuStart = React.createClass({
render: function() {
return (
-
-
-
+
);
}
});
@@ -242,7 +236,7 @@
SideNavbar.MenuCancel = React.createClass({
render: function() {
return (
-
+
close
);
}
})
@@ -250,7 +244,7 @@
SideNavbar.MenuSettings = React.createClass({
render: function() {
return (
-
+
settings
);
}
})
@@ -284,7 +278,7 @@
default:;
};
return (
-
+
+
{errorText}
);
}
});
@@ -325,7 +319,7 @@
/* BEGIN Contact list (list of topics) */
- /* A form for initiating a new topic */
+ /* A form for initiating a new topic
var NewTopic = React.createClass({
render: function() {
return (
@@ -333,12 +327,13 @@
);
}
});
+ */
/*
var contactsData = [
@@ -365,10 +360,12 @@
title = title.substring(0, 30) + "...";
}
return (
-
- 
-
-
+
+
+
+
●
+
{title}
{this.props.comment}
@@ -383,7 +380,7 @@
var showUnreadBadge = null;
if (this.props.count > 0) {
var count = this.props.count > 99 ? "99+" : this.props.count;
- showUnreadBadge = {count};
+ showUnreadBadge = {count};
}
return (
{showUnreadBadge}
@@ -391,27 +388,6 @@
}
});
- /* Online/offline indicator */
- Contact.Online = React.createClass({
- render: function() {
- var lastOnline = '';
- if (this.props.now) {
- lastOnline = "online";
- } else if (this.props.when) {
- lastOnline = this.props.when;
- } else {
- lastOnline = "offline";
- }
-
- return (
-
- ●
- {lastOnline}
-
- );
- }
- });
-
/* ContactsView holds all contacts-related stuff */
var ContactsView = React.createClass({
getInitialState: function() {
@@ -461,15 +437,11 @@
}, this);
return (
-
-
+
);
}
@@ -516,9 +488,15 @@ dignissim a diam a hendrerit. Nulla vel est ut quam rhoncus pulvinar. In hac hab
var Message = React.createClass({
render: function() {
var liClass = (this.props.response ? "left" : "right") + " " + this.props.sequence;
+ var colors = {
+ backgroundColor: materialColor[materialColorIndex[this.props.userIndex]]["100"],
+ borderColor: materialColor[materialColorIndex[this.props.userIndex]]["100"]
+ };
+ var bubbleClass = (this.props.sequence === "single" || this.props.sequence === "last") ?
+ "bubble tip" : "bubble";
return (
-
+
{this.props.content}
@@ -538,69 +516,23 @@ dignissim a diam a hendrerit. Nulla vel est ut quam rhoncus pulvinar. In hac hab
var marker = null;
if (this.props.received === Received.SENDING) {
- marker = '\u231A'; // watch face
- } else if (this.props.received === Received.SERVER || this.props.received === Received.CLIENT) {
- marker = '\u2714'; // checkmark
- if (this.props.received === Received.CLIENT) {
- var style = {marginLeft: "-0.5em"};
- marker += {'\u2714'};
- }
+ marker = (access_time); // watch face
+ } else if (this.props.received === Received.SERVER) {
+ marker = (done); // checkmark
+ } else if (this.props.received === Received.CLIENT) {
+ marker = (done_all); // double checkmark
} else if (this.props.received === Received.READ) {
- marker = '\uD83D\uDC41'; // open eye
+ marker = (done_all); // open eye
}
return (
- {timestamp}{'\u00a0'}{marker}
+ {timestamp}{'\u00a0'}{marker}
);
}
});
- /* Send message form */
- Message.Send = React.createClass({
- getInitialState:function() {
- return {
- message: '',
- // Make initial keypress time as if it happened 5001 milliseconds in the past.
- keypressTimestamp: new Date().getTime() - KEYPRESS_DELAY - 1
- };
- },
- handleSend: function(e) {
- var message = this.state.message.trim();
- if (message) {
- this.props.sendMessage(this.state.message.trim());
- this.setState({message: ''});
- }
- },
- handleMessageTyping: function(e) {
- var newState = {message: e.target.value};
- var now = new Date().getTime();
- if (now - this.state.keypressTimestamp > KEYPRESS_DELAY) {
- var topic = Tinode.getTopic(this.props.topic);
- if (topic.isSubscribed()) {
- topic.noteKeyPress();
- }
- newState.keypressTimestamp = now;
- }
- this.setState(newState);
- },
- render: function() {
- return (
-
-
-
-
-
-
-
- );
- }
- });
-
var MessagesView = React.createClass({
getInitialState: function() {
return {
@@ -615,8 +547,8 @@ dignissim a diam a hendrerit. Nulla vel est ut quam rhoncus pulvinar. In hac hab
//if (node) {
// node.scrollTop = node.scrollHeight;
//}
- var node = this.refs.messagesPanel;
- node.scrollTop = node.scrollHeight;
+ //var node = this.refs.messagesPanel;
+ //node.scrollTop = node.scrollHeight;
},
componentWillMount: function() {
this.propsChange(this.props);
@@ -673,53 +605,119 @@ dignissim a diam a hendrerit. Nulla vel est ut quam rhoncus pulvinar. In hac hab
this.props.onData(msg);
},
render: function() {
- var me = Tinode.getCurrentUserID();
- var topic = Tinode.getTopic(this.state.topic);
- var previousFrom = null;
- var messageNodes = this.state.messages.map(function(msg) {
- var isReply = !(msg.from === me);
- var msgReceived = Received.UNDEF;
- if (!isReply) {
- if (topic.msgReadCount(msg.seq) > 1) {
- msgReceived = Received.READ;
- } else if (topic.msgRecvCount(msg.seq) > 1) {
- msgReceived = Received.CLIENT;
- } else {
- msgReceived = Received.SERVER;
+ var component = null;
+ if (this.state.topic) {
+ var messageNodes = [];
+ var me = Tinode.getCurrentUserID();
+ var topic = Tinode.getTopic(this.state.topic);
+ var previousFrom = null;
+ for (var i=0; i
1) {
+ msgReceived = Received.READ;
+ } else if (topic.msgRecvCount(msg.seq) > 1) {
+ msgReceived = Received.CLIENT;
+ } else {
+ msgReceived = Received.SERVER;
+ }
+ }
+ messageNodes.push(
+
+ );
}
- return (
-
+ component = (
+
+
+
{this.state.title}
+
+
+
+
+
+
-
-
{this.state.title}
-
-
-
-
-
+
);
}
});
- /* This is just a static page to show when no conversation is selected */
- var DummyMessagesView = React.createClass({
+ /* This is just a static page to display when no conversation is selected. */
+ MessagesView.Dummy = React.createClass({
render: function() {
return (
-
-
+
);
}
@@ -824,9 +822,8 @@ dignissim a diam a hendrerit. Nulla vel est ut quam rhoncus pulvinar. In hac hab
},
render: function() {
return (
-
+
-
-
-
-
-
-
- {this.state.topicSelected ?
- :
- }
-
-
-
-
+
);
@@ -865,10 +853,10 @@ dignissim a diam a hendrerit. Nulla vel est ut quam rhoncus pulvinar. In hac hab
);
+ avatar =