IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Added logic for loading animation to appear when posts have yet to be loaded. Added markup necessary for loading animation css. Removed a file that was no longer needed for the design.

Browse Source
This commit is contained in:
Reed Garmsen
2015-07-01 16:51:26 -07:00
parent d5d9481c0f
commit 483b37a64f
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
web/react/components/loading_posts.jsx
View File

@@ -1,3 +0,0 @@
// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
// See License.txt for license information.

17
web/react/components/post_list.jsx
View File

@@ -295,7 +295,7 @@ module.exports = React.createClass({
},
render: function() {
var order = [];
var posts = {};
var posts;
var last_viewed = Number.MAX_VALUE;
@@ -408,7 +408,7 @@ module.exports = React.createClass({
}
var postCtls = [];
var previousPostDay = posts[order[order.length-1]] ? utils.getDateForUnixTicks(posts[order[order.length-1]].create_at): new Date();
var previousPostDay = posts && posts[order[order.length-1]] ? utils.getDateForUnixTicks(posts[order[order.length-1]].create_at): new Date();
var currentPostDay = new Date();
for (var i = order.length-1; i >= 0; i--) {
@@ -459,6 +459,19 @@ module.exports = React.createClass({
previousPostDay = utils.getDateForUnixTicks(post.create_at);
}
if (posts == undefined) {
postCtls.push(
<div ref="loadingscreen" className="loading-screen">
<div className="loading__content">
<h3>Loading</h3>
<div id="round_1" className="round"></div>
<div id="round_2" className="round"></div>
<div id="round_3" className="round"></div>
</div>
</div>
);
}
return (
<div ref="postlist" className="post-list-holder-by-time">
<div className="post-list__table">