twisterarmy/twister-html
1
0
Fork 0
mirror of https://github.com/twisterarmy/twister-html.git synced 2025-09-02 17:22:08 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Eugene Kuligin 2015-04-20 03:42:14 +03:00
commit fbeee7cbf6
2 changed files with 34 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
js/options.js
View File

@ -222,6 +222,9 @@ var TwisterOptions = function()
$('#language').val( this.getOption('locLang', 'auto') ); $('#language').val( this.getOption('locLang', 'auto') );
$('#language').on('change', function() { $('#language').on('change', function() {
$.Options.setOption('locLang', $(this).val()); $.Options.setOption('locLang', $(this).val());
if($(this).val() != 'auto') {
twisterRpc("setpreferredspamlang", [$(this).val()]);
}
location.reload(); location.reload();
}) })
} }

2
js/twister_timeline.js
View File

@ -189,7 +189,6 @@ function showPosts(req, posts)
var streamItemsParent = $.MAL.getStreamPostsParent(); var streamItemsParent = $.MAL.getStreamPostsParent();
for( var i = 0; i < posts.length; i++ ) { for( var i = 0; i < posts.length; i++ ) {
if (req.users.indexOf(posts[i]['userpost']['n']) > -1 || req.getspam) { // FIXME maybe it's unecessary check but currently we got unwanted adverting posts which are coming with requested ones from 'getposts' sometimes
var post = posts[i]; var post = posts[i];
//console.log(post); //console.log(post);
var streamPost = postToElem(post, "original", req.getspam); var streamPost = postToElem(post, "original", req.getspam);
@ -227,7 +226,6 @@ function showPosts(req, posts)
streamPost.show(); streamPost.show();
req.reportProcessedPost(post["userpost"]["n"],post["userpost"]["k"], streamPostAppended); req.reportProcessedPost(post["userpost"]["n"],post["userpost"]["k"], streamPostAppended);
} }
}
} }
// request timeline update for a given list of users // request timeline update for a given list of users