wamo/Qvitter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes #179 and #137

Browse Source
This commit is contained in:
Hannes Mannerheim 2015-06-17 01:37:35 +02:00
parent e4d4f3c3de
commit 95b117a249
2 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
css/qvitter.css
View File

@ -4401,32 +4401,16 @@ body.rtl .profile-banner-footer ul.stats {
}
.queet.rtl .queet-text .tag a {
direction:rtl;
}
.queet-text .vcard .mention:before,
.queet-text .h-card.mention:before {
content:"@";
}
.queet.rtl .queet-text .vcard .mention:before,
.queet.rtl .queet-text .h-card.mention:before {
content: "";
}
}
.queet.rtl .queet-text .vcard .mention:after,
.queet.rtl .queet-text .h-card.mention:after {
content: "@";
}
.queet-text .vcard .group:before,
.queet-text .h-card.group:before {
content:"!";
}
.queet.rtl .queet-text .vcard .group:before,
.queet.rtl .queet-text .h-card.group:before {
content: "";
}
.queet.rtl .queet-text .vcard .group:after,
.queet.rtl .queet-text .h-card.group:after {
content: "!";
}
.queet-text .tag a:before {
.queet.rtl .queet-text .tag a:before {
content:"#";
}

19
js/misc-functions.js
View File

@ -763,13 +763,22 @@ function detectRTL(s) {
if(rtlDirCheck.test(RTLorLTR[i])) { RTLnum++; }
else { LTRnum++; }
}
// if there are more rtl chars than ltr
if(RTLnum > LTRnum) { $streamItem.children('.stream-item').children('.queet').addClass('rtl'); }
// if no chars (that we are interested, but body is set to rtl)
else if ($queetText.html().length==0 && $('body').hasClass('rtl')) {
// or if no chars (that we are interested, but body is set to rtl)
if(RTLnum > LTRnum
|| ($queetText.html().length==0 && $('body').hasClass('rtl'))) {
$streamItem.children('.stream-item').children('.queet').addClass('rtl');
}
return $streamItem.html().replace(/@<a/gi,'<a').replace(/!<a/gi,'<a').replace(/@<span class="vcard">/gi,'<span class="vcard">').replace(/!<span class="vcard">/gi,'<span class="vcard">').replace(/#<span class="tag">/gi,'<span class="tag">'); // hacky way to get @#! into mention tags to stop bidirection (css sets an @ with before content method)
}
else {
// for ltr languages we move @, ! and # to inside
$streamItem.find('.queet-text').find('.h-card.mention').prepend('@');
$streamItem.find('.queet-text').find('.h-card.group').prepend('!');
$streamItem.find('.queet-text').find('a[rel="tag"]').prepend('#');
}
// we remove @, ! and #, they are added as pseudo elements, or have been moved to the inside
return $streamItem.html().replace(/@<a/gi,'<a').replace(/!<a/gi,'<a').replace(/@<span class="vcard">/gi,'<span class="vcard">').replace(/!<span class="vcard">/gi,'<span class="vcard">').replace(/#<span class="tag">/gi,'<span class="tag">');
}