Show list on exit. needs double click, not finished #223

BeagleLab · Jul 16, 2015 · 3e301b2 · 3e301b2
1 parent 5de55aa
commit 3e301b2
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 26 deletions.
diff --git a/build/main.min.js b/build/main.min.js
@@ -356,17 +356,15 @@ module.exports = React.createClass({
 
   showConversation: function showConversation() {
     this.setState({
-      'conversation': null
-    });
-    this.setState({
-      'showConversation': !this.state.showConversation
+      'conversation': null,
+      'showConversation': this.state.showConversation ? null : true
     });
   },
 
   setConversation: function setConversation(conversation) {
     this.setState({
       'conversation': conversation,
-      'showConversation': !this.state.showConversation
+      'showConversation': this.state.showConversation ? null : true
     });
   },
 
@@ -622,9 +620,7 @@ module.exports = exports = React.createClass({
     if (nextProps.conversations) {
       this.getAvatars(nextProps.conversations);
     }
-    if (nextProps.showConversation) {
-      this.setState({ showConversation: nextProps.showConversation });
-    }
+    this.setState({ showConversation: nextProps.showConversation });
   },
   // componentDidUpdate: function () {
   //   console.log('State updated', this.state.conversations)
@@ -708,7 +704,7 @@ module.exports = exports = React.createClass({
 
     var ConversationList;
 
-    if (!this.state.showConversation && this.state.conversations) {
+    if (this.state.showConversation === null && this.state.conversations) {
       var _this = this;
       ConversationList = React.createElement('div', null, this.state.conversations.map(function (conversation) {
         return React.createElement('div', { style: listingStyle, onClick: _this.handleClick.bind(this, conversation) }, React.createElement('p', { style: titleStyle }, conversation.title), React.createElement('div', { style: imageWrapperStyle },
@@ -720,6 +716,8 @@ module.exports = exports = React.createClass({
       }));
     }
 
+    console.log('Conve', this.state.showConversation, this.state.conversations);
+
     return React.createElement('div', null, ConversationList);
   }
 
@@ -1636,11 +1634,8 @@ var Toolbar = React.createClass({
     // screenshot: React.PropTypes.boolean,
     // flag: React.PropTypes.boolean
   },
-  showConversation: function showConversation() {
-    this.props.showConversation();
-  },
   render: function render() {
-    return React.createElement(ButtonToolbar, null, React.createElement(Button, { onClick: this.showConversation }, 'Note'), React.createElement(Button, null, React.createElement(Highlight, { location: this.props.location, fingerprint: this.props.fingerprint })), React.createElement(Button, null, React.createElement(Screenshot, { fingerprint: this.props.fingerprint, location: this.props.location }))
+    return React.createElement(ButtonToolbar, null, React.createElement(Button, { onClick: this.props.showConversation }, 'Note'), React.createElement(Button, null, React.createElement(Highlight, { location: this.props.location, fingerprint: this.props.fingerprint })), React.createElement(Button, null, React.createElement(Screenshot, { fingerprint: this.props.fingerprint, location: this.props.location }))
     /*
       // TODO Add in Flag functionality
       <Button>Flag</Button>

diff --git a/js/app.jsx b/js/app.jsx
@@ -63,17 +63,15 @@ module.exports = React.createClass({
 
   showConversation: function () {
     this.setState({
-      'conversation': null
-    })
-    this.setState({
-      'showConversation': !this.state.showConversation
+      'conversation': null,
+      'showConversation': (this.state.showConversation) ? null : true
     })
   },
 
   setConversation: function (conversation) {
     this.setState({
       'conversation': conversation,
-      'showConversation': !this.state.showConversation
+      'showConversation': (this.state.showConversation) ? null : true
     })
   },
 

diff --git a/js/components/conversations.jsx b/js/components/conversations.jsx
@@ -31,9 +31,7 @@ module.exports = exports = React.createClass({
     if (nextProps.conversations) {
       this.getAvatars(nextProps.conversations)
     }
-    if (nextProps.showConversation) {
-      this.setState({showConversation: nextProps.showConversation})
-    }
+    this.setState({showConversation: nextProps.showConversation})
   },
   // componentDidUpdate: function () {
   //   console.log('State updated', this.state.conversations)
@@ -118,7 +116,7 @@ module.exports = exports = React.createClass({
 
     var ConversationList
 
-    if (!this.state.showConversation && this.state.conversations) {
+    if (this.state.showConversation === null && this.state.conversations) {
       var _this = this
       ConversationList = (
         <div>
@@ -146,6 +144,8 @@ module.exports = exports = React.createClass({
       )
     }
 
+    console.log('Conve', this.state.showConversation, this.state.conversations)
+
     return (
       <div>
         {ConversationList}

diff --git a/js/components/toolbar.jsx b/js/components/toolbar.jsx
@@ -17,13 +17,10 @@ var Toolbar = React.createClass({
     // screenshot: React.PropTypes.boolean,
     // flag: React.PropTypes.boolean
   },
-  showConversation: function () {
-    this.props.showConversation()
-  },
   render: function () {
     return (
       <ButtonToolbar>
-        <Button onClick={this.showConversation} >
+        <Button onClick={this.props.showConversation} >
           Note
         </Button>
         <Button>