From dbf104686a9ca9de0da58ba602e1fdfe0b82087a Mon Sep 17 00:00:00 2001
From: Reed Garmsen <rgarmsen2295@gmail.com>
Date: Thu, 30 Jul 2015 20:09:14 -0700
Subject: Added help text informing the user that the team invite link has been
 copied when they press the 'Copy Link' button

---
 web/react/components/get_link_modal.jsx | 46 ++++++++++++++++++++-------------
 1 file changed, 28 insertions(+), 18 deletions(-)

(limited to 'web/react/components')

diff --git a/web/react/components/get_link_modal.jsx b/web/react/components/get_link_modal.jsx
index af5314e64..ab6045d2f 100644
--- a/web/react/components/get_link_modal.jsx
+++ b/web/react/components/get_link_modal.jsx
@@ -10,46 +10,56 @@ ZeroClipboardMixin.ZeroClipboard.config({
 
 module.exports = React.createClass({
     zeroclipboardElementsSelector: '[data-copy-btn]',
-    mixins: [ ZeroClipboardMixin ],
+    mixins: [ZeroClipboardMixin],
     componentDidMount: function() {
         var self = this;
-        if(this.refs.modal) {
+        if (this.refs.modal) {
           $(this.refs.modal.getDOMNode()).on('show.bs.modal', function(e) {
               var button = e.relatedTarget;
-              self.setState({title: $(button).attr('data-title'), value: $(button).attr('data-value') });
+              self.setState({title: $(button).attr('data-title'), value: $(button).attr('data-value')});
+          });
+          $(this.refs.modal.getDOMNode()).on('hide.bs.modal', function() {
+              self.setState({copiedLink: false});
           });
         }
     },
     getInitialState: function() {
         return { };
     },
+    handleClick: function() {
+        this.setState({copiedLink: true});
+    },
     render: function() {
-        var currentUser = UserStore.getCurrentUser()
+        var currentUser = UserStore.getCurrentUser();
 
         if (currentUser != null) {
             return (
-                <div className="modal fade" ref="modal" id="get_link" tabIndex="-1" role="dialog" aria-hidden="true">
-                   <div className="modal-dialog">
-                      <div className="modal-content">
-                        <div className="modal-header">
-                          <button type="button" className="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                          <h4 className="modal-title" id="myModalLabel">{this.state.title} Link</h4>
+                <div className='modal fade' ref='modal' id='get_link' tabIndex='-1' role='dialog' aria-hidden='true'>
+                   <div className='modal-dialog'>
+                      <div className='modal-content'>
+                        <div className='modal-header'>
+                          <button type='button' className='close' data-dismiss='modal' aria-label='Close'><span aria-hidden='true'>&times;</span></button>
+                          <h4 className='modal-title' id='myModalLabel'>{this.state.title} Link</h4>
                         </div>
-                        <div className="modal-body">
-                          <p>{"The link below is used for open " + strings.TeamPlural + " or if you allowed your " + strings.Team + " members to sign up using their " + strings.Company + " email addresses."}
+                        <div className='modal-body'>
+                          <p>{'The link below is used for open ' + strings.TeamPlural + ' or if you allowed your ' + strings.Team + ' members to sign up using their ' + strings.Company + ' email addresses.'}
                           </p>
-                          <textarea className="form-control no-resize" readOnly="true" value={this.state.value}></textarea>
+                          <textarea className='form-control no-resize' readOnly='true' value={this.state.value}></textarea>
                         </div>
-                        <div className="modal-footer">
-                          <button type="button" className="btn btn-default" data-dismiss="modal">Close</button>
-                          <button data-copy-btn type="button" className="btn btn-primary pull-left" data-clipboard-text={this.state.value}>Copy Link</button>
+                        <div className='modal-footer'>
+                          <button type='button' className='btn btn-default' data-dismiss='modal'>Close</button>
+                          <button data-copy-btn='true' type='button' className='btn btn-primary pull-left' onClick={this.handleClick} data-clipboard-text={this.state.value}>Copy Link</button>
+                          {this.state.copiedLink ?
+                            <p className='copy-link-confirm'>Link copied to clipboard.</p>
+                          :
+                            null
+                          }
                         </div>
                       </div>
                    </div>
                 </div>
             );
-        } else {
-            return <div/>;
         }
+        return <div/>;
     }
 });
-- 
cgit v1.2.3-1-g7c22


From dfc6e80437e465bc01b454cf1d6bfdd4d3a70c85 Mon Sep 17 00:00:00 2001
From: Reed Garmsen <rgarmsen2295@gmail.com>
Date: Fri, 31 Jul 2015 12:08:36 -0700
Subject: Fixed help text rendering on mobile

---
 web/react/components/get_link_modal.jsx | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'web/react/components')

diff --git a/web/react/components/get_link_modal.jsx b/web/react/components/get_link_modal.jsx
index ab6045d2f..ea22ad0f3 100644
--- a/web/react/components/get_link_modal.jsx
+++ b/web/react/components/get_link_modal.jsx
@@ -24,13 +24,18 @@ module.exports = React.createClass({
         }
     },
     getInitialState: function() {
-        return { };
+        return {copiedLink: false};
     },
     handleClick: function() {
         this.setState({copiedLink: true});
     },
     render: function() {
         var currentUser = UserStore.getCurrentUser();
+        var copyLinkConfirm = null;
+
+        if (this.state.copiedLink) {
+            copyLinkConfirm = <p className='copy-link-confirm'>Link copied to clipboard.</p>;
+        }
 
         if (currentUser != null) {
             return (
@@ -49,11 +54,7 @@ module.exports = React.createClass({
                         <div className='modal-footer'>
                           <button type='button' className='btn btn-default' data-dismiss='modal'>Close</button>
                           <button data-copy-btn='true' type='button' className='btn btn-primary pull-left' onClick={this.handleClick} data-clipboard-text={this.state.value}>Copy Link</button>
-                          {this.state.copiedLink ?
-                            <p className='copy-link-confirm'>Link copied to clipboard.</p>
-                          :
-                            null
-                          }
+                          {copyLinkConfirm}
                         </div>
                       </div>
                    </div>
-- 
cgit v1.2.3-1-g7c22