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 #255 from slr/tasty-fixes-6 

couple of small fixes
master
miguelfreitas 10 years ago
parent
f626761ade 2cc86a55fb
commit
5764e60957
11 changed files with 262 additions and 340 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      css/style.css
  2. 12
      js/interface_common.js
  3. 52
      js/interface_home.js
  4. 4
      js/mobile_abstract.js
  5. 7
      js/tmobile.js
  6. 28
      js/twister_actions.js
  7. 354
      js/twister_formatpost.js
  8. 88
      js/twister_timeline.js
  9. 8
      theme_calm/css/style.css
  10. 20
      theme_nin/css/style.css
  11. 17
      theme_nin/sass/style.sass

8
css/style.css
Unescape View File

@ -836,7 +836,7 @@ ol.toptrends-list { @@ -836,7 +836,7 @@ ol.toptrends-list {
.twistday-reminder h4 {
margin: 1% 1% 1% 16%;
font-size: 90%;
font-size: 10px;
color: rgba(0, 0, 0, 0.5);
}
@ -849,6 +849,10 @@ ol.toptrends-list { @@ -849,6 +849,10 @@ ol.toptrends-list {
padding: 5px;
}
.twistday-reminder .twister-user-info {
margin: 1.2% 0 -2.8% 0;
}
.twistday-reminder .twister-user-tag,
.twistday-reminder .twister-user-full {
display: block;
@ -857,7 +861,7 @@ ol.toptrends-list { @@ -857,7 +861,7 @@ ol.toptrends-list {
}
.twistday-reminder .twisterday {
font-size: 80%;
font-size: 11px;
margin-left: 11%;
}

12
js/interface_common.js
Unescape View File

@ -636,17 +636,7 @@ var postExpandFunction = function( e, postLi ) @@ -636,17 +636,7 @@ var postExpandFunction = function( e, postLi )
/*is there any link in the post?*/
for (var i=0; i<link.length; i++){
if (/((\.jpe{0,1}g)|(\.gif)|(\.png))$/i.test(link[i].href)){
var url = link[i].href;
if ($.Options.getUseProxyOpt() !== 'disable' && $.Options.getUseProxyForImgOnlyOpt()){
//proxy alternatives may be added to options page...
if ($.Options.getUseProxyOpt() === 'ssl-proxy-my-addr') {
url = 'https://ssl-proxy.my-addr.org/myaddrproxy.php/' +
url.substring(0, url.indexOf(':')) +
url.substr(url.indexOf('/') + 1);
} else if ($.Options.getUseProxyOpt() ==='anonymouse') {
url = 'http://anonymouse.org/cgi-bin/anon-www.cgi/' + url;
}
}
var url = proxyURL(link[i].href);
$(previewContainer).append($("<img src='" + url + "' class='image-preview' />"));
}
}

52
js/interface_home.js
Unescape View File

@ -218,11 +218,12 @@ function refreshTwistdayReminder() { @@ -218,11 +218,12 @@ function refreshTwistdayReminder() {
item.find('.twister-user-info').attr('data-screen-name', lucky);
item.find('.twister-user-name').attr('href', $.MAL.userUrl(lucky));
item.find('.twister-user-tag').text('@' +lucky);
itemTwisterday = item.find('.twisterday');
itemTwisterday.bind('click', (function(e) { replyInitPopup(e, post); }).bind(post));
if (typeof(time) !== 'undefined')
item.find('.twisterday').text(timeGmtToText(time));
itemTwisterday.text(timeGmtToText(time));
else
item.find('.twisterday').text(timeGmtToText(post.userpost.time));
item.find('.twisterday').bind('click', (function(e) { replyInitPopup(e, post); }).bind(post));
itemTwisterday.text(timeGmtToText(post.userpost.time));
getAvatar(lucky, item.find('.twister-user-photo'));
getFullname(lucky, item.find('.twister-user-full'));
@ -230,8 +231,7 @@ function refreshTwistdayReminder() { @@ -230,8 +231,7 @@ function refreshTwistdayReminder() {
list.append(item);
}
}
function removeLuckyFromList(list, post) {
var lucky = post.userpost.n;
function removeLuckyFromList(list, lucky) {
list.find('[data-screen-name='+lucky+']').closest('li').remove();
}
@ -246,36 +246,36 @@ function refreshTwistdayReminder() { @@ -246,36 +246,36 @@ function refreshTwistdayReminder() {
var thatSec;
posts.sort(function(a,b) {
if (parseInt(a.userpost.time) > parseInt(b.userpost.time))
return 1;
else
return -1;
return (parseInt(a.userpost.time) > parseInt(b.userpost.time)) ? 1 : -1;
});
for (var i = 0; i < posts.length; i++) {
d.setTime(0);
d.setUTCSeconds(posts[i].userpost.time);
if (d.getUTCMonth() === todayMonth && d.getUTCDate() === todayDate) {
addLuckyToList(listCurrent, posts[i]);
} else if (showUpcomingTimer > 0) {
thatSec = Date.UTC(todayYear,d.getUTCMonth(),d.getUTCDate(),d.getUTCHours(),d.getUTCMinutes(),d.getUTCSeconds()) /1000;
if (thatSec > todaySec && thatSec -todaySec <= showUpcomingTimer) {
d.setTime(0);
d.setUTCSeconds(thatSec);
addLuckyToList(listUpcoming, posts[i], d.getTime() /1000);
if (followingUsers.indexOf(posts[i].userpost.n) > -1) {
d.setTime(0);
d.setUTCSeconds(posts[i].userpost.time);
if (d.getUTCMonth() === todayMonth && d.getUTCDate() === todayDate) {
addLuckyToList(listCurrent, posts[i]);
removeLuckyFromList(listUpcoming, posts[i].userpost.n);
} else if (showUpcomingTimer > 0) {
thatSec = Date.UTC(todayYear,d.getUTCMonth(),d.getUTCDate(),d.getUTCHours(),d.getUTCMinutes(),d.getUTCSeconds()) /1000;
if (thatSec > todaySec && thatSec -todaySec <= showUpcomingTimer) {
d.setTime(0);
d.setUTCSeconds(thatSec);
addLuckyToList(listUpcoming, posts[i], d.getTime() /1000);
} else {
removeLuckyFromList(listCurrent, posts[i].userpost.n);
removeLuckyFromList(listUpcoming, posts[i].userpost.n);
}
} else {
removeLuckyFromList(listCurrent, posts[i]);
removeLuckyFromList(listUpcoming, posts[i]);
removeLuckyFromList(listCurrent, posts[i].userpost.n);
removeLuckyFromList(listUpcoming, posts[i].userpost.n);
}
} else {
removeLuckyFromList(listCurrent, posts[i]);
removeLuckyFromList(listUpcoming, posts[i]);
}
}
if (listCurrent.children().length > 1)
if (listCurrent.children().length)
listCurrent.parent().show();
if (listUpcoming.children().length > 1)
if (listUpcoming.children().length)
listUpcoming.parent().show();
$module.find('.refresh').show();
$module.find('.loading-roller').hide();

4
js/mobile_abstract.js
Unescape View File

@ -506,13 +506,13 @@ function filterLang(string) { @@ -506,13 +506,13 @@ function filterLang(string) {
// before detection attempts we cut out any mentions and links, and replace _ with space
langFilterSubj = string.replace(/@\S\w*|https?:\/\/\S*/g, '').replace(/_+/g, ' ')
// cut out common frequently used words FIXME I believe there is a list of similar international stuff somewhere outside which is waiting for us, we should just find it
.replace(/\btwister|github|google|twitter\b/g, '')
.replace(/\btwister|tox|github|linux|ubuntu|debian|windows|google|twitter|facebook|microsoft|ping|pong|email|javascript\b/ig, '')
// replace zero-width word boundaries, such as between letters from different alphabets [or other symbols], with spaces
// FIXME not so good idea because 'Za pomocą białej listy' may turn into 'Za pomoc ą bia ł ej listy' for e.g.
// FIXME but first one was recognized as 'hrv' and second as 'pol' and you know it's 'pol' actually
.replace(/\b/g, ' ')
// cut out some more symbols
.replace(/[#\[\]\(\)\{\}\-\+\=\^\:\;\\\/0-9]/g, '')
.replace(/[#<>\.,:;\?\!\*\[\]\(\)\{\}\-\+\=\^\\\/0-9\u201C\u201D\u2026\u2014\u4E00\u3002\uFF0C\uFF1A\uFF1F\uFF01\u3010\u3011]/g, '') // unicode escaped stuff is '“”…—一。，：？！【】'
// clear unwanted spaces
.replace(/\s+/g, ' ').trim();

7
js/tmobile.js
Unescape View File

@ -24,8 +24,11 @@ function initializeTwister( redirectNetwork, redirectLogin, cbFunc, cbArg ) { @@ -24,8 +24,11 @@ function initializeTwister( redirectNetwork, redirectLogin, cbFunc, cbArg ) {
$.mobile.silentScroll(0);
});
// reply text counter both newmsg and dmchat
var $replyText = $( ".post-area-new textarea" );
$replyText.off('input keyup').on('keyup', replyTextInput, function() { replyTextUpdateRemaining(this); });
$('.post-area-new textarea')
.off('input keyup')
.on('keyup', replyTextInput)
.on('keyup', function() { replyTextUpdateRemaining(this); })
;
handlersInstalled = true;
}

28
js/twister_actions.js
Unescape View File

@ -379,33 +379,7 @@ function processHashtag(postboard, hashtag, data) { @@ -379,33 +379,7 @@ function processHashtag(postboard, hashtag, data) {
}
function displayHashtagPending(postboard) {
for( var i = 0; i < _hashtagPendingPosts.length; i++ ) {
var post = _hashtagPendingPosts[i];
//console.log(post);
var streamPost = postToElem(post, "original");
var timePost = post["userpost"]["time"];
streamPost.attr("data-time",timePost);
var streamItems = postboard.children();
if( streamItems.length == 0) {
postboard.prepend( streamPost );
} else {
var j = 0;
for( j = 0; j < streamItems.length; j++) {
var streamItem = streamItems.eq(j);
var timeItem = streamItem.attr("data-time");
if( timeItem == undefined ||
timePost > parseInt(timeItem) ) {
// this post in stream is older, so post must be inserted above
streamItem.before(streamPost);
break;
}
}
if( j == streamItems.length ) {
postboard.append( streamPost );
}
}
}
attachPostsToStream(postboard, _hashtagPendingPosts, false);
$.MAL.postboardLoaded();
_hashtagPendingPosts = [];
}

354
js/twister_formatpost.js
Unescape View File

@ -52,71 +52,71 @@ function postToElem( post, kind, promoted ) { @@ -52,71 +52,71 @@ function postToElem( post, kind, promoted ) {
// Now create the html elements
var elem = $.MAL.getPostTemplate().clone(true);
elem.removeAttr('id');
elem.addClass(kind);
elem.attr('data-time', t);
elem.removeAttr('id')
.addClass(kind)
.attr('data-time', t)
;
if( post["isNew"] )
if( post['isNew'] )
elem.addClass('new');
var postData = elem.find(".post-data");
postData.addClass(kind);
postData.attr('data-userpost', postJson);
postData.attr('data-content_to_rt', content_to_rt);
postData.attr('data-content_to_sigrt', content_to_sigrt);
postData.attr('data-screen-name', n);
postData.attr('data-id', k);
postData.attr('data-lastk', userpost["lastk"]);
postData.attr('data-text', msg);
if( "reply" in userpost ) {
postData.attr('data-replied-to-screen-name', userpost["reply"]["n"]);
postData.attr('data-replied-to-id', userpost["reply"]["k"]);
postData.find('.post-expand').text(polyglot.t("Show conversation"));
} else if ( "rt" in userpost && "reply" in userpost["rt"] ) {
postData.attr('data-replied-to-screen-name', userpost["rt"]["reply"]["n"]);
postData.attr('data-replied-to-id', userpost["rt"]["reply"]["k"]);
postData.find('.post-expand').text(polyglot.t("Show conversation"));
var postData = elem.find('.post-data');
postData.addClass(kind)
.attr('data-userpost', postJson)
.attr('data-content_to_rt', content_to_rt)
.attr('data-content_to_sigrt', content_to_sigrt)
.attr('data-screen-name', n)
.attr('data-id', k)
.attr('data-lastk', userpost["lastk"])
.attr('data-text', msg)
;
if( 'reply' in userpost ) {
postData.attr('data-replied-to-screen-name', userpost.reply.n)
.attr('data-replied-to-id', userpost.reply.k)
.find('.post-expand').text(polyglot.t('Show conversation'))
;
} else if ( 'rt' in userpost && 'reply' in userpost.rt ) {
postData.attr('data-replied-to-screen-name', userpost.rt.reply.n)
.attr('data-replied-to-id', userpost.rt.reply.k)
.find('.post-expand').text(polyglot.t('Show conversation'))
;
}
var postInfoName = elem.find(".post-info-name");
postInfoName.attr('href',$.MAL.userUrl(n));
postInfoName.text(n);
var postInfoName = elem.find('.post-info-name');
postInfoName.text(n).attr('href', $.MAL.userUrl(n));
getFullname( n, postInfoName );
elem.find(".post-info-tag").text = "@" + n;
getAvatar( n, elem.find(".avatar") );
elem.find(".post-info-time").text(timeGmtToText(t));
elem.find(".post-info-time").attr("title",timeSincePost(t));
//elem.find('.post-info-tag').text("@" + n);
getAvatar( n, elem.find('.avatar') );
elem.find('.post-info-time').text(timeGmtToText(t)).attr('title', timeSincePost(t));
var mentions = [];
htmlFormatMsg( msg, elem.find(".post-text"), mentions);
elem.find('.post-text').html(htmlFormatMsg(msg, mentions));
postData.attr('data-text-mentions', mentions);
var replyTo = "";
if( n != defaultScreenName )
replyTo += "@" + n + " ";
for( var i = 0; i < mentions.length; i++ ) {
if( mentions[i] != n && mentions[i] != defaultScreenName ) {
replyTo += "@" + mentions[i] + " ";
}
}
if(!defaultScreenName)
{
elem.find(".post-area-new textarea").attr("placeholder", polyglot.t("You have to log in to post replies."));
var replyTo = [];
if( n !== defaultScreenName )
replyTo.push(['@', n, ' '].join(''));
for (var i = 0; i < mentions.length; i++) {
if (mentions[i] !== n && mentions[i] !== defaultScreenName)
replyTo.push(['@', mentions[i], ' '].join(''));
}
replyTo = replyTo.join('');
var postTextArea = elem.find('.post-area-new textarea');
postTextArea.attr('data-reply-to', replyTo);
if (!defaultScreenName)
postTextArea.attr('placeholder', polyglot.t('You have to log in to post replies.'));
else
{
elem.find(".post-area-new textarea").attr("placeholder", polyglot.t("reply_to", { fullname: replyTo })+ "...");
}
elem.find(".post-area-new textarea").attr("data-reply-to",replyTo);
postData.attr("data-reply-to",replyTo);
postTextArea.attr('placeholder', polyglot.t('reply_to', { fullname: replyTo })+ '...');
postData.attr('data-reply-to', replyTo);
if( retweeted_by != undefined ) {
elem.find(".post-context").show();
var retweetedByElem = elem.find(".post-retransmited-by");
retweetedByElem.attr("href", $.MAL.userUrl(retweeted_by));
retweetedByElem.text('@'+retweeted_by);
elem.find('.post-context').show();
elem.find('.post-retransmited-by')
.attr('href', $.MAL.userUrl(retweeted_by))
.text('@' + retweeted_by)
;
}
if (typeof(promoted) !== 'undefined' && promoted) {
@ -130,8 +130,9 @@ function postToElem( post, kind, promoted ) { @@ -130,8 +130,9 @@ function postToElem( post, kind, promoted ) {
else
var mlm = '';
elem.append('<div class="langFilterSimData">'+polyglot.t('This post is treated by language filter', {'treated': '<em>'+((post['langFilter']['pass']) ? polyglot.t('passed') : polyglot.t('blocked'))+'</em>'})+'</div>');
elem.append('<div class="langFilterSimData">'+polyglot.t('Reason: this', {'this': '<em>'+post['langFilter']['reason']+'</em>'})+mlm+'</div>');
elem.append('<div class="langFilterSimData">'+polyglot.t('This post is treated by language filter', {'treated': '<em>'+((post['langFilter']['pass']) ? polyglot.t('passed') : polyglot.t('blocked'))+'</em>'})+'</div>')
.append('<div class="langFilterSimData">'+polyglot.t('Reason: this', {'this': '<em>'+post['langFilter']['reason']+'</em>'})+mlm+'</div>')
;
} else {
elem.append('<div class="langFilterSimData">'+polyglot.t('This post is treated by language filter', {'treated': '<em>'+polyglot.t('not analyzed')+'</em>'})+'</div>');
}
@ -158,8 +159,7 @@ function dmDataToSnippetItem(dmData, remoteUser) { @@ -158,8 +159,7 @@ function dmDataToSnippetItem(dmData, remoteUser) {
else
getFullname( remoteUser, dmItem.find("a.post-info-name") );
dmItem.find(".post-text").html(escapeHtmlEntities(dmData.text));
dmItem.find(".post-info-time").text(timeGmtToText(dmData.time));
dmItem.find(".post-info-time").attr("title",timeSincePost(dmData.time));
dmItem.find(".post-info-time").text(timeGmtToText(dmData.time)).attr("title",timeSincePost(dmData.time));
return dmItem;
}
@ -171,183 +171,109 @@ function dmDataToConversationItem(dmData, localUser, remoteUser) { @@ -171,183 +171,109 @@ function dmDataToConversationItem(dmData, localUser, remoteUser) {
dmItem.removeAttr('id');
dmItem.addClass(classDm);
getAvatar(dmData.fromMe ? localUser : remoteUser, dmItem.find(".post-photo").find("img") );
dmItem.find(".post-info-time").text(timeGmtToText(dmData.time));
dmItem.find(".post-info-time").attr("title",timeSincePost(dmData.time));
dmItem.find(".post-info-time").text(timeGmtToText(dmData.time)).attr("title",timeSincePost(dmData.time));
var mentions = [];
htmlFormatMsg( dmData.text, dmItem.find(".post-text"), mentions);
dmItem.find('.post-text').html(htmlFormatMsg(dmData.text, mentions));
return dmItem;
}
// convert message text to html, featuring @users and links formating.
// todo: hashtags
function htmlFormatMsg( msg, output, mentions ) {
var tmp;
var match = null;
var index;
var strUrlRegexp = "http[s]?://";
var strEmailRegexp = "\\S+@\\S+\\.\\S+";
var strSplitCounterR = "\\(\\d{1,2}\\/\\d{1,2}\\)$";
var reAll = new RegExp("(?:^|[ \\n\\t.,:\\/?!])(#|@|" + strUrlRegexp + "|" + strEmailRegexp + "|" + strSplitCounterR + ")");
var reHttp = new RegExp(strUrlRegexp);
var reEmail = new RegExp(strEmailRegexp);
var reSplitCounter = new RegExp(strSplitCounterR);
msg = escapeHtmlEntities(msg);
while( msg != undefined && msg.length ) {
match = reAll.exec(msg);
if( match ) {
index = (match[0] === match[1]) ? match.index : match.index + 1;
if( match[1] == "@" ) {
output.append(_formatText(msg.substr(0, index)));
tmp = msg.substr(index+1);
var username = _extractUsername(tmp);
if( username.length ) {
if( mentions.indexOf(username) < 0 )
mentions.push(username);
var userLinkTemplate = $("#msg-user-link-template").clone(true);
userLinkTemplate.removeAttr("id");
userLinkTemplate.attr("href",$.MAL.userUrl(username));
userLinkTemplate.text("@"+username);
output.append(userLinkTemplate);
msg = tmp.substr(String(username).length);
continue;
}
output.append('@');
msg = tmp;
continue;
}
function htmlFormatMsg(msg, mentions) {
function htmlMention(str, pre) {
str = str.replace(new RegExp(['^', pre, '@'].join('')), '').toLowerCase();
mentions.push(str); // FIXME feel the pain of the scope chain
// FIXME we're trying to not interact with DOM, coz' we want to run really fast [to hell of RegExps]
// FIXME actually we should avoid it by dropping a template idea and construct html right here
html.push($('#msg-user-link-template')[0].outerHTML
.replace(/\bid\s*=\s*"[^]*?"+/ig, '') // $().removeAttr('id')
//.replace(/\bhref\s*=\s*"[^]*?"+/ig, '') // $().removeAttr('href')
.replace(/<a\s+(?=[^>]*?\bclass\s*=\s*"(?=[^"]*?\bopen-profile-modal\b))/ig, ['<a href="', $.MAL.userUrl(str), '" '].join('')) // $().closest('a.open-profile-modal').attr('href', $.MAL.userUrl(username))
.replace(/(<a\s+(?=[^>]*?\bclass\s*=\s*"(?=[^"]*?\bopen-profile-modal\b))[^]*?>)[^]*?(<\/a>)/ig, [pre, '$1@', str, '$2'].join('')) // $().closest('a.open-profile-modal').text('@'+username)
);
return ['>', html.length - 1, '<'].join('');
}
if( reHttp.exec(match[1]) ) {
output.append(_formatText(msg.substr(0, index)));
tmp = msg.substring(index);
var space = tmp.search(/[ \n\t]/);
var url;
if( space != -1 ) url = tmp.substring(0,space); else url = tmp;
if( url.length ) {
msg = tmp.substr(String(url).length);
url = reverseHtmlEntities(url);
var extLinkTemplate = $("#external-page-link-template").clone(true);
extLinkTemplate.removeAttr("id");
if ($.Options.getUseProxyOpt() !== 'disable' && !$.Options.getUseProxyForImgOnlyOpt()){
//proxy alternatives may be added to options page...
if ($.Options.getUseProxyOpt() === 'ssl-proxy-my-addr') {
extLinkTemplate.attr('href', 'https://ssl-proxy.my-addr.org/myaddrproxy.php/' +
url.substring(0, url.indexOf(':')) +
url.substr(url.indexOf('/') + 1));
} else if ($.Options.getUseProxyOpt() ==='anonymouse') {
extLinkTemplate.attr('href', 'http://anonymouse.org/cgi-bin/anon-www.cgi/' + url);
}
} else {
extLinkTemplate.attr("href",url);
}
extLinkTemplate.text(url);
extLinkTemplate.attr("title",url);
output.append(extLinkTemplate);
continue;
}
}
function htmlHashtag(str, pre) {
str = str.replace(new RegExp(['^', pre, '#'].join('')), '');
if( reEmail.exec(match[1]) ) {
output.append(_formatText(msg.substr(0, index)));
tmp = msg.substring(index);
var space = tmp.search(/[ \n\t]/);
var email;
if( space != -1 ) email = tmp.substring(0,space); else email = tmp;
if( email.length ) {
var extLinkTemplate = $("#external-page-link-template").clone(true);
extLinkTemplate.removeAttr("id");
extLinkTemplate.attr("href","mailto:" + email);
extLinkTemplate.text(email);
extLinkTemplate.attr("title",email);
output.append(extLinkTemplate);
msg = tmp.substr(String(email).length);
continue;
}
}
html.push($('#hashtag-link-template')[0].outerHTML
.replace(/\bid\s*=\s*"[^]*?"+/ig, '') // $().removeAttr('id')
//.replace(/\bhref\s*=\s*"[^]*?"+/ig, '') // $().removeAttr('href')
.replace(/<a\s+(?=[^>]*?\bclass\s*=\s*"(?=[^"]*?\bopen-hashtag-modal\b))/ig, ['<a href="', $.MAL.hashtagUrl(str.toLowerCase()), '" '].join('')) // $().closest('a.open-profile-modal').attr('href', $.MAL.hashtagUrl(hashtag))
.replace(/(<a\s+(?=[^>]*?\bclass\s*=\s*"(?=[^"]*?\bopen-hashtag-modal\b))[^]*?>)[^]*?(<\/a>)/ig, [pre, '$1#', str, '$2'].join('')) // $().closest('a.open-profile-modal').text('#'+hashtag)
);
if( match[1] == "#" ) {
output.append(_formatText(msg.substr(0, index)));
tmp = msg.substr(index+1);
var hashtag = _extractHashtag(tmp);
if( hashtag.length ) {
var hashtag_lc='';
for( var i = 0; i < hashtag.length; i++ ) {
var c = hashtag[i];
hashtag_lc += (c >= 'A' && c <= 'Z') ? c.toLowerCase() : c;
}
var hashtagLinkTemplate = $("#hashtag-link-template").clone(true);
hashtagLinkTemplate.removeAttr("id");
hashtagLinkTemplate.attr("href",$.MAL.hashtagUrl(hashtag_lc));
hashtagLinkTemplate.text("#"+hashtag);
output.append(hashtagLinkTemplate);
msg = tmp.substr(String(hashtag).length);
continue;
}
output.append('#');
msg = tmp;
continue;
}
return ['>', html.length - 1, '<'].join('');
}
if (reSplitCounter.exec(match[1])) {
output.append(_formatText(msg.substr(0, index)));
tmp = msg.substring(index);
if( tmp.length ) {
var splitCounter = $('<span class="splited-post-counter"></span>');
splitCounter.text(tmp);
output.append(splitCounter);
msg = "";
continue;
}
}
}
function htmlHttp(str) {
html.push($('#external-page-link-template')[0].outerHTML
.replace(/\bid\s*=\s*"[^]*?"+/ig, '') // $().removeAttr('id')
//.replace(/\bhref\s*=\s*"[^]*?"+/ig, '') // $().removeAttr('href')
.replace(/<a\s+/ig, ['<a href="', proxyURL(str), '" '].join('')) // $().closest('a').attr('href', proxyURL(url))
.replace(/(<a\s+[^]*?>)[^]*?(<\/a>)/ig, ['$1', str, '$2'].join('')) // $().closest('a').text(url)
);
output.append(_formatText(msg));
msg = "";
return ['>', html.length - 1, '<'].join('');
}
}
// internal function for htmlFormatMsg
function _formatText(msg)
{
// TODO: add options for emotions and linefeeds
//msg = $.emotions(msg);
if( $.Options.getLineFeedsOpt() == "enable" )
msg = msg.replace(/\n/g, '<br />');
return msg;
function htmlEmail(str, pre) {
str = str.replace(new RegExp(['^', pre].join('')), '');
html.push($('#external-page-link-template')[0].outerHTML
.replace(/\bid\s*=\s*"[^]*?"+/ig, '') // $().removeAttr('id')
//.replace(/\bhref\s*=\s*"[^]*?"+/ig, '') // $().removeAttr('href')
.replace(/<a\s+/ig, ['<a href="mailto:', str.toLowerCase(), '" '].join('')) // $().closest('a').attr('href', 'mailto:'+url)
.replace(/(<a\s+[^]*?>)[^]*?(<\/a>)/ig, [pre, '$1', str, '$2'].join('')) // $().closest('a').text(url)
);
return ['>', html.length - 1, '<'].join('');
}
function htmlSplitCounter(str) {
html.push(['<span class="splited-post-counter">', str, '</span>'].join(''));
return ['>', html.length - 1, '<'].join('');
}
var html = [];
return _formatText(escapeHtmlEntities(msg)
.replace(/(^|[^\/]\B(?!\S*:\/\/\S*@))@\w+\b/g, htmlMention)
.replace(/(^|[^<\/]\B(?!\S*:\/\/\S*#))#[^#\\\/\.,:;\?\!\*\[\]\(\)\{\}\^\|%'"\u201C\u201D\u2026\u2014\u4E00\u3002\uFF0C\uFF1A\uFF1F\uFF01\u3010\u3011>\s]+/g, htmlHashtag) // unicode escaped stuff is '“”…—一。，：？！【】' for our chinese friends
.replace(/\bhttps?:\/\/\S[^>\s]+/ig, htmlHttp)
.replace(/([^<\/])\b(?!\S*:\/\/\S*@)\S+@\S+\.\S[^>\s]+/g, htmlEmail)
.replace(/\(\d{1,2}\/\d{1,2}\)$/, htmlSplitCounter)
.replace(/>(\d+)</g, function(candy, core) {return html[core]})
);
}
function _extractUsername(s) {
var username = "";
for( var i = 0; i < s.length; i++ ) {
var c = s.charCodeAt(i);
if( (c >= 'a'.charCodeAt(0) && c <= 'z'.charCodeAt(0)) ||
(c >= 'A'.charCodeAt(0) && c <= 'Z'.charCodeAt(0)) ||
(c >= '0'.charCodeAt(0) && c <= '9'.charCodeAt(0)) ||
c == '_'.charCodeAt(0) ) {
username += s[i];
} else {
break;
}
function proxyURL(url) {
var proxyOpt = $.Options.getUseProxyOpt();
if (proxyOpt !== 'disable' && !$.Options.getUseProxyForImgOnlyOpt()) {
// proxy alternatives may be added to options page
if (proxyOpt === 'ssl-proxy-my-addr') {
url = ['https://ssl-proxy.my-addr.org/myaddrproxy.php/',
url.substring(0, url.indexOf(':')), url.substr(url.indexOf('/') + 1)].join('');
} else if (proxyOpt === 'anonymouse')
url = ['http://anonymouse.org/cgi-bin/anon-www.cgi/', url].join('');
}
return username.toLowerCase();
return url;
}
// internal function for htmlFormatMsg
function _extractHashtag(s) {
var hashtag = "";
s = reverseHtmlEntities(s);
for( var i = 0; i < s.length; i++ ) {
if( " \n\t.,:/?!;'\"()[]{}*#".indexOf(s[i]) < 0 ) {
hashtag += s[i];
} else {
break;
}
}
return hashtag;
// TODO: add options for emotions; msg = $.emotions(msg);
// TODO: add at least basic markdown (optional) like *text* -> bold text and _text_ -> italic text
function _formatText(msg) {
if ($.Options.getLineFeedsOpt() === 'enable')
msg = msg.replace(/\n/g, '<br />');
return msg;
}
function escapeHtmlEntities(str) {

88
js/twister_timeline.js
Unescape View File

@ -160,7 +160,7 @@ function processReceivedPosts(req, posts) @@ -160,7 +160,7 @@ function processReceivedPosts(req, posts)
i--;
}
}
showPosts(req, posts);
updateTimeline(req, posts);
req.doneReportProcessing(posts.length);
//if the count of recieved posts less or equals to requested then...
@ -182,50 +182,58 @@ function processReceivedPosts(req, posts) @@ -182,50 +182,58 @@ function processReceivedPosts(req, posts)
}
}
function showPosts(req, posts)
{
//console.log('showPosts:');
//console.log(req);
function updateTimeline(req, posts) {
attachPostsToStream($.MAL.getStreamPostsParent(), posts, req.getspam);
for (var i = 0; i < posts.length; i++) {
req.reportProcessedPost(posts[i]['userpost']['n'], posts[i]['userpost']['k'], true);
}
}
function attachPostsToStream(stream, posts, isPromoted) {
//console.log('attachPostsToStream:');
//console.log(posts);
var streamItemsParent = $.MAL.getStreamPostsParent();
function byTimeInDescendingOrder(a, b) {
return (a.time > b.time) ? -1 : 1;
}
for( var i = 0; i < posts.length; i++ ) {
var post = posts[i];
//console.log(post);
var streamPost = postToElem(post, "original", req.getspam);
var timePost = post["userpost"]["time"];
streamPost.attr("data-time",timePost);
// post will only be shown if appended to the stream list
var streamPostAppended = false;
// insert the post in timeline ordered by (you guessed) time
// FIXME: lame! searching everything everytime. please optimize!
var streamItems = streamItemsParent.children();
if( streamItems.length == 0) {
// timeline is empty
streamItemsParent.append( streamPost );
streamPostAppended = true;
} else {
var j = 0;
for( j = 0; j < streamItems.length; j++) {
var streamItem = streamItems.eq(j);
var timeItem = streamItem.attr("data-time");
if( timeItem == undefined ||
timePost > parseInt(timeItem) ) {
var streamItems = stream.children();
var streamPosts = [];
for (var i = 0; i < streamItems.length; i++) {
var streamItem = streamItems.eq(i);
streamPosts.push({item: streamItem, time: parseInt(streamItem.attr('data-time'))});
}
//streamPosts.sort(byTimeInDescendingOrder); // currently here is no reason to sort it, it should be ok
for (var i = 0; i < posts.length; i++) {
//console.log(posts[i]);
var isAttached = false;
var intrantPost = {item: postToElem(posts[i], 'original', isPromoted), time: posts[i].userpost.time};
intrantPost.item.attr('data-time', intrantPost.time);
if (streamPosts.length) {
// check to avoid twist duplication and insert the post in timeline ordered by (you guessed) time
for (var j = 0; j < streamPosts.length; j++) {
if (intrantPost.time === streamPosts[j].time &&
intrantPost.item[0].innerHTML === streamPosts[j].item[0].innerHTML) {
isAttached = true;
console.log('appending of duplicate twist prevented');
break;
} else if (intrantPost.time > streamPosts[j].time) {
// this post in stream is older, so post must be inserted above
streamItem.before(streamPost);
streamPostAppended = true;
intrantPost.item.insertBefore(streamPosts[j].item).show();
streamPosts.push(intrantPost);
streamPosts.sort(byTimeInDescendingOrder);
isAttached = true;
break;
}
}
}
if (!streamPostAppended)
streamItemsParent.append( streamPost );
streamPostAppended = true;
streamPost.show();
req.reportProcessedPost(post["userpost"]["n"],post["userpost"]["k"], streamPostAppended);
if (!isAttached) {
intrantPost.item.appendTo(stream).show();
streamPosts.push(intrantPost);
streamPosts.sort(byTimeInDescendingOrder);
}
}
}
@ -241,7 +249,7 @@ function requestTimelineUpdate(mode, count, timelineUsers, getspam) @@ -241,7 +249,7 @@ function requestTimelineUpdate(mode, count, timelineUsers, getspam)
var req = new requestObj(timelineUsers, mode, count, getspam);
if (mode === 'pending') {
req.mode = 'latest';
showPosts(req, _newPostsPending);
updateTimeline(req, _newPostsPending);
_newPostsPending = [];
$.MAL.reportNewPosts(_newPostsPending.length);
$.MAL.postboardLoaded();
@ -323,7 +331,7 @@ function processNewPostsConfirmation(expected, posts) @@ -323,7 +331,7 @@ function processNewPostsConfirmation(expected, posts)
}
if ( sendedPostsPending.length > 0 ) {
var req = new requestObj([defaultScreenName],'latest',sendedPostsPending.length,promotedPostsOnly);
showPosts(req, sendedPostsPending);
updateTimeline(req, sendedPostsPending);
}
if( posts.length < expected ) {

8
theme_calm/css/style.css
Unescape View File

@ -1019,7 +1019,7 @@ textarea.splited-post { @@ -1019,7 +1019,7 @@ textarea.splited-post {
.twistday-reminder h4 {
margin: 1% 1% 1% 16%;
font-size: 90%;
font-size: 10px;
color: rgba(0, 0, 0, 0.5);
}
@ -1032,6 +1032,10 @@ textarea.splited-post { @@ -1032,6 +1032,10 @@ textarea.splited-post {
padding: 5px;
}
.twistday-reminder .twister-user-info {
margin: 1.2% 0 -2.8% 0;
}
.twistday-reminder .twister-user-tag,
.twistday-reminder .twister-user-full {
display: block;
@ -1040,7 +1044,7 @@ textarea.splited-post { @@ -1040,7 +1044,7 @@ textarea.splited-post {
}
.twistday-reminder .twisterday {
font-size: 80%;
font-size: 11px;
margin-left: 11%;
}

20
theme_nin/css/style.css
Unescape View File

@ -2538,12 +2538,13 @@ ol.toptrends-list a:hover { @@ -2538,12 +2538,13 @@ ol.toptrends-list a:hover {
}
.twistday-reminder h3 {
font-size: 0.98em;
float: left;
}
.twistday-reminder h4 {
margin: 1% 1% 1% 16%;
font-size: 90%;
font-size: 0.84em;
color: rgba(0, 0, 0, 0.5);
}
@ -2551,9 +2552,14 @@ ol.toptrends-list a:hover { @@ -2551,9 +2552,14 @@ ol.toptrends-list a:hover {
text-decoration: none;
}
.twistday-reminder .current .label, .twistday-reminder .upcoming .label {
margin-right: 10%;
}
.twistday-reminder .twister-user-info {
margin-top: 8px;
margin-top: 1.2%;
}
.twistday-reminder .twister-user-tag,
.twistday-reminder .twister-user-full {
display: block;
@ -2566,7 +2572,7 @@ ol.toptrends-list a:hover { @@ -2566,7 +2572,7 @@ ol.toptrends-list a:hover {
}
.twistday-reminder .twisterday {
font-size: 80%;
font-size: 0.8em;
margin-left: 8%;
}
@ -2966,10 +2972,10 @@ ol.toptrends-list a:hover { @@ -2966,10 +2972,10 @@ ol.toptrends-list a:hover {
/********* NEW USER MODAL************* */
/* line 861, ../sass/style.sass */
.new-user .modal-wrapper {
width: 520px;
width: 640px;
height: 600px;
top: 10%;
margin: 0 0 0 -260px;
margin: 0 0 0 -320px;
overflow-x: hidden;
overflow-y: hidden;
}
@ -2987,13 +2993,15 @@ ol.toptrends-list a:hover { @@ -2987,13 +2993,15 @@ ol.toptrends-list a:hover {
}
/* line 874, ../sass/style.sass */
.new-user .emphasis {
font-size: 18px;
text-align: center;
}
/* line 877, ../sass/style.sass */
.new-user .secret-key {
display: block;
margin-top: 8px;
color: black;
font-weight: bold;
font-size: 110%;
}
/******** HASHTAG MODAL********** */

17
theme_nin/sass/style.sass
Unescape View File

@ -585,15 +585,18 @@ ol.toptrends-list @@ -585,15 +585,18 @@ ol.toptrends-list
small
display: none
h3
font-size: 0.98em
float: left
h4
margin: 1% 1% 1% 16%
font-size: 90%
font-size: 0.84em
color: rgba(0, 0, 0, 0.5)
a:hover
text-decoration: none
.current .label, .upcoming .label
margin-right: 10%
.twister-user-info
margin-top: 8px
margin-top: 1.2%
.twister-user-tag, .twister-user-full
display: block
margin: 0
@ -601,7 +604,7 @@ ol.toptrends-list @@ -601,7 +604,7 @@ ol.toptrends-list
img.twister-user-photo
margin: 0
.twisterday
font-size: 80%
font-size: 0.8em
margin-left: 8%
&.hover
cursor: pointer
@ -914,10 +917,10 @@ ol.toptrends-list @@ -914,10 +917,10 @@ ol.toptrends-list
.new-user
.modal-wrapper
width: $postboard-modal-width
width: 640px
height: 600px
top: 10%
margin: 0 0 0 0-($postboard-modal-width/2)
margin: 0 0 0 -320px
overflow-x: hidden
overflow-y: hidden
.modal-content
@ -927,11 +930,13 @@ ol.toptrends-list @@ -927,11 +930,13 @@ ol.toptrends-list
.text
margin: 0 0 15px 0
.emphasis
font-size: 18px
text-align: center
.secret-key
display: block
margin-top: 8px
color: rgba(0.5, 0, 0, 1)
font-weight: bold
font-size: 110%
/******** HASHTAG MODAL***********/

Write Preview
Loading…
Cancel
Save