From 65318de9ae18b4e01d110effaa1576843ccf3b78 Mon Sep 17 00:00:00 2001
From: Reed Garmsen <rgarmsen2295@gmail.com>
Date: Thu, 18 Jun 2015 15:34:23 -0700
Subject: Changed the new messages separator location in the markup to be at
 the same level as the date seperator

---
 web/react/components/post_list.jsx | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'web/react/components/post_list.jsx')

diff --git a/web/react/components/post_list.jsx b/web/react/components/post_list.jsx
index 65247b705..47ecc1680 100644
--- a/web/react/components/post_list.jsx
+++ b/web/react/components/post_list.jsx
@@ -444,13 +444,11 @@ module.exports = React.createClass({
             if (post.create_at > last_viewed && !rendered_last_viewed) {
                 rendered_last_viewed = true;
                 postCtls.push(
-                    <div>
-                        <div className="new-seperator">
-                            <hr id="new_message" className="new-seperator__hr" />
-                            <div className="new-seperator__text">New Messages</div>
-                         </div>
-                         {postCtl}
-                     </div>
+                    <div className="new-seperator">
+                        <hr id="new_message" className="new-seperator__hr" />
+                        <div className="new-seperator__text">New Messages</div>
+                        {postCtl}
+                    </div>
                 );
             } else {
                 postCtls.push(postCtl);
-- 
cgit v1.2.3-1-g7c22


From 32025e43799324523988af040085d95ec6b6e80e Mon Sep 17 00:00:00 2001
From: Reed Garmsen <rgarmsen2295@gmail.com>
Date: Thu, 18 Jun 2015 11:46:40 -0700
Subject: Removed extraneous post control from within new message separator

---
 web/react/components/post_list.jsx | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'web/react/components/post_list.jsx')

diff --git a/web/react/components/post_list.jsx b/web/react/components/post_list.jsx
index 47ecc1680..97f9fa943 100644
--- a/web/react/components/post_list.jsx
+++ b/web/react/components/post_list.jsx
@@ -447,12 +447,10 @@ module.exports = React.createClass({
                     <div className="new-seperator">
                         <hr id="new_message" className="new-seperator__hr" />
                         <div className="new-seperator__text">New Messages</div>
-                        {postCtl}
                     </div>
                 );
-            } else {
-                postCtls.push(postCtl);
             }
+            postCtls.push(postCtl);
             previousPostDay = utils.getDateForUnixTicks(post.create_at);
         }
 
-- 
cgit v1.2.3-1-g7c22


From e454cf54fa500594ff77a7869754b38345393435 Mon Sep 17 00:00:00 2001
From: Asaad Mahmood <Unknowngi@live.com>
Date: Sun, 28 Jun 2015 20:53:26 +0500
Subject: MM-1253 - Fixing new message and date separator corner case

---
 web/react/components/post_list.jsx | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'web/react/components/post_list.jsx')

diff --git a/web/react/components/post_list.jsx b/web/react/components/post_list.jsx
index 97f9fa943..37e3faef2 100644
--- a/web/react/components/post_list.jsx
+++ b/web/react/components/post_list.jsx
@@ -125,12 +125,12 @@ module.exports = React.createClass({
 
         $('body').on('mouseenter mouseleave', '.post', function(ev){
             if(ev.type === 'mouseenter'){
-                $(this).parent('div').prev('.date-seperator').addClass('hovered--after');
-                $(this).parent('div').next('.date-seperator').addClass('hovered--before');
+                $(this).parent('div').prev('.date-separator, .new-separator').addClass('hovered--after');
+                $(this).parent('div').next('.date-separator, .new-separator').addClass('hovered--before');
             }
             else {
-                $(this).parent('div').prev('.date-seperator').removeClass('hovered--after');
-                $(this).parent('div').next('.date-seperator').removeClass('hovered--before');
+                $(this).parent('div').prev('.date-separator, .new-separator').removeClass('hovered--after');
+                $(this).parent('div').next('.date-separator, .new-separator').removeClass('hovered--before');
             }
         });
 
@@ -389,7 +389,7 @@ module.exports = React.createClass({
                         <div className="channel-intro">
                             <h4 className="channel-intro-title">Welcome</h4>
                             <p>
-                                { creator_name != "" ? "This is the start of the " + ui_name + " " + ui_type + ", created by " + creator_name + " on " + utils.displayDate(channel.create_at) + "." 
+                                { creator_name != "" ? "This is the start of the " + ui_name + " " + ui_type + ", created by " + creator_name + " on " + utils.displayDate(channel.create_at) + "."
                                 : "This is the start of the " + ui_name + " " + ui_type + ", created on "+ utils.displayDate(channel.create_at) + "." }
                                 { channel.type === 'P' ? " Only invited members can see this private group." : " Any member can join and read this channel." }
                                 <br/>
@@ -434,9 +434,9 @@ module.exports = React.createClass({
             currentPostDay = utils.getDateForUnixTicks(post.create_at);
             if(currentPostDay.getDate() !== previousPostDay.getDate() || currentPostDay.getMonth() !== previousPostDay.getMonth() || currentPostDay.getFullYear() !== previousPostDay.getFullYear()) {
                 postCtls.push(
-                    <div className="date-seperator">
-                        <hr className="date-seperator__hr" />
-                        <div className="date-seperator__text">{currentPostDay.toDateString()}</div>
+                    <div className="date-separator">
+                        <hr className="separator__hr" />
+                        <div className="separator__text">{currentPostDay.toDateString()}</div>
                     </div>
                 );
             }
@@ -444,9 +444,9 @@ module.exports = React.createClass({
             if (post.create_at > last_viewed && !rendered_last_viewed) {
                 rendered_last_viewed = true;
                 postCtls.push(
-                    <div className="new-seperator">
-                        <hr id="new_message" className="new-seperator__hr" />
-                        <div className="new-seperator__text">New Messages</div>
+                    <div className="new-separator">
+                        <hr id="new_message" className="separator__hr" />
+                        <div className="separator__text">New Messages</div>
                     </div>
                 );
             }
-- 
cgit v1.2.3-1-g7c22

