From 483b37a64f978db84cd0d128665d2c79775c6e60 Mon Sep 17 00:00:00 2001 From: Reed Garmsen Date: Wed, 1 Jul 2015 16:51:26 -0700 Subject: 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. --- web/react/components/loading_posts.jsx | 3 --- web/react/components/post_list.jsx | 17 +++++++++++++++-- 2 files changed, 15 insertions(+), 5 deletions(-) delete mode 100644 web/react/components/loading_posts.jsx (limited to 'web') diff --git a/web/react/components/loading_posts.jsx b/web/react/components/loading_posts.jsx deleted file mode 100644 index f6d859954..000000000 --- a/web/react/components/loading_posts.jsx +++ /dev/null @@ -1,3 +0,0 @@ -// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved. -// See License.txt for license information. - diff --git a/web/react/components/post_list.jsx b/web/react/components/post_list.jsx index ad8cfa20f..a860804cc 100644 --- a/web/react/components/post_list.jsx +++ b/web/react/components/post_list.jsx @@ -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( +
+
+

Loading

+
+
+
+
+
+ ); + } + return (
-- cgit v1.2.3-1-g7c22