twisterarmy/twister-html
1
0
Fork 0
mirror of https://github.com/twisterarmy/twister-html.git synced 2025-01-27 23:24:26 +00:00
Code Issues Projects Releases Wiki Activity

fix of 'followers' link in peer profile modal

Browse Source
This commit is contained in:
Simon Grim 2016-07-31 02:37:52 +05:00
parent e0a74abae6
commit 50a3ef3272
4 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
home.html
View File

@ -655,7 +655,7 @@
<ul class="module profile-data"> <ul class="module profile-data">
<li><a href="#"><span class="posts-count">&nbsp;</span><span class="label">Posts</span></a></li> <li><a href="#"><span class="posts-count">&nbsp;</span><span class="label">Posts</span></a></li>
<li><a href="#" class="open-following-modal"><span class="following-count">&nbsp;</span><span class="label">Following</span></a></li> <li><a href="#" class="open-following-modal"><span class="following-count">&nbsp;</span><span class="label">Following</span></a></li>
<li><a href="#"><span class="followers-count">&nbsp;</span><span class="label">Followers</span></a></li> <li><a class="open-followers"><span class="followers-count">&nbsp;</span><span class="label">Followers</span></a></li>
</ul> </ul>
</div> </div>
<div class="profile-card-buttons b-buttons"> <div class="profile-card-buttons b-buttons">

12
js/interface_common.js
View File

@ -449,6 +449,8 @@ function openUserProfileModalWithNameHandler(peerAlias) {
content.find('.tox-ctc').attr('title', polyglot.t('Copy to clipboard')); content.find('.tox-ctc').attr('title', polyglot.t('Copy to clipboard'));
content.find('.bitmessage-ctc').attr('title', polyglot.t('Copy to clipboard')); content.find('.bitmessage-ctc').attr('title', polyglot.t('Copy to clipboard'));
content.find('.open-followers').on('mouseup', {route: '#followers?user=' + peerAlias}, routeOnClick);
var modal = openModal({ var modal = openModal({
classAdd: 'profile-modal', classAdd: 'profile-modal',
content: content, content: content,
@ -952,7 +954,7 @@ function applyShortenedURI(short, uriAndMimetype) {
previewContainer.append(startTorrentLink); previewContainer.append(startTorrentLink);
} }
} else { } else {
var enableWebTorrentWarning = $('<span>' + var enableWebTorrentWarning = $('<span>' +
polyglot.t('Enable WebTorrent support in options page to display this content') + polyglot.t('Enable WebTorrent support in options page to display this content') +
'</span>'); '</span>');
previewContainer.append(enableWebTorrentWarning); previewContainer.append(enableWebTorrentWarning);
@ -972,7 +974,7 @@ function startTorrentDownloadAndPreview(torrentId, previewContainer, isMedia) {
function _startTorrentDownloadAndPreview(torrentId, previewContainer, isMedia) { function _startTorrentDownloadAndPreview(torrentId, previewContainer, isMedia) {
var torrent = WebTorrentClient.get(torrentId); var torrent = WebTorrentClient.get(torrentId);
if( torrent === null ) if( torrent === null )
torrent = WebTorrentClient.add(torrentId); torrent = WebTorrentClient.add(torrentId);
previewContainer.empty(); previewContainer.empty();
@ -1003,7 +1005,7 @@ function webtorrentFilePreview(file, previewContainer, isMedia) {
// try guessing by filename extension // try guessing by filename extension
isMedia = /^[^?]+\.(?:jpe?g|gif|png|mp4|webm|mp3|ogg|wav|)$/i.test(file.name) isMedia = /^[^?]+\.(?:jpe?g|gif|png|mp4|webm|mp3|ogg|wav|)$/i.test(file.name)
} }
if (isMedia) { if (isMedia) {
var imagePreview = $('<div class="image-preview" />'); var imagePreview = $('<div class="image-preview" />');
previewContainer.append(imagePreview); previewContainer.append(imagePreview);
@ -1724,7 +1726,7 @@ function replyTextUpdateRemaining(ta) {
return false; return false;
} }
}); });
if (!disable && c >= 0 && c < $.Options.MaxPostEditorChars.val && if (!disable && c >= 0 && c < $.Options.MaxPostEditorChars.val &&
textArea.val() !== textArea.attr('data-reply-to')) { textArea.val() !== textArea.attr('data-reply-to')) {
remainingCount.removeClass('warn'); remainingCount.removeClass('warn');
$.MAL.enableButton(buttonSend); $.MAL.enableButton(buttonSend);
@ -2354,7 +2356,7 @@ function initInterfaceCommon() {
closePrompt(event); closePrompt(event);
}); });
$('.open-followers').on('mouseup', {route: '#followers'}, routeOnClick); $('.module.mini-profile .open-followers').on('mouseup', {route: '#followers'}, routeOnClick);
$('.post-text').on('click', 'a', muteEvent); $('.post-text').on('click', 'a', muteEvent);
$('.post-reply').on('click', postReplyClick); $('.post-reply').on('click', postReplyClick);

3
js/twister_following.js
View File

@ -145,7 +145,8 @@ TwisterFollowing.prototype = {
.find('li[data-peer-alias="' + args.fu + '"]').remove(); .find('li[data-peer-alias="' + args.fu + '"]').remove();
} }
} }
$(".open-followers").attr("title", args.tf.knownFollowers.length.toString()); $('.module.mini-profile .open-followers')
.attr('title', args.tf.knownFollowers.length.toString());
var ctime = new Date().getTime() / 1000; var ctime = new Date().getTime() / 1000;
if (typeof(args.tf.followingsFollowings[args.fu]) === 'undefined' || if (typeof(args.tf.followingsFollowings[args.fu]) === 'undefined' ||

6
js/twister_io.js
View File

@ -279,7 +279,8 @@ function getFullname(peerAlias, elem) {
twisterFollowingO.knownFollowers.push(req.peerAlias); twisterFollowingO.knownFollowers.push(req.peerAlias);
twisterFollowingO.save(); twisterFollowingO.save();
addPeerToFollowersList(getElem('.followers-modal .followers-list'), req.peerAlias, true); addPeerToFollowersList(getElem('.followers-modal .followers-list'), req.peerAlias, true);
$('.open-followers').attr('title', twisterFollowingO.knownFollowers.length.toString()); $('.module.mini-profile .open-followers')
.attr('title', twisterFollowingO.knownFollowers.length.toString());
} }
req.elem.addClass('isFollowing'); req.elem.addClass('isFollowing');
req.elem.attr('title', polyglot.t('follows you')); req.elem.attr('title', polyglot.t('follows you'));
@ -291,7 +292,8 @@ function getFullname(peerAlias, elem) {
if (twisterFollowingO.knownFollowers.indexOf(req.peerAlias) === -1) { if (twisterFollowingO.knownFollowers.indexOf(req.peerAlias) === -1) {
twisterFollowingO.knownFollowers.push(req.peerAlias); twisterFollowingO.knownFollowers.push(req.peerAlias);
addPeerToFollowersList(getElem('.followers-modal .followers-list'), req.peerAlias, true); addPeerToFollowersList(getElem('.followers-modal .followers-list'), req.peerAlias, true);
$('.open-followers').attr('title', twisterFollowingO.knownFollowers.length.toString()); $('.module.mini-profile .open-followers')
.attr('title', twisterFollowingO.knownFollowers.length.toString());
} }
req.elem.addClass('isFollowing'); req.elem.addClass('isFollowing');
req.elem.attr('title', polyglot.t('follows you')); req.elem.attr('title', polyglot.t('follows you'));