diff --git a/api/controllers/WeiBoController.js b/api/controllers/WeiBoController.js index 8083aea..8eb91df 100644 --- a/api/controllers/WeiBoController.js +++ b/api/controllers/WeiBoController.js @@ -33,7 +33,8 @@ var WeiboController = { console.error(err); } else { console.log(statuses); - res.view(statuses); + res.json(statuses); +// res.view(statuses); } }); } diff --git a/assets/js/message.js b/assets/js/message.js index a38f464..fd7e8cd 100644 --- a/assets/js/message.js +++ b/assets/js/message.js @@ -9,22 +9,30 @@ $(document).ready(function () { var textMessageCount = 1; var timeToShowNextMessage = 1000 * 5; -// /** -// * 为消息显示进度条 -// */ -// function processBar() { -// var flag = 1; -// var int = setInterval(function () { -// var bar = $('.bar'); -// bar.css('width', flag + '%'); -// flag += 100 / (interval / 1000); -// if (flag > 100 - 100 / (interval / 1000)) { -// bar.css('width', '100%'); -// clearInterval(int); -// bar.css('width', '1%'); -// } -// }, 1000); -// } + + /** + * 切换容器中的文字 + * @param container + */ + function slideDiv(container, flag) { + setInterval(function () { + var children = container.children(); + if (flag >= children.length) { + //reset the flag to 0 + flag = 0; + } + //hide all the children nodes + for (var j = 0; j < children.length; j++) { + $(children[j]).hide(); + } + //show the next children nodes + for (var i = flag; i < flag + textMessageCount; i++) { + $(children[i]).show('slow'); + } + //flag +3 + flag = flag + textMessageCount; + }, timeToShowNextMessage); + } /** * 循环显示不同类型的消息 @@ -66,26 +74,8 @@ $(document).ready(function () { content.append(item); } - var flag = textMessageCount; - setInterval(function () { - var children = content.children(); - if (flag >= children.length) { - //reset the flag to 0 - flag = 0; - } - //hide all the children nodes - for (var j = 0; j < children.length; j++) { - $(children[j]).hide(); - } - //show the next children nodes - for (var i = flag; i < flag + textMessageCount; i++) { - $(children[i]).show('slow'); - } - //flag +3 - flag = flag + textMessageCount; - - }, timeToShowNextMessage); + slideDiv(content, textMessageCount); //hide the loading text $('#loading').hide(); }) @@ -95,31 +85,17 @@ $(document).ready(function () { //delay 1 minute to display images setTimeout(function () { - $.get('/message/image',function (json) { + $.get('/message/image', function (json) { var imageContainer = $('.image-content'); for (var i = 0; i < json.length; i++) { - var item = $(''); + var item = $('
'); item.append('