From 6237631a85b79311a60b87df423abbdce56c7876 Mon Sep 17 00:00:00 2001
From: hmhealey <harrisonmhealey@gmail.com>
Date: Mon, 16 Nov 2015 12:08:05 -0500
Subject: Ported EditChannelModal to React-Bootstrap

---
 web/react/utils/channel_intro_mssages.jsx | 51 +++++++++++--------------------
 web/react/utils/utils.jsx                 | 17 +++--------
 2 files changed, 22 insertions(+), 46 deletions(-)

(limited to 'web/react/utils')

diff --git a/web/react/utils/channel_intro_mssages.jsx b/web/react/utils/channel_intro_mssages.jsx
index 0bbc7366e..4047ec028 100644
--- a/web/react/utils/channel_intro_mssages.jsx
+++ b/web/react/utils/channel_intro_mssages.jsx
@@ -1,9 +1,10 @@
-
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
 import * as Utils from './utils.jsx';
+import EditChannelModal from '../components/edit_channel_modal.jsx';
 import InviteMemberModal from '../components/invite_member_modal.jsx';
+import ToggleModalButton from '../components/toggle_modal_button.jsx';
 import UserProfile from '../components/user_profile.jsx';
 import ChannelStore from '../stores/channel_store.jsx';
 import Constants from '../utils/constants.jsx';
@@ -49,17 +50,13 @@ export function createDMIntroMessage(channel) {
                     {'This is the start of your direct message history with ' + teammateName + '.'}<br/>
                     {'Direct messages and files shared here are not shown to people outside this area.'}
                 </p>
-                <a
+                <ToggleModalButton
                     className='intro-links'
-                    href='#'
-                    data-toggle='modal'
-                    data-target='#edit_channel'
-                    data-header={channel.header}
-                    data-title={channel.display_name}
-                    data-channelid={channel.id}
+                    dialogType={EditChannelModal}
+                    dialogProps={{channel}}
                 >
                     <i className='fa fa-pencil'></i>{'Set a header'}
-                </a>
+                </ToggleModalButton>
             </div>
         );
     }
