twisterarmy
/
twister-html
mirror of https://github.com/twisterarmy/twister-html.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge pull request #312 from slr/tasty-group-messages 

ability to change DM's group description
master
miguelfreitas 9 years ago
parent
d84e056720 1afe26afb3
commit
2f0cfec631
11 changed files with 204 additions and 27 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      css/profile.css
  2. 25
      css/style.css
  3. 6
      following.html
  4. 6
      home.html
  5. 70
      js/interface_common.js
  6. 4
      js/mobile_abstract.js
  7. 23
      js/twister_directmsg.js
  8. 5
      js/twister_formatpost.js
  9. 21
      theme_calm/css/profile.css
  10. 30
      theme_calm/css/style.css
  11. 21
      theme_nin/css/style.css

20
css/profile.css
Unescape View File

@ -293,6 +293,26 @@ h2.profile-screen-name {
display: block; display: block;
} }
.profile-card .profile-bio .group-description {
color: #fff;
background: rgba(0, 0, 0, 0);
border: none;
text-align: center;
padding: 4px;
vertical-align: middle;
}
.profile-card .profile-bio .group-description:focus,
.profile-card .profile-bio .group-description:hover {
color: #fff;
background: rgba(0, 0, 0, .5);
}
.profile-card .profile-bio .save, .profile-card .profile-bio .cancel {
display: none;
margin-left: 2px;
}
.group-messages-control .invite-form, .group-messages-control .secret-key { .group-messages-control .invite-form, .group-messages-control .secret-key {
display: none; display: none;
font-size: 12px; font-size: 12px;

25
css/style.css
Unescape View File

@ -147,6 +147,31 @@ button.follow:hover, button.unfollow:hover, .following-list button.private:hover
margin-right: 10px; margin-right: 10px;
} }
.a-button {
color: dimgrey;
background-color: whitesmoke;
border: none;
font-size: 12px;
text-align: center;
width: auto;
padding: 4px 12px;
vertical-align: middle;
transition: all .1s linear;
}
.a-button:hover {
color: #000;
background: #fff;
}
.a-button:disabled {
opacity: .9;
}
.a-button:disabled:hover {
color: dimgrey;
}
.b-buttons { .b-buttons {
text-align: right; text-align: right;
padding: 4px; padding: 4px;

6
following.html
Unescape View File

@ -424,7 +424,11 @@
<div id="group-profile-modal-template"> <div id="group-profile-modal-template">
<div class="profile-card" data-screen-name=""> <div class="profile-card" data-screen-name="">
<div class="profile-card-main"> <div class="profile-card-main">
<div class="profile-bio"></div> <div class="profile-bio">
<input class="group-description"></input>
<button class="save a-button" disabled="disabled">Save</button>
<button class="cancel a-button">Cancel</button>
</div>
</div> </div>
<div class="profile-card-buttons group-messages-control b-buttons"> <div class="profile-card-buttons group-messages-control b-buttons">
<button class="direct-messages-with-user" disabled="disabled">Messages</button> <button class="direct-messages-with-user" disabled="disabled">Messages</button>

6
home.html
Unescape View File

@ -516,7 +516,11 @@
<div id="group-profile-modal-template"> <div id="group-profile-modal-template">
<div class="profile-card" data-screen-name=""> <div class="profile-card" data-screen-name="">
<div class="profile-card-main"> <div class="profile-card-main">
<div class="profile-bio"></div> <div class="profile-bio">
<input class="group-description"></input>
<button class="save a-button" disabled="disabled">Save</button>
<button class="cancel a-button">Cancel</button>
</div>
</div> </div>
<div class="profile-card-buttons group-messages-control b-buttons"> <div class="profile-card-buttons group-messages-control b-buttons">
<button class="direct-messages-with-user" disabled="disabled">Messages</button> <button class="direct-messages-with-user" disabled="disabled">Messages</button>

70
js/interface_common.js
Unescape View File

@ -154,7 +154,10 @@ function openGroupProfileModalWithNameHandler(groupAlias) {
groupMsgGetGroupInfo(groupAlias, groupMsgGetGroupInfo(groupAlias,
function(req, ret) { function(req, ret) {
if (ret) { if (ret) {
req.modal.content.find('.profile-bio').text(ret.description); req.modal.content.find('.profile-bio .group-description')
.val(ret.description)
.attr('val-origin', ret.description)
;
if (ret.members.indexOf(defaultScreenName) !== -1) if (ret.members.indexOf(defaultScreenName) !== -1)
req.modal.content.find('.group-messages-control').children('button').attr('disabled', false); req.modal.content.find('.group-messages-control').children('button').attr('disabled', false);
@ -476,7 +479,7 @@ function reTwistPopup(event, post, textArea) {
} }
if (typeof post === 'undefined') if (typeof post === 'undefined')
post = $.evalJSON($(event.target).parents('.post-data').attr('data-userpost')); post = $.evalJSON($(event.target).closest('.post-data').attr('data-userpost'));
var modal = openModal({ var modal = openModal({
classBase: '.prompt-wrapper', classBase: '.prompt-wrapper',
@ -492,7 +495,7 @@ function reTwistPopup(event, post, textArea) {
modal.content.find('.switch-mode') modal.content.find('.switch-mode')
.text(polyglot.t('Switch to Reply')) .text(polyglot.t('Switch to Reply'))
.on('click', (function(event) {replyInitPopup(event, post, .on('click', (function(event) {replyInitPopup(event, post,
$(event.target).parents('form').find('textarea').detach());}).bind(post)) $(event.target).closest('form').find('textarea').detach());}).bind(post))
; ;
var replyArea = modal.content.find('.post-area .post-area-new'); var replyArea = modal.content.find('.post-area .post-area-new');
@ -530,7 +533,7 @@ function replyInitPopup(e, post, textArea) {
modal.content.find('.switch-mode') modal.content.find('.switch-mode')
.text(polyglot.t('Switch to Retransmit')) .text(polyglot.t('Switch to Retransmit'))
.on('click', (function(event) {reTwistPopup(event, post, .on('click', (function(event) {reTwistPopup(event, post,
$(event.target).parents('form').find('textarea').detach())}).bind(post)) $(event.target).closest('form').find('textarea').detach())}).bind(post))
; ;
var replyArea = modal.content.find('.post-area .post-area-new').addClass('open'); var replyArea = modal.content.find('.post-area .post-area-new').addClass('open');
@ -658,7 +661,7 @@ function postReplyClick(e) {
if (!post.hasClass('original')) if (!post.hasClass('original'))
replyInitPopup(e, $.evalJSON(post.find('.post-data').attr('data-userpost'))); replyInitPopup(e, $.evalJSON(post.find('.post-data').attr('data-userpost')));
else { else {
if (!post.parents('.post.open').length) if (!post.closest('.post.open').length)
postExpandFunction(e, post); postExpandFunction(e, post);
composeNewPost(e, post.find('.post-area-new')); composeNewPost(e, post.find('.post-area-new'));
} }
@ -740,12 +743,12 @@ var usePostSpliting = false;
function replyTextInput(event) { function replyTextInput(event) {
var textArea = $(event.target); var textArea = $(event.target);
var textAreaForm = textArea.parents('form'); var textAreaForm = textArea.closest('form');
if (textAreaForm.length) { if (textAreaForm.length) {
if ($.Options.unicodeConversion.val !== 'disable') if ($.Options.unicodeConversion.val !== 'disable')
textArea.val(convert2Unicodes(textArea.val(), textArea)); textArea.val(convert2Unicodes(textArea.val(), textArea));
if (usePostSpliting && !textArea.parents('.directMessages').length) { if (usePostSpliting && !textArea.closest('.directMessages').length) {
var caretPos = textArea.caret(); var caretPos = textArea.caret();
var reply_to = textArea.attr('data-reply-to'); var reply_to = textArea.attr('data-reply-to');
var tas = textAreaForm.find('textarea'); var tas = textAreaForm.find('textarea');
@ -872,12 +875,12 @@ function replyTextUpdateRemaining(ta) {
ta = ta.target; ta = ta.target;
if (ta === document.activeElement) { if (ta === document.activeElement) {
var textArea = $(ta); var textArea = $(ta);
var textAreaForm = textArea.parents('form'); var textAreaForm = textArea.closest('form');
if (textAreaForm.length) { if (textAreaForm.length) {
var remainingCount = textAreaForm.find('.post-area-remaining'); var remainingCount = textAreaForm.find('.post-area-remaining');
var c = replyTextCountRemaining(ta); var c = replyTextCountRemaining(ta);
if (usePostSpliting && !textArea.parents('.directMessages').length && splitedPostsCount > 1) if (usePostSpliting && !textArea.closest('.directMessages').length && splitedPostsCount > 1)
remainingCount.text((textAreaForm.find('textarea').index(ta) + 1).toString() remainingCount.text((textAreaForm.find('textarea').index(ta) + 1).toString()
+ '/' + splitedPostsCount.toString() + ': ' + c.toString()); + '/' + splitedPostsCount.toString() + ': ' + c.toString());
else else
@ -910,8 +913,8 @@ function replyTextCountRemaining(ta) {
var textArea = $(ta); var textArea = $(ta);
var c; var c;
if (usePostSpliting && !textArea.parents('.directMessages').length && splitedPostsCount > 1) { if (usePostSpliting && !textArea.closest('.directMessages').length && splitedPostsCount > 1) {
c = 140 - ta.value.length - (textArea.parents('form').find('textarea').index(ta) + 1).toString().length - splitedPostsCount.toString().length - 4; c = 140 - ta.value.length - (textArea.closest('form').find('textarea').index(ta) + 1).toString().length - splitedPostsCount.toString().length - 4;
var reply_to = textArea.attr('data-reply-to'); var reply_to = textArea.attr('data-reply-to');
if (typeof reply_to !== 'undefined' && if (typeof reply_to !== 'undefined' &&
!checkPostForMentions(ta.value, reply_to, 140 -c -reply_to.length)) !checkPostForMentions(ta.value, reply_to, 140 -c -reply_to.length))
@ -928,7 +931,7 @@ function replyTextKeySend(event) {
$('.dropdown-menu').css('display') === 'none') $('.dropdown-menu').css('display') === 'none')
|| ((event.metaKey || event.ctrlKey) && $.Options.keysSend.val === 'ctrlenter')) { || ((event.metaKey || event.ctrlKey) && $.Options.keysSend.val === 'ctrlenter')) {
var textArea = $(event.target); var textArea = $(event.target);
var textAreaForm = textArea.parents('form'); var textAreaForm = textArea.closest('form');
var buttonSend = textAreaForm.find('.post-submit'); var buttonSend = textAreaForm.find('.post-submit');
if (!buttonSend.length) if (!buttonSend.length)
buttonSend = textAreaForm.find('.dm-submit'); buttonSend = textAreaForm.find('.dm-submit');
@ -1410,11 +1413,11 @@ function postSubmit(e, oldLastPostId) {
return; return;
} }
if (btnPostSubmit.parents('.prompt-wrapper').length) if (btnPostSubmit.closest('.prompt-wrapper').length)
closePrompt(); closePrompt();
else { else {
textArea.val('').attr('placeholder', polyglot.t('Your message was sent!')); textArea.val('').attr('placeholder', polyglot.t('Your message was sent!'));
var tweetForm = btnPostSubmit.parents('form'); var tweetForm = btnPostSubmit.closest('form');
var remainingCount = tweetForm.find('.post-area-remaining'); var remainingCount = tweetForm.find('.post-area-remaining');
remainingCount.text(140); remainingCount.text(140);
@ -1567,6 +1570,39 @@ function initInterfaceCommon() {
replaceDashboards(); replaceDashboards();
$(window).resize(replaceDashboards); $(window).resize(replaceDashboards);
$('.profile-card .profile-bio .group-description')
.on('focus', function (event) {
$(event.target)
.siblings('.save').show()
.siblings('.cancel').show()
;
})
.on('input',
{parentSelector: '.profile-bio', enterSelector: '.save'}, inputEnterActivator)
.siblings('.save').on('click', function (event) {
var elemEvent = $(event.target);
var descElem = elemEvent.siblings('.group-description');
groupMsgSetGroupDescription(elemEvent.closest('.profile-card').attr('data-screen-name'),
descElem.val().trim(),
function(req) {
req.descElem.attr('val-origin', req.descElem.val().trim())
.siblings('.save').hide()
.siblings('.cancel').hide()
;
}, {descElem: descElem}
);
})
.siblings('.cancel').on('click', function (event) { // FIXME it would be nice to bind some 'clickoutside' event instead and remove cancel button, but current implementation of that doesn't unbind events when element dies
var descElem = $(event.target).hide()
.siblings('.save').hide()
.siblings('.group-description')
;
descElem.val(descElem.attr('val-origin'));
})
;
$('.tox-ctc').on('click', promptCopyAttrData); $('.tox-ctc').on('click', promptCopyAttrData);
$('.bitmessage-ctc').on('click', promptCopyAttrData); $('.bitmessage-ctc').on('click', promptCopyAttrData);
@ -1603,7 +1639,7 @@ function elemFitNextIntoParentHeight(elem) {
function inputEnterActivator(event) { function inputEnterActivator(event) {
var elemEvent = $(event.target); var elemEvent = $(event.target);
elemEvent.parents(event.data.parentSelector).find(event.data.enterSelector) elemEvent.closest(event.data.parentSelector).find(event.data.enterSelector)
.attr('disabled', elemEvent.val().trim() === ''); .attr('disabled', elemEvent.val().trim() === '');
} }
@ -1616,7 +1652,7 @@ function setTextcompleteOnEventTarget(event) {
function setTextcompleteOnElement(elem, req) { function setTextcompleteOnElement(elem, req) {
elem = $(elem); elem = $(elem);
elem.textcomplete(req, { elem.textcomplete(req, {
appendTo: (elem.parents('.dashboard').length) ? elem.parent() : $('body'), appendTo: (elem.closest('.dashboard').length) ? elem.parent() : $('body'),
listPosition: setTextcompleteDropdownListPos listPosition: setTextcompleteDropdownListPos
}); });
} }
@ -1630,7 +1666,7 @@ function unsetTextcompleteOnEventTarget(event) {
function setTextcompleteDropdownListPos(position) { function setTextcompleteDropdownListPos(position) {
position = this._applyPlacement(position); position = this._applyPlacement(position);
if (this.option.appendTo.parents('.dashboard').length > 0) { if (this.option.appendTo.closest('.dashboard').length > 0) {
position.position = 'fixed'; position.position = 'fixed';
position.top = (parseFloat(position.top) - window.pageYOffset).toString() + 'px'; position.top = (parseFloat(position.top) - window.pageYOffset).toString() + 'px';
} else } else

4
js/mobile_abstract.js
Unescape View File

@ -47,7 +47,7 @@ var MAL = function()
$dmChatList.listview('refresh'); $dmChatList.listview('refresh');
$.mobile.silentScroll( $(".dm-form").offset().top ); $.mobile.silentScroll( $(".dm-form").offset().top );
} else { } else {
var modalContent = dmConvo.parents(".modal-content"); var modalContent = dmConvo.closest(".modal-content");
modalContent.scrollTop(modalContent[0].scrollHeight); modalContent.scrollTop(modalContent[0].scrollHeight);
} }
} }
@ -498,7 +498,7 @@ var MAL = function()
if ($.hasOwnProperty('mobile')) { if ($.hasOwnProperty('mobile')) {
return postLi.siblings().length; return postLi.siblings().length;
} else { } else {
return postLi.parents('.module.post.original.open').find('.post.related').length; return postLi.closest('.module.post.original.open').find('.post.related').length;
} }
}; };
} }

23
js/twister_directmsg.js
Unescape View File

@ -270,7 +270,7 @@ function openGroupMessagesNewGroupModal() {
; ;
modal.content.find('.create').on('click', function (event) { modal.content.find('.create').on('click', function (event) {
var elemEvent = $(event.target); var elemEvent = $(event.target);
var elemForm = elemEvent.parents('.module') var elemForm = elemEvent.closest('.module');
var peersToInvite = elemForm.find('.invite').val().toLowerCase().match(/@\w+/g); var peersToInvite = elemForm.find('.invite').val().toLowerCase().match(/@\w+/g);
if (peersToInvite) if (peersToInvite)
@ -307,9 +307,9 @@ function openGroupMessagesJoinGroupModal() {
.attr('data-screen-name', groupChatAliases[i]) .attr('data-screen-name', groupChatAliases[i])
.on('click', function (event) { .on('click', function (event) {
var elemEvent = $(event.target); var elemEvent = $(event.target);
elemEvent.parents('.module').find('.join') elemEvent.closest('.module').find('.join')
.attr('disabled', .attr('disabled',
!elemEvent.parents('.groups-list').find('input:checked').length); !elemEvent.closest('.groups-list').find('input:checked').length);
}) })
; ;
item.find('.twister-user-name') item.find('.twister-user-name')
@ -325,7 +325,7 @@ function openGroupMessagesJoinGroupModal() {
modal.content.find('.join').on('click', function (event) { modal.content.find('.join').on('click', function (event) {
var elemEvent = $(event.target); var elemEvent = $(event.target);
var groups = elemEvent.parents('.module').find('.groups-list input:checked'); var groups = elemEvent.closest('.module').find('.groups-list input:checked');
for (var i = 0; i < groups.length; i++) for (var i = 0; i < groups.length; i++)
groupMsgInviteToGroup(groups[i].getAttribute('data-screen-name'), [defaultScreenName]); groupMsgInviteToGroup(groups[i].getAttribute('data-screen-name'), [defaultScreenName]);
@ -335,7 +335,7 @@ function openGroupMessagesJoinGroupModal() {
modal.content.find('.secret-key-import, .username-import').on('input', importSecretKeypress); modal.content.find('.secret-key-import, .username-import').on('input', importSecretKeypress);
modal.content.find('.import-secret-key').on('click', function (event) { modal.content.find('.import-secret-key').on('click', function (event) {
var elemModule = $(event.target).parents('.module'); var elemModule = $(event.target).closest('.module');
var groupAlias = elemModule.find('.username-import').val().toLowerCase(); var groupAlias = elemModule.find('.username-import').val().toLowerCase();
var secretKey = elemModule.find('.secret-key-import').val(); var secretKey = elemModule.find('.secret-key-import').val();
@ -392,6 +392,17 @@ function doGroupMsgInviteToGroup() {
); );
} }
function groupMsgSetGroupDescription(groupAlias, description, cbFunc, cbArgs) {
twisterRpc('newgroupdescription',
[defaultScreenName, lastPostId + 1, groupAlias, description],
function (req) {
incLastPostId();
req.cbFunc(req.cbArgs);
}, {cbFunc: cbFunc, cbArgs: cbArgs},
function(req, ret) {alert(polyglot.t('error', {error: 'can\'t set group description — ' + ret.message}));}, null
);
}
function groupMsgLeaveGroup(groupAlias, cbFunc, cbArgs) { function groupMsgLeaveGroup(groupAlias, cbFunc, cbArgs) {
twisterRpc('leavegroup', [defaultScreenName, groupAlias], twisterRpc('leavegroup', [defaultScreenName, groupAlias],
cbFunc, cbArgs, cbFunc, cbArgs,
@ -479,7 +490,7 @@ function initInterfaceDirectMsg() {
peersToInvite); peersToInvite);
elemInput.val(''); elemInput.val('');
elemEvent.parents('.invite-form').toggle(); elemEvent.closest('.invite-form').toggle();
// TODO reload group members list // TODO reload group members list
}); });

5
js/twister_formatpost.js
Unescape View File

@ -603,6 +603,11 @@ function htmlFormatMsg(msg) {
return msg.str; return msg.str;
} }
if (!msg) {
console.warn('htmlFormatMsg() error: input string is empty');
return {html: '', mentions: []};
}
var mentionsChars = 'abcdefghijklmnopqrstuvwxyz_0123456789'; var mentionsChars = 'abcdefghijklmnopqrstuvwxyz_0123456789';
var stopCharsTrailing = '/\\*~_-`.,:;?!%\'"[](){}^|«»…\u201C\u201D\u2026\u2014\u4E00\u3002\uFF0C\uFF1A\uFF1F\uFF01\u3010\u3011\u2047\u2048\u2049'; var stopCharsTrailing = '/\\*~_-`.,:;?!%\'"[](){}^|«»…\u201C\u201D\u2026\u2014\u4E00\u3002\uFF0C\uFF1A\uFF1F\uFF01\u3010\u3011\u2047\u2048\u2049';
var stopCharsTrailingUrl = stopCharsTrailing.slice(1); var stopCharsTrailingUrl = stopCharsTrailing.slice(1);

21
theme_calm/css/profile.css
Unescape View File

@ -382,6 +382,27 @@ h2.profile-screen-name {
display: none; display: none;
} }
.profile-card .profile-bio .group-description {
color: #43464d;
background: rgba(0, 0, 0, 0);
border: none;
text-align: center;
padding: 4px;
vertical-align: middle;
}
.profile-card .profile-bio .group-description:focus,
.profile-card .profile-bio .group-description:hover {
color: #fff;
background: #e18881;
opacity: .8;
}
.profile-card .profile-bio .save, .profile-card .profile-bio .cancel {
display: none;
margin-left: 2px;
}
.group-messages-control .invite-form, .group-messages-control .secret-key { .group-messages-control .invite-form, .group-messages-control .secret-key {
display: none; display: none;
font-size: 12px; font-size: 12px;

30
theme_calm/css/style.css
Unescape View File

@ -168,6 +168,36 @@ button.unfollow:hover {
margin-right: 10px; margin-right: 10px;
} }
.a-button {
color: whitesmoke;
background-color: #6d83bd;
border: none;
font-size: 12px;
text-align: center;
width: auto;
padding: 4px 12px;
vertical-align: middle;
transition: all .1s linear;
}
.a-button:hover {
color: #FFF;
background: #B2D67B;
}
.a-button:disabled {
opacity: .7;
}
.a-button:disabled:hover {
color: #fff;
}
.b-buttons {
text-align: right;
padding: 4px;
}
.b-buttons { .b-buttons {
text-align: right; text-align: right;
padding: 4px; padding: 4px;

21
theme_nin/css/style.css
Unescape View File

@ -3005,6 +3005,27 @@ ol.toptrends-list a:hover {
} }
.profile-card .profile-bio .group-description {
border: none;
text-align: center;
width: 60%;
padding: 4px;
vertical-align: middle;
}
.profile-card .profile-bio .group-description:focus {
border: 1px solid rgba(0, 0, 0, .1);
border-bottom: solid 1px #B4C669;
}
.profile-card .profile-bio .group-description:hover {
border-bottom: solid 1px #B4C669;
}
.profile-card .profile-bio .save, .profile-card .profile-bio .cancel {
display: none;
}
.group-messages-control .invite-form, .group-messages-control .secret-key { .group-messages-control .invite-form, .group-messages-control .secret-key {
display: none; display: none;
font-size: 12px; font-size: 12px;

Write Preview
Loading…
Cancel
Save