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

added group member and admin user lists and paging to user lists

Browse Source
This commit is contained in:
Hannes Mannerheim 2013-08-20 15:26:25 +02:00
parent 0484edb07a
commit e44fb59f91
3 changed files with 204 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

139
js/dom-functions-1.js
View File

@ -287,20 +287,20 @@ function setNewCurrentStream(stream,actionOnSuccess,setLocation) {
window.currentStream = stream; window.currentStream = stream;
// if this is a @user stream, i.e. user's queets, user's followers, user's following, we set _queets_ as the default stream in the menu // if this is a @user stream, i.e. user's queets, user's followers, user's following, we set _queets_ as the default stream in the menu
if(stream.substring(0,36) == 'statuses/followers.json?screen_name=' if(stream.substring(0,45) == 'statuses/followers.json?count=20&screen_name='
|| stream.substring(0,34) == 'statuses/friends.json?screen_name=' || stream.substring(0,43) == 'statuses/friends.json?count=20&screen_name='
|| stream.substring(0,39) == 'statusnet/groups/list.json?screen_name=' || stream.substring(0,48) == 'statusnet/groups/list.json?count=10&screen_name='
|| stream.substring(0,43) == 'statuses/friends_timeline.json?screen_name=' || stream.substring(0,43) == 'statuses/friends_timeline.json?screen_name='
|| stream.substring(0,27) == 'favorites.json?screen_name=' || stream.substring(0,27) == 'favorites.json?screen_name='
|| stream.substring(0,35) == 'statuses/mentions.json?screen_name=' || stream.substring(0,35) == 'statuses/mentions.json?screen_name='
|| stream.substring(0,27) == 'statuses/user_timeline.json') { || stream.substring(0,27) == 'statuses/user_timeline.json') {
var defaultStreamName = 'statuses/user_timeline' + stream.substring(stream.indexOf('.json')); var defaultStreamName = 'statuses/user_timeline.json?' + stream.substring(stream.indexOf('screen_name='));
var streamHeader = '@' + stream.substring(stream.indexOf('=')+1); var streamHeader = '@' + stream.substring(stream.lastIndexOf('=')+1);
} }
// if this is a my user streams, i.e. my followers, my following // if this is a my user streams, i.e. my followers, my following
else if(stream == 'statuses/followers.json' else if(stream == 'statuses/followers.json?count=20'
|| stream == 'statuses/friends.json' || stream == 'statuses/friends.json?count=20'
|| stream == 'statusnet/groups/list.json') { || stream == 'statusnet/groups/list.json?count=10') {
var defaultStreamName = stream; var defaultStreamName = stream;
var streamHeader = '@' + window.loginUsername; var streamHeader = '@' + window.loginUsername;
} }
@ -314,9 +314,11 @@ function setNewCurrentStream(stream,actionOnSuccess,setLocation) {
} }
// if this is a !group stream // if this is a !group stream
else if(stream.substring(0,26) == 'statusnet/groups/timeline/') { else if(stream.substring(0,26) == 'statusnet/groups/timeline/'
var defaultStreamName = stream; || stream.substring(0,28) == 'statusnet/groups/membership/'
var streamHeader = '!' + stream.substring(stream.indexOf('/timeline/')+10,stream.indexOf('.json')); || stream.substring(0,24) == 'statusnet/groups/admins/') {
var defaultStreamName = 'statusnet/groups/timeline/' + stream.substring(stream.lastIndexOf('/')+1);
var streamHeader = '!' + stream.substring(stream.lastIndexOf('/')+1, stream.indexOf('.json'));
} }
// if this is a #tag stream // if this is a #tag stream
else if(stream.substring(0,24) == 'statusnet/tags/timeline/') { else if(stream.substring(0,24) == 'statusnet/tags/timeline/') {
@ -348,6 +350,12 @@ function setNewCurrentStream(stream,actionOnSuccess,setLocation) {
else if(stream.substring(0,26) == 'statusnet/groups/list.json') { else if(stream.substring(0,26) == 'statusnet/groups/list.json') {
var h2FeedHeader = window.sL.groups; var h2FeedHeader = window.sL.groups;
} }
else if(stream.substring(0,28) == 'statusnet/groups/membership/') {
var h2FeedHeader = window.sL.memberCount;
}
else if(stream.substring(0,24) == 'statusnet/groups/admins/') {
var h2FeedHeader = window.sL.adminCount;
}
else if(stream.substring(0,43) == 'statuses/friends_timeline.json?screen_name=') { else if(stream.substring(0,43) == 'statuses/friends_timeline.json?screen_name=') {
var h2FeedHeader = '<span style="unicode-bidi:bidi-override;direction:ltr;">' + streamHeader + '/all</span>'; // ugly rtl fix, sry, we should have translations for this stream header var h2FeedHeader = '<span style="unicode-bidi:bidi-override;direction:ltr;">' + streamHeader + '/all</span>'; // ugly rtl fix, sry, we should have translations for this stream header
} }
@ -387,7 +395,16 @@ function setNewCurrentStream(stream,actionOnSuccess,setLocation) {
if(user_data) { if(user_data) {
// while waiting for this data user might have changed stream, so only proceed if current stream still is this one // while waiting for this data user might have changed stream, so only proceed if current stream still is this one
if(window.currentStream == stream) { if(window.currentStream == stream) {
profileCardFromFirstObject(profile_data,window.loginUsername); // show profile card
// get screen name from stream, if not found, this is me
if(stream.indexOf('screen_name=')>-1) {
var thisUsersScreenName = stream.substring(stream.indexOf('screen_name=')+12);
}
else {
var thisUsersScreenName = window.loginUsername;
}
profileCardFromFirstObject(profile_data,thisUsersScreenName); // show profile card
checkForNewQueetsInterval=window.setInterval(function(){checkForNewQueets()},window.timeBetweenPolling); // start interval again checkForNewQueetsInterval=window.setInterval(function(){checkForNewQueets()},window.timeBetweenPolling); // start interval again
remove_spinner(); remove_spinner();
$('#feed-body').html(''); // empty feed only now so the scrollers don't flicker on and off $('#feed-body').html(''); // empty feed only now so the scrollers don't flicker on and off
@ -416,8 +433,10 @@ function setNewCurrentStream(stream,actionOnSuccess,setLocation) {
profileCardFromFirstObject(queet_data,thisUsersScreenName); profileCardFromFirstObject(queet_data,thisUsersScreenName);
} }
// show group profile card if this is a group stream // show group profile card if this is a group stream
else if(stream.substring(0,26) == 'statusnet/groups/timeline/') { else if(stream.substring(0,26) == 'statusnet/groups/timeline/'
var thisGroupAlias = stream.replace('statusnet/groups/timeline/','').replace('.json',''); || stream.substring(0,28) == 'statusnet/groups/membership/'
|| stream.substring(0,24) == 'statusnet/groups/admins/') {
var thisGroupAlias = stream.substring(stream.lastIndexOf('/')+1, stream.indexOf('.json'));
groupProfileCard(thisGroupAlias); groupProfileCard(thisGroupAlias);
} }
@ -446,12 +465,12 @@ function setNewCurrentStream(stream,actionOnSuccess,setLocation) {
function setUrlFromStream(stream) { function setUrlFromStream(stream) {
if(stream.substring(0,36) == 'statuses/followers.json?screen_name=') { if(stream.substring(0,45) == 'statuses/followers.json?count=20&screen_name=') {
var screenName = stream.substring(stream.indexOf('=')+1); var screenName = stream.substring(stream.lastIndexOf('=')+1);
history.pushState({strm:stream},'','/' + screenName + '/subscribers'); history.pushState({strm:stream},'','/' + screenName + '/subscribers');
} }
else if(stream.substring(0,34) == 'statuses/friends.json?screen_name=') { else if(stream.substring(0,43) == 'statuses/friends.json?count=20&screen_name=') {
var screenName = stream.substring(stream.indexOf('=')+1); var screenName = stream.substring(stream.lastIndexOf('=')+1);
history.pushState({strm:stream},'','/' + screenName + '/subscriptions'); history.pushState({strm:stream},'','/' + screenName + '/subscriptions');
} }
else if(stream.substring(0,35) == 'statuses/mentions.json?screen_name=') { else if(stream.substring(0,35) == 'statuses/mentions.json?screen_name=') {
@ -462,14 +481,14 @@ function setUrlFromStream(stream) {
var screenName = stream.substring(stream.indexOf('=')+1); var screenName = stream.substring(stream.indexOf('=')+1);
history.pushState({strm:stream},'','/' + screenName + '/favorites'); history.pushState({strm:stream},'','/' + screenName + '/favorites');
} }
else if(stream.substring(0,39) == 'statusnet/groups/list.json?screen_name=') { else if(stream.substring(0,48) == 'statusnet/groups/list.json?count=10&screen_name=') {
var screenName = stream.substring(stream.indexOf('=')+1); var screenName = stream.substring(stream.lastIndexOf('=')+1);
history.pushState({strm:stream},'','/' + screenName + '/groups'); history.pushState({strm:stream},'','/' + screenName + '/groups');
} }
else if(stream == 'statuses/followers.json') { else if(stream == 'statuses/followers.json?count=20') {
history.pushState({strm:stream},'','/' + window.loginUsername + '/subscribers'); history.pushState({strm:stream},'','/' + window.loginUsername + '/subscribers');
} }
else if(stream == 'statuses/friends.json') { else if(stream == 'statuses/friends.json?count=20') {
history.pushState({strm:stream},'','/' + window.loginUsername + '/subscriptions'); history.pushState({strm:stream},'','/' + window.loginUsername + '/subscriptions');
} }
else if(stream == 'statuses/mentions.json') { else if(stream == 'statuses/mentions.json') {
@ -478,7 +497,7 @@ function setUrlFromStream(stream) {
else if(stream == 'favorites.json') { else if(stream == 'favorites.json') {
history.pushState({strm:stream},'','/' + window.loginUsername + '/favorites'); history.pushState({strm:stream},'','/' + window.loginUsername + '/favorites');
} }
else if(stream == 'statusnet/groups/list.json') { else if(stream == 'statusnet/groups/list.json?count=10') {
history.pushState({strm:stream},'','/' + window.loginUsername + '/groups'); history.pushState({strm:stream},'','/' + window.loginUsername + '/groups');
} }
else if (stream.substring(0,27) == 'statuses/user_timeline.json') { else if (stream.substring(0,27) == 'statuses/user_timeline.json') {
@ -499,9 +518,17 @@ function setUrlFromStream(stream) {
history.pushState({strm:stream},'','/'); history.pushState({strm:stream},'','/');
} }
else if(stream.substring(0,26) == 'statusnet/groups/timeline/') { else if(stream.substring(0,26) == 'statusnet/groups/timeline/') {
var groupName = stream.substring(stream.indexOf('/timeline/')+10,stream.indexOf('.json')); var groupName = stream.substring(stream.lastIndexOf('/')+1,stream.indexOf('.json'));
history.pushState({strm:stream},'','/group/' + groupName); history.pushState({strm:stream},'','/group/' + groupName);
} }
else if(stream.substring(0,28) == 'statusnet/groups/membership/') {
var groupName = stream.substring(stream.lastIndexOf('/')+1,stream.indexOf('.json'));
history.pushState({strm:stream},'','/group/' + groupName + '/members');
}
else if(stream.substring(0,24) == 'statusnet/groups/admins/') {
var groupName = stream.substring(stream.lastIndexOf('/')+1,stream.indexOf('.json'));
history.pushState({strm:stream},'','/group/' + groupName + '/admins');
}
else if(stream.substring(0,24) == 'statusnet/tags/timeline/') { else if(stream.substring(0,24) == 'statusnet/tags/timeline/') {
var tagName = stream.substring(stream.indexOf('/timeline/')+10,stream.indexOf('.json')); var tagName = stream.substring(stream.indexOf('/timeline/')+10,stream.indexOf('.json'));
history.pushState({strm:stream},'','/tag/' + tagName); history.pushState({strm:stream},'','/tag/' + tagName);
@ -580,10 +607,10 @@ function getStreamFromUrl() {
var userToStream = loc.replace('/','').replace('/subscribers',''); var userToStream = loc.replace('/','').replace('/subscribers','');
if(userToStream.length>0) { if(userToStream.length>0) {
if(window.loginUsername == userToStream) { if(window.loginUsername == userToStream) {
streamToSet = 'statuses/followers.json'; streamToSet = 'statuses/followers.json?count=20';
} }
else { else {
streamToSet = 'statuses/followers.json?screen_name=' + userToStream; streamToSet = 'statuses/followers.json?count=20&screen_name=' + userToStream;
} }
} }
} }
@ -593,10 +620,10 @@ function getStreamFromUrl() {
var userToStream = loc.replace('/','').replace('/subscriptions',''); var userToStream = loc.replace('/','').replace('/subscriptions','');
if(userToStream.length>0) { if(userToStream.length>0) {
if(window.loginUsername == userToStream) { if(window.loginUsername == userToStream) {
streamToSet = 'statuses/friends.json'; streamToSet = 'statuses/friends.json?count=20';
} }
else { else {
streamToSet = 'statuses/friends.json?screen_name=' + userToStream; streamToSet = 'statuses/friends.json?count=20&screen_name=' + userToStream;
} }
} }
} }
@ -606,10 +633,10 @@ function getStreamFromUrl() {
var userToStream = loc.replace('/','').replace('/groups',''); var userToStream = loc.replace('/','').replace('/groups','');
if(userToStream.length>0) { if(userToStream.length>0) {
if(window.loginUsername == userToStream) { if(window.loginUsername == userToStream) {
streamToSet = 'statusnet/groups/list.json'; streamToSet = 'statusnet/groups/list.json?count=10';
} }
else { else {
streamToSet = 'statusnet/groups/list.json?screen_name=' + userToStream; streamToSet = 'statusnet/groups/list.json?count=10&screen_name=' + userToStream;
} }
} }
} }
@ -622,13 +649,28 @@ function getStreamFromUrl() {
} }
} }
// {domain}/group/{group} // {domain}/group/{group}/members, {domain}/group/{group}/admins or {domain}/group/{group}
else if (loc.indexOf('/group/')>-1) { // we assume we don't get any /group/{id}/id-urls, because we shouldn't else if (loc.indexOf('/group/')>-1) {
if(loc.indexOf('/members')>-1) {
var groupToStream = loc.replace('/group/','').replace('/members','');
if(groupToStream.length>0) {
streamToSet = 'statusnet/groups/membership/' + groupToStream + '.json?count=20';
}
}
else if(loc.indexOf('/admins')>-1) {
var groupToStream = loc.replace('/group/','').replace('/admins','');
if(groupToStream.length>0) {
streamToSet = 'statusnet/groups/admins/' + groupToStream + '.json?count=20';
}
}
else {
var groupToStream = loc.replace('/group/',''); var groupToStream = loc.replace('/group/','');
if(groupToStream.length>0) { if(groupToStream.length>0) {
streamToSet = 'statusnet/groups/timeline/' + groupToStream + '.json'; streamToSet = 'statusnet/groups/timeline/' + groupToStream + '.json';
} }
} }
}
// {domain}/search/notice?q={urlencoded searh terms} // {domain}/search/notice?q={urlencoded searh terms}
else if (loc.indexOf('/search/notice?q=')>-1) { else if (loc.indexOf('/search/notice?q=')>-1) {
@ -1097,7 +1139,15 @@ function addToFeed(feed, after, extraClasses) {
var extraClassesThisRun = extraClasses; var extraClassesThisRun = extraClasses;
// if this is a user feed // if this is a user feed
if(window.currentStream.substring(0,21) == 'statuses/friends.json' || window.currentStream.substring(0,18) == 'statuses/followers') { if(window.currentStream.substring(0,21) == 'statuses/friends.json'
|| window.currentStream.substring(0,18) == 'statuses/followers'
|| window.currentStream.substring(0,28) == 'statusnet/groups/membership/'
|| window.currentStream.substring(0,24) == 'statusnet/groups/admins/') {
// only if not user is already in stream
if($('#stream-item-' + obj.id).length == 0) {
obj.description = obj.description || ''; obj.description = obj.description || '';
// show user actions // show user actions
@ -1113,13 +1163,23 @@ function addToFeed(feed, after, extraClasses) {
} }
} }
var userHtml = '<div class="stream-item user"><div class="queet">' + followButton + '<div class="queet-content"><div class="stream-item-header"><a class="account-group" href="' + obj.statusnet_profile_url + '"><img class="avatar" src="' + obj.profile_image_url + '" /><strong class="name" data-user-id="' + obj.id + '">' + obj.name + '</strong> <span class="screen-name">@' + obj.screen_name + '</span></a></div><div class="queet-text">' + obj.description + '</div></div></div></div>'; var userHtml = '<div id="stream-item-' + obj.id + '" class="stream-item user"><div class="queet">' + followButton + '<div class="queet-content"><div class="stream-item-header"><a class="account-group" href="' + obj.statusnet_profile_url + '"><img class="avatar" src="' + obj.profile_image_url + '" /><strong class="name" data-user-id="' + obj.id + '">' + obj.name + '</strong> <span class="screen-name">@' + obj.screen_name + '</span></a></div><div class="queet-text">' + obj.description + '</div></div></div></div>';
if(after) {
$('#' + after).after(userHtml);
}
else {
$('#feed-body').prepend(userHtml); $('#feed-body').prepend(userHtml);
} }
}
}
// if this is a group feed // if this is a list of groups
else if(window.currentStream.substring(0,26) == 'statusnet/groups/list.json') { else if(window.currentStream.substring(0,26) == 'statusnet/groups/list.json') {
// only if not group is already in stream
if($('#stream-item-' + obj.id).length == 0) {
obj.description = obj.description || ''; obj.description = obj.description || '';
obj.stream_logo = obj.stream_logo || 'http://quitter.se/theme/quitter-theme2/default-avatar-stream.png'; obj.stream_logo = obj.stream_logo || 'http://quitter.se/theme/quitter-theme2/default-avatar-stream.png';
@ -1133,9 +1193,16 @@ function addToFeed(feed, after, extraClasses) {
var memberButton = '<div class="user-actions"><button data-group-id="' + obj.id + '" type="button" class="member-button ' + memberClass + '"><span class="button-text join-text"><i class="join"></i>' + window.sL.joinGroup + '</span><span class="button-text ismember-text">' + window.sL.isMemberOfGroup + '</span><span class="button-text leave-text">' + window.sL.leaveGroup + '</span></button></div>'; var memberButton = '<div class="user-actions"><button data-group-id="' + obj.id + '" type="button" class="member-button ' + memberClass + '"><span class="button-text join-text"><i class="join"></i>' + window.sL.joinGroup + '</span><span class="button-text ismember-text">' + window.sL.isMemberOfGroup + '</span><span class="button-text leave-text">' + window.sL.leaveGroup + '</span></button></div>';
} }
var groupHtml = '<div class="stream-item user"><div class="queet">' + memberButton + '<div class="queet-content"><div class="stream-item-header"><a class="account-group" href="' + obj.url + '"><img class="avatar" src="' + obj.stream_logo + '" /><strong class="name" data-group-id="' + obj.id + '">' + obj.fullname + '</strong> <span class="screen-name">!' + obj.nickname + '</span></a></div><div class="queet-text">' + obj.description + '</div></div></div></div>'; var groupHtml = '<div id="stream-item-' + obj.id + '" class="stream-item user"><div class="queet">' + memberButton + '<div class="queet-content"><div class="stream-item-header"><a class="account-group" href="' + obj.url + '"><img class="avatar" src="' + obj.stream_logo + '" /><strong class="name" data-group-id="' + obj.id + '">' + obj.fullname + '</strong> <span class="screen-name">!' + obj.nickname + '</span></a></div><div class="queet-text">' + obj.description + '</div></div></div></div>';
if(after) {
$('#' + after).after(groupHtml);
}
else {
$('#feed-body').prepend(groupHtml); $('#feed-body').prepend(groupHtml);
} }
}
}
// if this is a retweet // if this is a retweet
else if(typeof obj.retweeted_status != 'undefined') { else if(typeof obj.retweeted_status != 'undefined') {

47
js/qvitter-1.js
View File

@ -351,43 +351,41 @@ $('body').on('click','.stream-selection',function(event){
· ·
· · · · · · · · · · · · · */ · · · · · · · · · · · · · */
// my queets, etc
$('#user-header, #user-queets, #user-following, #user-followers, #user-groups').on('click',function(){ $('#user-header, #user-queets, #user-following, #user-followers, #user-groups').on('click',function(){
if($(this).attr('id') == 'user-header' || $(this).attr('id') == 'user-queets') { if($(this).attr('id') == 'user-header' || $(this).attr('id') == 'user-queets') {
setNewCurrentStream('statuses/user_timeline.json?screen_name=' + window.loginUsername,function(){},true); setNewCurrentStream('statuses/user_timeline.json?screen_name=' + window.loginUsername,function(){},true);
} }
else if($(this).attr('id') == 'user-following') { else if($(this).attr('id') == 'user-following') {
setNewCurrentStream('statuses/friends.json',function(){},true); setNewCurrentStream('statuses/friends.json?count=20',function(){},true);
} }
else if($(this).attr('id') == 'user-followers') { else if($(this).attr('id') == 'user-followers') {
setNewCurrentStream('statuses/followers.json',function(){},true); setNewCurrentStream('statuses/followers.json?count=20',function(){},true);
} }
else if($(this).attr('id') == 'user-groups') { else if($(this).attr('id') == 'user-groups') {
setNewCurrentStream('statusnet/groups/list.json',function(){},true); setNewCurrentStream('statusnet/groups/list.json?count=10',function(){},true);
} }
}); });
/* · /* ·
· ·
· Select a stream when clicking on queets, followers etc in a profile card · Select a stream when clicking on queets, followers etc in a profile card or feed header
· ·
· · · · · · · · · · · · · */ · · · · · · · · · · · · · */
// any users streams $('body').on('click','.profile-banner-footer .stats li a, .queet-stream',function(){
$('body').on('click','.profile-banner-footer .tweet-stats, .profile-banner-footer .following-stats, .groups-stats, .profile-banner-footer .follower-stats, .queet-stream',function(){
var screenName = $('.profile-card-inner .screen-name').html().substring(1); var screenName = $('.profile-card-inner .screen-name').html().substring(1);
if($(this).hasClass('tweet-stats')) { if($(this).hasClass('tweet-stats')) {
setNewCurrentStream('statuses/user_timeline.json?screen_name=' + screenName,function(){},true); setNewCurrentStream('statuses/user_timeline.json?screen_name=' + screenName,function(){},true);
} }
else if($(this).hasClass('following-stats')) { else if($(this).hasClass('following-stats')) {
setNewCurrentStream('statuses/friends.json?screen_name=' + screenName,function(){},true); setNewCurrentStream('statuses/friends.json?count=20&screen_name=' + screenName,function(){},true);
} }
else if($(this).hasClass('follower-stats')) { else if($(this).hasClass('follower-stats')) {
setNewCurrentStream('statuses/followers.json?screen_name=' + screenName,function(){},true); setNewCurrentStream('statuses/followers.json?count=20&screen_name=' + screenName,function(){},true);
} }
else if($(this).hasClass('groups-stats')) { else if($(this).hasClass('groups-stats')) {
setNewCurrentStream('statusnet/groups/list.json?screen_name=' + screenName,function(){},true); setNewCurrentStream('statusnet/groups/list.json?count=10&screen_name=' + screenName,function(){},true);
} }
else if($(this).hasClass('queets')) { else if($(this).hasClass('queets')) {
setNewCurrentStream('statuses/user_timeline.json?screen_name=' + screenName,function(){},true); setNewCurrentStream('statuses/user_timeline.json?screen_name=' + screenName,function(){},true);
@ -398,6 +396,12 @@ $('body').on('click','.profile-banner-footer .tweet-stats, .profile-banner-foote
else if($(this).hasClass('favorites')) { else if($(this).hasClass('favorites')) {
setNewCurrentStream('favorites.json?screen_name=' + screenName,function(){},true); setNewCurrentStream('favorites.json?screen_name=' + screenName,function(){},true);
} }
else if($(this).hasClass('member-stats')) {
setNewCurrentStream('statusnet/groups/membership/' + screenName + '.json?count=20',function(){},true);
}
else if($(this).hasClass('admin-stats')) {
setNewCurrentStream('statusnet/groups/admins/' + screenName + '.json?count=20',function(){},true);
}
}); });
@ -604,8 +608,6 @@ $('#history-container').on("sortupdate", function() {
$(window).scroll(function() { $(window).scroll(function() {
if($(window).scrollTop() + $(window).height() > $(document).height() - 1000) { if($(window).scrollTop() + $(window).height() > $(document).height() - 1000) {
// only of logged in and not user stream
if($('#user-container').css('display') == 'block' && $('.stream-item.user').length==0) {
// not if we're already loading // not if we're already loading
if(!$('body').hasClass('loading-older')) { if(!$('body').hasClass('loading-older')) {
$('body').addClass('loading-older'); $('body').addClass('loading-older');
@ -617,8 +619,13 @@ $(window).scroll(function() {
var lastStreamItemId = $('#feed-body').children('.stream-item').last().attr('id'); var lastStreamItemId = $('#feed-body').children('.stream-item').last().attr('id');
// if this is search, we need page and rpp vars, we store page number in an attribute // if this is search or users lists, we need page and rpp vars, we store page number in an attribute
if(window.currentStream.substring(0,6) == 'search') { if(window.currentStream.substring(0,6) == 'search'
|| window.currentStream.substring(0,23) == 'statuses/followers.json'
|| window.currentStream.substring(0,21) == 'statuses/friends.json'
|| window.currentStream.substring(0,26) == 'statusnet/groups/list.json'
|| window.currentStream.substring(0,28) == 'statusnet/groups/membership/'
|| window.currentStream.substring(0,24) == 'statusnet/groups/admins/') {
if(typeof $('#feed-body').attr('data-search-page-number') != 'undefined') { if(typeof $('#feed-body').attr('data-search-page-number') != 'undefined') {
var searchPage = parseInt($('#feed-body').attr('data-search-page-number'),10); var searchPage = parseInt($('#feed-body').attr('data-search-page-number'),10);
} }
@ -626,7 +633,7 @@ $(window).scroll(function() {
var searchPage=2; var searchPage=2;
} }
var nextPage = searchPage+1; var nextPage = searchPage+1;
var getVars = '&rpp=20&page=' + searchPage; var getVars = qOrAmp(window.currentStream) + 'rpp=20&page=' + searchPage; // search uses 'rrp' var and others 'count' for paging, though we can add rrp to others aswell without any problem
} }
// normal streams // normal streams
else { else {
@ -639,8 +646,13 @@ $(window).scroll(function() {
addToFeed(data, lastStreamItemId,'visible'); addToFeed(data, lastStreamItemId,'visible');
$('body').removeClass('loading-older'); $('body').removeClass('loading-older');
// if this is search, we remeber page number // if this is search our group users lists, we remember page number
if(window.currentStream.substring(0,6) == 'search') { if(window.currentStream.substring(0,6) == 'search'
|| window.currentStream.substring(0,23) == 'statuses/followers.json'
|| window.currentStream.substring(0,21) == 'statuses/friends.json'
|| window.currentStream.substring(0,26) == 'statusnet/groups/list.json'
|| window.currentStream.substring(0,28) == 'statusnet/groups/membership/'
|| window.currentStream.substring(0,24) == 'statusnet/groups/admins/') {
$('#feed-body').attr('data-search-page-number',nextPage); $('#feed-body').attr('data-search-page-number',nextPage);
} }
@ -649,7 +661,6 @@ $(window).scroll(function() {
}); });
} }
} }
}
}); });

2
settings.php
View File

@ -52,7 +52,7 @@ $forcessl = false;
// USE history.pushState TO REWRITE URLS IN THE LOCATION BAR (use with mod_rewrite) // USE history.pushState TO REWRITE URLS IN THE LOCATION BAR (use with mod_rewrite)
// Try this rule in .htaccess: // Try this rule in .htaccess:
// RewriteRule ^(search/)?(notice\?q=|group/|tag/)?([a-z0-9%]+)?(/all|/subscriptions|/subscribers|/groups|/replies|/favorites)?$ /theme/quitter-theme2/qvitter/index.php [L] // RewriteRule ^(search/)?(notice\?q=|group/|tag/)?([a-z0-9%]+)?(/all|/subscriptions|/subscribers|/groups|/replies|/favorites|/members|/admins)?$ /theme/quitter-theme2/qvitter/index.php [L]
$usehistorypushstate = false; $usehistorypushstate = false;
// FULL PATH TO THIS QVITTER APP // FULL PATH TO THIS QVITTER APP