@@ -79,17 +76,13 @@ export function createOffTopicIntroMessage(channel, showInviteModal) {
                 {'This is the start of ' + channel.display_name + ', a channel for non-work-related conversations.'}
                 <br/>
             </p>
-            <a
+            <ToggleModalButton
                 className='intro-links'
-                href='#'
-                data-toggle='modal'
-                data-target='#edit_channel'
-                data-header={channel.header}
-                data-title={channel.display_name}
-                data-channelid={channel.id}
+                dialogType={EditChannelModal}
+                dialogProps={{channel}}
             >
                 <i className='fa fa-pencil'></i>{'Set a header'}
-            </a>
+            </ToggleModalButton>
             <a
                 href='#'
                 className='intro-links'
@@ -138,17 +131,13 @@ export function createDefaultIntroMessage(channel) {
                 {'This is the first channel teammates see when they sign up - use it for posting updates everyone needs to know.'}
             </p>
             {inviteModalLink}
-            <a
+            <ToggleModalButton
                 className='intro-links'
-                href='#'
-                data-toggle='modal'
-                data-target='#edit_channel'
-                data-header={channel.header}
-                data-title={channel.display_name}
-                data-channelid={channel.id}
+                dialogType={EditChannelModal}
+                dialogProps={{channel}}
             >
                 <i className='fa fa-pencil'></i>{'Set a header'}
-            </a>
+            </ToggleModalButton>
             <br/>
         </div>
     );
@@ -193,17 +182,13 @@ export function createStandardIntroMessage(channel, showInviteModal) {
                 {memberMessage}
                 <br/>
             </p>
-            <a
+            <ToggleModalButton
                 className='intro-links'
-                href='#'
-                data-toggle='modal'
-                data-target='#edit_channel'
-                data-header={channel.header}
-                data-title={channel.display_name}
-                data-channelid={channel.id}
+                dialogType={EditChannelModal}
+                dialogProps={{channel}}
             >
                 <i className='fa fa-pencil'></i>{'Set a header'}
-            </a>
+            </ToggleModalButton>
             <a
                 className='intro-links'
                 href='#'
diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx
index 764bdf763..9b2f7e057 100644
--- a/web/react/utils/utils.jsx
+++ b/web/react/utils/utils.jsx
@@ -749,19 +749,10 @@ export function updateCodeTheme(theme) {
 
 export function placeCaretAtEnd(el) {
     el.focus();
-    if (typeof window.getSelection != 'undefined' && typeof document.createRange != 'undefined') {
-        var range = document.createRange();
-        range.selectNodeContents(el);
-        range.collapse(false);
-        var sel = window.getSelection();
-        sel.removeAllRanges();
-        sel.addRange(range);
-    } else if (typeof document.body.createTextRange != 'undefined') {
-        var textRange = document.body.createTextRange();
-        textRange.moveToElementText(el);
-        textRange.collapse(false);
-        textRange.select();
-    }
+    el.selectionStart = el.value.length;
+    el.selectionEnd = el.value.length;
+
+    return;
 }
 
 export function getCaretPosition(el) {
-- 
cgit v1.2.3-1-g7c22


From 6c3a1d7039febd991db76dc176e9e57fd48ab9a4 Mon Sep 17 00:00:00 2001
From: hmhealey <harrisonmhealey@gmail.com>
Date: Mon, 16 Nov 2015 12:14:03 -0500
Subject: Renamed EditChannelModal to EditChannelHeaderModal

---
 web/react/utils/channel_intro_mssages.jsx | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'web/react/utils')

diff --git a/web/react/utils/channel_intro_mssages.jsx b/web/react/utils/channel_intro_mssages.jsx
index 4047ec028..268e4f695 100644
--- a/web/react/utils/channel_intro_mssages.jsx
+++ b/web/react/utils/channel_intro_mssages.jsx
@@ -2,7 +2,7 @@
 // See License.txt for license information.
 
 import * as Utils from './utils.jsx';
-import EditChannelModal from '../components/edit_channel_modal.jsx';
+import EditChannelHeaderModal from '../components/edit_channel_header_modal.jsx';
 import InviteMemberModal from '../components/invite_member_modal.jsx';
 import ToggleModalButton from '../components/toggle_modal_button.jsx';
 import UserProfile from '../components/user_profile.jsx';
@@ -52,7 +52,7 @@ export function createDMIntroMessage(channel) {
                 </p>
                 <ToggleModalButton
                     className='intro-links'
-                    dialogType={EditChannelModal}
+                    dialogType={EditChannelHeaderModal}
                     dialogProps={{channel}}
                 >
                     <i className='fa fa-pencil'></i>{'Set a header'}
@@ -78,7 +78,7 @@ export function createOffTopicIntroMessage(channel, showInviteModal) {
             </p>
             <ToggleModalButton
                 className='intro-links'
-                dialogType={EditChannelModal}
+                dialogType={EditChannelHeaderModal}
                 dialogProps={{channel}}
             >
                 <i className='fa fa-pencil'></i>{'Set a header'}
@@ -133,7 +133,7 @@ export function createDefaultIntroMessage(channel) {
             {inviteModalLink}
             <ToggleModalButton
                 className='intro-links'
-                dialogType={EditChannelModal}
+                dialogType={EditChannelHeaderModal}
                 dialogProps={{channel}}
             >
                 <i className='fa fa-pencil'></i>{'Set a header'}
@@ -184,7 +184,7 @@ export function createStandardIntroMessage(channel, showInviteModal) {
             </p>
             <ToggleModalButton
                 className='intro-links'
-                dialogType={EditChannelModal}
+                dialogType={EditChannelHeaderModal}
                 dialogProps={{channel}}
             >
                 <i className='fa fa-pencil'></i>{'Set a header'}
-- 
cgit v1.2.3-1-g7c22


From e8f6dd2f3359feceeae9923366c5ec80a6ab1d73 Mon Sep 17 00:00:00 2001
From: hmhealey <harrisonmhealey@gmail.com>
Date: Tue, 17 Nov 2015 09:17:00 -0500
Subject: Cleaned up how channel intro messages display set channel header
 button

---
 web/react/utils/channel_intro_mssages.jsx | 45 ++++++++++++-------------------
 1 file changed, 17 insertions(+), 28 deletions(-)

(limited to 'web/react/utils')

diff --git a/web/react/utils/channel_intro_mssages.jsx b/web/react/utils/channel_intro_mssages.jsx
index 268e4f695..72328f812 100644
--- a/web/react/utils/channel_intro_mssages.jsx
+++ b/web/react/utils/channel_intro_mssages.jsx
@@ -3,6 +3,7 @@
 
 import * as Utils from './utils.jsx';
 import EditChannelHeaderModal from '../components/edit_channel_header_modal.jsx';
+import GetTeamInviteLinkModal from '../components/get_team_invite_link_modal.jsx';
 import InviteMemberModal from '../components/invite_member_modal.jsx';
 import ToggleModalButton from '../components/toggle_modal_button.jsx';
 import UserProfile from '../components/user_profile.jsx';
@@ -50,13 +51,7 @@ export function createDMIntroMessage(channel) {
                     {'This is the start of your direct message history with ' + teammateName + '.'}<br/>
                     {'Direct messages and files shared here are not shown to people outside this area.'}
                 </p>
-                <ToggleModalButton
-                    className='intro-links'
-                    dialogType={EditChannelHeaderModal}
-                    dialogProps={{channel}}
-                >
-                    <i className='fa fa-pencil'></i>{'Set a header'}
-                </ToggleModalButton>
+                {createSetHeaderButton(channel)}
             </div>
         );
     }
@@ -76,13 +71,7 @@ export function createOffTopicIntroMessage(channel, showInviteModal) {
                 {'This is the start of ' + channel.display_name + ', a channel for non-work-related conversations.'}
                 <br/>
             </p>
-            <ToggleModalButton
-                className='intro-links'
-                dialogType={EditChannelHeaderModal}
-                dialogProps={{channel}}
-            >
-                <i className='fa fa-pencil'></i>{'Set a header'}
-            </ToggleModalButton>
+            {createSetHeaderButton(channel)}
             <a
                 href='#'
                 className='intro-links'
@@ -131,13 +120,7 @@ export function createDefaultIntroMessage(channel) {
                 {'This is the first channel teammates see when they sign up - use it for posting updates everyone needs to know.'}
             </p>
             {inviteModalLink}
-            <ToggleModalButton
-                className='intro-links'
-                dialogType={EditChannelHeaderModal}
-                dialogProps={{channel}}
-            >
-                <i className='fa fa-pencil'></i>{'Set a header'}
-            </ToggleModalButton>
+            {createSetHeaderButton(channel)}
             <br/>
         </div>
     );
@@ -182,13 +165,7 @@ export function createStandardIntroMessage(channel, showInviteModal) {
                 {memberMessage}
                 <br/>
             </p>
-            <ToggleModalButton
-                className='intro-links'
-                dialogType={EditChannelHeaderModal}
-                dialogProps={{channel}}
-            >
-                <i className='fa fa-pencil'></i>{'Set a header'}
-            </ToggleModalButton>
+            {createSetHeaderButton(channel)}
             <a
                 className='intro-links'
                 href='#'
@@ -199,3 +176,15 @@ export function createStandardIntroMessage(channel, showInviteModal) {
         </div>
     );
 }
+
+function createSetHeaderButton(channel) {
+    return (
+        <ToggleModalButton
+            className='intro-links'
+            dialogType={EditChannelHeaderModal}
+            dialogProps={{channel}}
+        >
+            <i className='fa fa-pencil'></i>{'Set a header'}
+        </ToggleModalButton>
+    );
+}
-- 
cgit v1.2.3-1-g7c22


From b20144db8ec18630cf21cdc4e47c5681f2a67aa0 Mon Sep 17 00:00:00 2001
From: hmhealey <harrisonmhealey@gmail.com>
Date: Thu, 19 Nov 2015 11:59:59 -0500
Subject: Converted GetLinkModal to React-Bootstrap and added
 GetTeamInviteLinkModal

---
 web/react/utils/channel_intro_mssages.jsx | 5 +----
 web/react/utils/constants.jsx             | 3 ++-
 2 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'web/react/utils')

diff --git a/web/react/utils/channel_intro_mssages.jsx b/web/react/utils/channel_intro_mssages.jsx
index 72328f812..70f3e9534 100644
--- a/web/react/utils/channel_intro_mssages.jsx
+++ b/web/react/utils/channel_intro_mssages.jsx
@@ -101,10 +101,7 @@ export function createDefaultIntroMessage(channel) {
             <a
                 className='intro-links'
                 href='#'
-                data-toggle='modal'
-                data-target='#get_link'
-                data-title='Team Invite'
-                data-value={Utils.getWindowLocationOrigin() + '/signup_user_complete/?id=' + team.id}
+                onClick={GetTeamInviteLinkModal.show}
             >
                 <i className='fa fa-user-plus'></i>{'Invite others to this team'}
             </a>
diff --git a/web/react/utils/constants.jsx b/web/react/utils/constants.jsx
index 1ac9a1b98..6281813e9 100644
--- a/web/react/utils/constants.jsx
+++ b/web/react/utils/constants.jsx
@@ -48,7 +48,8 @@ export default {
 
         TOGGLE_IMPORT_THEME_MODAL: null,
         TOGGLE_INVITE_MEMBER_MODAL: null,
-        TOGGLE_DELETE_POST_MODAL: null
+        TOGGLE_DELETE_POST_MODAL: null,
+        TOGGLE_GET_TEAM_INVITE_LINK_MODAL: null
     }),
 
     PayloadSources: keyMirror({
-- 
cgit v1.2.3-1-g7c22


From 388dc6c89c62133c3c5fd1c3bb5ec0327cf5be6d Mon Sep 17 00:00:00 2001
From: hmhealey <harrisonmhealey@gmail.com>
Date: Mon, 23 Nov 2015 10:52:52 -0500
Subject: Moved show static methods out of modals and into EventHelpers

---
 web/react/utils/channel_intro_mssages.jsx | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'web/react/utils')

diff --git a/web/react/utils/channel_intro_mssages.jsx b/web/react/utils/channel_intro_mssages.jsx
index 70f3e9534..6f83778c9 100644
--- a/web/react/utils/channel_intro_mssages.jsx
+++ b/web/react/utils/channel_intro_mssages.jsx
@@ -3,13 +3,12 @@
 
 import * as Utils from './utils.jsx';
 import EditChannelHeaderModal from '../components/edit_channel_header_modal.jsx';
-import GetTeamInviteLinkModal from '../components/get_team_invite_link_modal.jsx';
-import InviteMemberModal from '../components/invite_member_modal.jsx';
 import ToggleModalButton from '../components/toggle_modal_button.jsx';
 import UserProfile from '../components/user_profile.jsx';
 import ChannelStore from '../stores/channel_store.jsx';
 import Constants from '../utils/constants.jsx';
 import TeamStore from '../stores/team_store.jsx';
+import * as EventHelpers from '../dispatcher/event_helpers.jsx';
 
 export function createChannelIntroMessage(channel, showInviteModal) {
     if (channel.type === 'D') {
@@ -91,7 +90,7 @@ export function createDefaultIntroMessage(channel) {
             <a
                 className='intro-links'
                 href='#'
-                onClick={InviteMemberModal.show}
+                onClick={EventHelpers.showInviteMemberModal}
             >
                 <i className='fa fa-user-plus'></i>{'Invite others to this team'}
             </a>
@@ -101,7 +100,7 @@ export function createDefaultIntroMessage(channel) {
             <a
                 className='intro-links'
                 href='#'
-                onClick={GetTeamInviteLinkModal.show}
+                onClick={EventHelpers.showGetTeamInviteLinkModal}
             >
                 <i className='fa fa-user-plus'></i>{'Invite others to this team'}
             </a>
-- 
cgit v1.2.3-1-g7c22