olinpin/twitter-project
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into ResponsiveCSS

Browse Source
This commit is contained in:
Tim Wijma
2022-11-02 11:48:17 +01:00
parent e679b95913 c31d514753
commit 98d0cf2c74
1 changed files with 0 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
dashboard_static/lib/tweets.js
View File

@@ -71,54 +71,11 @@ block.fn.tweets = function(config) {
memory: 100 memory: 100
}, config); }, config);
<<<<<<< Updated upstream:template_static/lib/tweets.js
// create the necessary HTML in the block container
//this.$element.append('<ol class="tweet-list stream-items"></ol>');
=======
>>>>>>> Stashed changes:dashboard_static/lib/tweets.js
// store list for later // store list for later
var $list = $("div.tweetcontainer"); var $list = $("div.tweetcontainer");
// register default handler for handling tweet data // register default handler for handling tweet data
this.actions(function(e, tweet){ this.actions(function(e, tweet){
<<<<<<< Updated upstream:template_static/lib/tweets.js
var $item = $('<li class="stream-item"></li>');
var $tweet = $('<div class="tweet"></div>');
var $content = $('<div class="content"></div>');
var $header = $('<div class="stream-item-header"></div>');
// Build a tag image and header:
var $account = $('<a class="account-group"></a>');
$account.attr("href", "http://twitter.com/" + tweet.user.screen_name);
var $avatar = $("<img>").addClass("avatar");
$avatar.attr("src", tweet.user.profile_image_url);
$account.append($avatar);
$account.append($('<strong class="fullname">' + tweet.user.name + '</strong>'));
$account.append($('<span>&nbsp;</span>'));
$account.append($('<span class="username"><s>@</s><b>' + tweet.user.screen_name + '</b></span>'));
$header.append($account);
// Build timestamp:
var $time = $('<small class="time"></small>');
$time.append($('<span>' + tweet.created_at + '</span>'));
$header.append($time);
$content.append($header);
// Build contents:
var text = process_entities(tweet.text, tweet.entities);
var $text = $('<p class="tweet-text">' + text + '</p>');
$content.append($text);
// Build outer structure of containing divs:
$tweet.append($content);
$item.append($tweet);
// place new tweet in front of list
=======
tweets = window.sessionStorage.getItem('tweets'); tweets = window.sessionStorage.getItem('tweets');
tweets = JSON.parse(tweets); tweets = JSON.parse(tweets);
tweets.push(tweet); tweets.push(tweet);
@@ -128,7 +85,6 @@ block.fn.tweets = function(config) {
window.sessionStorage.setItem('tweets', JSON.stringify(tweets)); window.sessionStorage.setItem('tweets', JSON.stringify(tweets));
var $item = tweetCell(tweet) var $item = tweetCell(tweet)
>>>>>>> Stashed changes:dashboard_static/lib/tweets.js
$list.prepend($item); $list.prepend($item);
// remove stale tweets // remove stale tweets