diff options
| author | Reed Garmsen <rgarmsen2295@gmail.com> | 2015-06-18 15:34:23 -0700 |
|---|---|---|
| committer | Reed Garmsen <rgarmsen2295@gmail.com> | 2015-06-18 15:34:23 -0700 |
| commit | 65318de9ae18b4e01d110effaa1576843ccf3b78 (patch) | |
| tree | 54331b168a49f073285e5b69373209e842267ce4 /web/react | |
| parent | a7ed61ef90492dee7f9825b5563ed575d4f60c77 (diff) | |
| download | chat-65318de9ae18b4e01d110effaa1576843ccf3b78.tar.gz chat-65318de9ae18b4e01d110effaa1576843ccf3b78.tar.bz2 chat-65318de9ae18b4e01d110effaa1576843ccf3b78.zip | |
Changed the new messages separator location in the markup to be at the same level as the date seperator
Diffstat (limited to 'web/react')
| -rw-r--r-- | web/react/components/post_list.jsx | 12 | ||||
| -rw-r--r-- | web/react/utils/utils.jsx | 2 |
2 files changed, 6 insertions, 8 deletions
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); diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx index 72ed48faf..8fc25cc61 100644 --- a/web/react/utils/utils.jsx +++ b/web/react/utils/utils.jsx @@ -716,7 +716,7 @@ Image.prototype.load = function(url, progressCallback) { m = h.match( /^Content-Type\:\s*(.*?)$/mi ), mimeType = m[ 1 ] || 'image/png'; - var blob = new Blob([this.response], { type: mimeType }); + var blob = new Blob([this.response.buffer], { type: mimeType }); thisImg.src = window.URL.createObjectURL(blob); }; xmlHTTP.onprogress = function(e) { |