From 26560b5fc61dd8272f689d692638cb5e50b9e366 Mon Sep 17 00:00:00 2001
From: nickago <ngonella@calpoly.edu>
Date: Wed, 1 Jul 2015 09:53:32 -0700
Subject: Inital attempt at active element checking

---
 web/react/components/mention_list.jsx | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'web/react')

diff --git a/web/react/components/mention_list.jsx b/web/react/components/mention_list.jsx
index eb21e0efe..37fd3e2dc 100644
--- a/web/react/components/mention_list.jsx
+++ b/web/react/components/mention_list.jsx
@@ -23,6 +23,12 @@ module.exports = React.createClass({
                 }
             }
         );
+        $(document).click(function() {
+            if ($(document.activeElement).get(0) != $('#'+this.props.id).get(0)) {
+            this.setState({ mentionText: '-1'})
+            console.log(this.state)
+            }
+        });
     },
     componentWillUnmount: function() {
         PostStore.removeMentionDataChangeListener(this._onChange);
@@ -131,7 +137,7 @@ module.exports = React.createClass({
 
         return (
             <div className="mentions--top" style={{height: height, width: width, bottom: bottom, left: left}}>
-                <div ref="mentionlist" className="mentions-box" style={{maxHeight: max_height, height: height, width: width}}>
+                <div ref="mentionlist" id="mentionlist" className="mentions-box" style={{maxHeight: max_height, height: height, width: width}}>
                     { mentions }
                 </div>
             </div>
-- 
cgit v1.2.3-1-g7c22


From 0967e1fd013e97d36e6d46d89b2b7bcfa3b24624 Mon Sep 17 00:00:00 2001
From: nickago <ngonella@calpoly.edu>
Date: Wed, 1 Jul 2015 11:08:55 -0700
Subject: Fixed click response

---
 web/react/components/mention_list.jsx | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'web/react')

diff --git a/web/react/components/mention_list.jsx b/web/react/components/mention_list.jsx
index 37fd3e2dc..a4408acb2 100644
--- a/web/react/components/mention_list.jsx
+++ b/web/react/components/mention_list.jsx
@@ -24,9 +24,8 @@ module.exports = React.createClass({
             }
         );
         $(document).click(function() {
-            if ($(document.activeElement).get(0) != $('#'+this.props.id).get(0)) {
-            this.setState({ mentionText: '-1'})
-            console.log(this.state)
+            if($('#'+self.props.id).length && $('#'+self.props.id).get(0) !== $(':focus').get(0)) {
+                self.setState({mentionText: "-1"})
             }
         });
     },
-- 
cgit v1.2.3-1-g7c22


From d47c86b9217d24add8612767b73dab9455bb134b Mon Sep 17 00:00:00 2001
From: nickago <ngonella@calpoly.edu>
Date: Wed, 1 Jul 2015 11:14:18 -0700
Subject: Removed a change originally made for a prior fix tactic

---
 web/react/components/mention_list.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'web/react')

diff --git a/web/react/components/mention_list.jsx b/web/react/components/mention_list.jsx
index a4408acb2..2fecc129a 100644
--- a/web/react/components/mention_list.jsx
+++ b/web/react/components/mention_list.jsx
@@ -136,7 +136,7 @@ module.exports = React.createClass({
 
         return (
             <div className="mentions--top" style={{height: height, width: width, bottom: bottom, left: left}}>
-                <div ref="mentionlist" id="mentionlist" className="mentions-box" style={{maxHeight: max_height, height: height, width: width}}>
+                <div ref="mentionlist" className="mentions-box" style={{maxHeight: max_height, height: height, width: width}}>
                     { mentions }
                 </div>
             </div>
-- 
cgit v1.2.3-1-g7c22