Merge pull request #4514 from annando/update-network
After a post or "like" only the single thread is now updated
This commit is contained in:
Hypolite Petovan
GitHub
commit
90f91dcbd5
|
|
@ -358,7 +358,7 @@ function networkConversation($a, $items, $mode, $update, $ordering = '')
|
|||
return $o;
|
||||
}
|
||||
|
||||
function network_content(App $a, $update = 0)
|
||||
function network_content(App $a, $update = 0, $parent = 0)
|
||||
{
|
||||
if (!local_user()) {
|
||||
return Login::form();
|
||||
|
|
@ -385,7 +385,7 @@ function network_content(App $a, $update = 0)
|
|||
if ($nouveau) {
|
||||
$o = networkFlatView($a, $update);
|
||||
} else {
|
||||
$o = networkThreadedView($a, $update);
|
||||
$o = networkThreadedView($a, $update, $parent);
|
||||
}
|
||||
|
||||
return $o;
|
||||
|
|
@ -476,7 +476,7 @@ function networkFlatView(App $a, $update = 0)
|
|||
* @param integer $update Used for the automatic reloading
|
||||
* @return string HTML of the network content in flat view
|
||||
*/
|
||||
function networkThreadedView(App $a, $update = 0)
|
||||
function networkThreadedView(App $a, $update, $parent)
|
||||
{
|
||||
// Rawmode is used for fetching new content at the end of the page
|
||||
$rawmode = (isset($_GET['mode']) AND ( $_GET['mode'] == 'raw'));
|
||||
|
|
@ -759,17 +759,27 @@ function networkThreadedView(App $a, $update = 0)
|
|||
|
||||
// Fetch a page full of parent items for this page
|
||||
if ($update) {
|
||||
if (Config::get('system', 'like_no_comment')) {
|
||||
$sql_extra4 = " AND `item`.`verb` = '" . ACTIVITY_POST . "'";
|
||||
if (!empty($parent)) {
|
||||
// Load only a single thread
|
||||
$sql_extra4 = "`item`.`id` = ".intval($parent);
|
||||
} else {
|
||||
$sql_extra4 = '';
|
||||
// Load all unseen items
|
||||
$sql_extra4 = "`item`.`unseen`";
|
||||
if (Config::get("system", "like_no_comment")) {
|
||||
$sql_extra4 .= " AND `item`.`verb` = '".ACTIVITY_POST."'";
|
||||
}
|
||||
if ($order === 'post') {
|
||||
// Only show toplevel posts when updating posts in this order mode
|
||||
$sql_extra4 .= " AND `item`.`id` = `item`.`parent`";
|
||||
}
|
||||
}
|
||||
|
||||
$r = q("SELECT `item`.`parent-uri` AS `uri`, `item`.`parent` AS `item_id`, $sql_order AS `order_date`
|
||||
FROM `item` $sql_post_table
|
||||
STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
|
||||
AND (NOT `contact`.`blocked` OR `contact`.`pending`)
|
||||
WHERE `item`.`uid` = %d AND `item`.`visible` AND NOT `item`.`deleted` $sql_extra4
|
||||
AND NOT `item`.`moderated` AND `item`.`unseen`
|
||||
WHERE `item`.`uid` = %d AND `item`.`visible` AND NOT `item`.`deleted`
|
||||
AND NOT `item`.`moderated` AND $sql_extra4
|
||||
$sql_extra3 $sql_extra $sql_range $sql_nets
|
||||
ORDER BY `order_date` DESC LIMIT 100",
|
||||
intval(local_user())
|
||||
|
|
|
|||
|
|
@ -12,14 +12,15 @@ require_once "mod/network.php";
|
|||
|
||||
function update_network_content(App $a)
|
||||
{
|
||||
$profile_uid = intval($_GET["p"]);
|
||||
$profile_uid = intval($_GET['p']);
|
||||
$parent = intval($_GET['item']);
|
||||
|
||||
header("Content-type: text/html");
|
||||
echo "<!DOCTYPE html><html><body>\r\n";
|
||||
echo "<section>";
|
||||
|
||||
if (!PConfig::get($profile_uid, "system", "no_auto_update") || ($_GET["force"] == 1)) {
|
||||
$text = network_content($a, $profile_uid);
|
||||
$text = network_content($a, $profile_uid, $parent);
|
||||
} else {
|
||||
$text = "";
|
||||
}
|
||||
|
|
|
|||
180
view/js/main.js
180
view/js/main.js
|
|
@ -1,11 +1,11 @@
|
|||
function resizeIframe(obj) {
|
||||
//obj.style.height = 0;
|
||||
_resizeIframe(obj, 0);
|
||||
}
|
||||
|
||||
function _resizeIframe(obj, desth) {
|
||||
var h = obj.style.height;
|
||||
var ch = obj.contentWindow.document.body.scrollHeight;
|
||||
|
||||
if (h == (ch + 'px')) {
|
||||
return;
|
||||
}
|
||||
|
|
@ -18,14 +18,14 @@
|
|||
function openClose(theID) {
|
||||
if (document.getElementById(theID).style.display == "block") {
|
||||
document.getElementById(theID).style.display = "none"
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
document.getElementById(theID).style.display = "block"
|
||||
}
|
||||
}
|
||||
|
||||
function openMenu(theID) {
|
||||
var el = document.getElementById(theID)
|
||||
|
||||
if (el) {
|
||||
el.style.display = "block";
|
||||
}
|
||||
|
|
@ -33,6 +33,7 @@
|
|||
|
||||
function closeMenu(theID) {
|
||||
var el = document.getElementById(theID)
|
||||
|
||||
if (el) {
|
||||
el.style.display = "none";
|
||||
}
|
||||
|
|
@ -40,15 +41,16 @@
|
|||
|
||||
function decodeHtml(html) {
|
||||
var txt = document.createElement("textarea");
|
||||
|
||||
txt.innerHTML = html;
|
||||
return txt.value;
|
||||
}
|
||||
|
||||
|
||||
var src = null;
|
||||
var prev = null;
|
||||
var livetime = null;
|
||||
var force_update = false;
|
||||
var update_item = 0;
|
||||
var stopped = false;
|
||||
var totStopped = false;
|
||||
var timer = null;
|
||||
|
|
@ -93,15 +95,13 @@
|
|||
$(textarea).trigger('change');
|
||||
});
|
||||
|
||||
|
||||
|
||||
/* setup onoff widgets */
|
||||
$(".onoff input").each(function() {
|
||||
val = $(this).val();
|
||||
id = $(this).attr("id");
|
||||
$("#"+id+"_onoff ." + (val == 0 ? "on":"off")).addClass("hidden");
|
||||
|
||||
});
|
||||
|
||||
$(".onoff > a").click(function(event) {
|
||||
event.preventDefault();
|
||||
var input = $(this).siblings("input");
|
||||
|
|
@ -127,11 +127,15 @@
|
|||
var parent = $(this).parent();
|
||||
var isSelected = (last_popup_button && parent.attr('id') == last_popup_button.attr('id'));
|
||||
close_last_popup_menu();
|
||||
if(isSelected) return false;
|
||||
if (isSelected) {
|
||||
return false;
|
||||
}
|
||||
menu = $($(this).attr('rel'));
|
||||
e.preventDefault();
|
||||
e.stopPropagation();
|
||||
if (menu.attr('popup')=="false") return false;
|
||||
if (menu.attr('popup') == "false") {
|
||||
return false;
|
||||
}
|
||||
parent.toggleClass("selected");
|
||||
menu.toggle();
|
||||
if (menu.css("display") == "none") {
|
||||
|
|
@ -172,7 +176,9 @@
|
|||
/* nav update event */
|
||||
$('nav').bind('nav-update', function(e, data) {
|
||||
var invalid = data.invalid || 0;
|
||||
if(invalid == 1) { window.location.href=window.location.href }
|
||||
if (invalid == 1) {
|
||||
window.location.href=window.location.href
|
||||
}
|
||||
|
||||
['net', 'home', 'intro', 'mail', 'events', 'birthdays', 'notify'].forEach(function(type) {
|
||||
var number = data[type];
|
||||
|
|
@ -186,11 +192,21 @@
|
|||
});
|
||||
|
||||
var intro = data['intro'];
|
||||
if(intro == 0) { intro = ''; $('#intro-update-li').removeClass('show') } else { $('#intro-update-li').addClass('show') }
|
||||
if (intro == 0) {
|
||||
intro = ''; $('#intro-update-li').removeClass('show')
|
||||
} else {
|
||||
$('#intro-update-li').addClass('show')
|
||||
}
|
||||
|
||||
$('#intro-update-li').html(intro);
|
||||
|
||||
var mail = data['mail'];
|
||||
if(mail == 0) { mail = ''; $('#mail-update-li').removeClass('show') } else { $('#mail-update-li').addClass('show') }
|
||||
if (mail == 0) {
|
||||
mail = ''; $('#mail-update-li').removeClass('show')
|
||||
} else {
|
||||
$('#mail-update-li').addClass('show')
|
||||
}
|
||||
|
||||
$('#mail-update-li').html(mail);
|
||||
|
||||
$(".sidebar-group-li .notify").removeClass("show");
|
||||
|
|
@ -262,7 +278,9 @@
|
|||
// an empty "src" tag for an image will cause some browsers
|
||||
// to prefetch the root page of the Friendica hub, which will
|
||||
// unnecessarily load an entire profile/ or network/ page
|
||||
if($(el).data("src") != '') $(el).attr('src', $(el).data("src"));
|
||||
if ($(el).data("src") != '') {
|
||||
$(el).attr('src', $(el).data("src"));
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
|
|
@ -282,7 +300,6 @@
|
|||
|
||||
// Update the js scrollbars
|
||||
$('#nav-notifications-menu').perfectScrollbar('update');
|
||||
|
||||
});
|
||||
|
||||
NavUpdate();
|
||||
|
|
@ -294,6 +311,7 @@
|
|||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
if (event.keyCode == '19' || (event.ctrlKey && event.which == '32')) {
|
||||
event.preventDefault();
|
||||
if (stopped == false) {
|
||||
|
|
@ -305,11 +323,9 @@
|
|||
} else {
|
||||
unpause();
|
||||
}
|
||||
} else {
|
||||
if (!totStopped) {
|
||||
} else if (!totStopped) {
|
||||
unpause();
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
// Scroll to the next/previous thread when pressing J and K
|
||||
|
|
@ -345,17 +361,15 @@
|
|||
loadScrollContent();
|
||||
} else {
|
||||
// This method works with Chrome - but seems to be much slower in Firefox
|
||||
if ($(window).scrollTop() > (($("section").height() + $("header").height() + $("footer").height()) - $(window).height() * 1.5))
|
||||
if ($(window).scrollTop() > (($("section").height() + $("header").height() + $("footer").height()) - $(window).height() * 1.5)) {
|
||||
loadScrollContent();
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
});
|
||||
|
||||
function NavUpdate() {
|
||||
|
||||
if (!stopped) {
|
||||
var pingCmd = 'ping?format=json' + ((localUser != 0) ? '&f=&uid=' + localUser : '');
|
||||
$.get(pingCmd, function(data) {
|
||||
|
|
@ -382,39 +396,35 @@
|
|||
}
|
||||
|
||||
function liveUpdate(src) {
|
||||
if((src == null) || (stopped) || (! profile_uid)) { $('.like-rotator').hide(); return; }
|
||||
if(($('.comment-edit-text-full').length) || (in_progress)) {
|
||||
if ((src == null) || stopped || !profile_uid) {
|
||||
$('.like-rotator').hide(); return;
|
||||
}
|
||||
|
||||
if (($('.comment-edit-text-full').length) || in_progress) {
|
||||
if (livetime) {
|
||||
clearTimeout(livetime);
|
||||
}
|
||||
livetime = setTimeout(function() {liveUpdate(src)}, 5000);
|
||||
return;
|
||||
}
|
||||
if(livetime != null)
|
||||
livetime = null;
|
||||
|
||||
if (livetime != null) {
|
||||
livetime = null;
|
||||
}
|
||||
prev = 'live-' + src;
|
||||
|
||||
in_progress = true;
|
||||
|
||||
if ($(document).scrollTop() == 0)
|
||||
if ($(document).scrollTop() == 0) {
|
||||
force_update = true;
|
||||
|
||||
}
|
||||
var udargs = ((netargs.length) ? '/' + netargs : '');
|
||||
var update_url = 'update_' + src + udargs + '&p=' + profile_uid + '&page=' + profile_page + '&force=' + ((force_update) ? 1 : 0);
|
||||
var update_url = 'update_' + src + udargs + '&p=' + profile_uid + '&page=' + profile_page + '&force=' + ((force_update) ? 1 : 0) + '&item=' + update_item;
|
||||
|
||||
$.get(update_url,function(data) {
|
||||
in_progress = false;
|
||||
force_update = false;
|
||||
// $('.collapsed-comments',data).each(function() {
|
||||
// var ident = $(this).attr('id');
|
||||
// var is_hidden = $('#' + ident).is(':hidden');
|
||||
// if($('#' + ident).length) {
|
||||
// $('#' + ident).replaceWith($(this));
|
||||
// if(is_hidden)
|
||||
// $('#' + ident).hide();
|
||||
// }
|
||||
//});
|
||||
update_item = 0;
|
||||
|
||||
// add a new thread
|
||||
$('.toplevel_item',data).each(function() {
|
||||
|
|
@ -425,8 +435,7 @@
|
|||
$(this).attr('src',$(this).attr('dst'));
|
||||
});
|
||||
$('#' + prev).after($(this));
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
// Find out if the hidden comments are open, so we can keep it that way
|
||||
// if a new comment has been posted
|
||||
var id = $('.hide-comments-total', this).attr('id');
|
||||
|
|
@ -438,46 +447,19 @@
|
|||
$('img',this).each(function() {
|
||||
$(this).attr('src',$(this).attr('dst'));
|
||||
});
|
||||
//vScroll = $(document).scrollTop();
|
||||
$('html').height($('html').height());
|
||||
$('#' + ident).replaceWith($(this));
|
||||
|
||||
if (typeof id != 'undefined') {
|
||||
if(commentsOpen) showHideComments(id);
|
||||
if (commentsOpen) {
|
||||
showHideComments(id);
|
||||
}
|
||||
}
|
||||
$('html').height('auto');
|
||||
//$(document).scrollTop(vScroll);
|
||||
}
|
||||
prev = ident;
|
||||
});
|
||||
|
||||
// reset vars for inserting individual items
|
||||
|
||||
/* prev = 'live-' + src;
|
||||
|
||||
$('.wall-item-outside-wrapper',data).each(function() {
|
||||
var ident = $(this).attr('id');
|
||||
|
||||
if($('#' + ident).length == 0 && prev != 'live-' + src) {
|
||||
$('img',this).each(function() {
|
||||
$(this).attr('src',$(this).attr('dst'));
|
||||
});
|
||||
$('#' + prev).after($(this));
|
||||
}
|
||||
else {
|
||||
$('#' + ident + ' ' + '.wall-item-ago').replaceWith($(this).find('.wall-item-ago'));
|
||||
if($('#' + ident + ' ' + '.comment-edit-text-empty').length)
|
||||
$('#' + ident + ' ' + '.wall-item-comment-wrapper').replaceWith($(this).find('.wall-item-comment-wrapper'));
|
||||
$('#' + ident + ' ' + '.hide-comments-total').replaceWith($(this).find('.hide-comments-total'));
|
||||
$('#' + ident + ' ' + '.wall-item-like').replaceWith($(this).find('.wall-item-like'));
|
||||
$('#' + ident + ' ' + '.wall-item-dislike').replaceWith($(this).find('.wall-item-dislike'));
|
||||
$('#' + ident + ' ' + '.my-comment-photo').each(function() {
|
||||
$(this).attr('src',$(this).attr('dst'));
|
||||
});
|
||||
}
|
||||
prev = ident;
|
||||
});
|
||||
*/
|
||||
$('.like-rotator').hide();
|
||||
if (commentBusy) {
|
||||
commentBusy = false;
|
||||
|
|
@ -514,6 +496,7 @@
|
|||
$.get('like/' + ident.toString() + '?verb=' + verb, NavUpdate);
|
||||
liking = 1;
|
||||
force_update = true;
|
||||
update_item = ident.toString();
|
||||
}
|
||||
|
||||
function dosubthread(ident) {
|
||||
|
|
@ -523,7 +506,6 @@
|
|||
liking = 1;
|
||||
}
|
||||
|
||||
|
||||
function dostar(ident) {
|
||||
ident = ident.toString();
|
||||
$('#like-rotator-' + ident).show();
|
||||
|
|
@ -533,8 +515,7 @@
|
|||
$('#starred-' + ident).removeClass('unstarred');
|
||||
$('#star-' + ident).addClass('hidden');
|
||||
$('#unstar-' + ident).removeClass('hidden');
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
$('#starred-' + ident).addClass('unstarred');
|
||||
$('#starred-' + ident).removeClass('starred');
|
||||
$('#star-' + ident).removeClass('hidden');
|
||||
|
|
@ -553,8 +534,7 @@
|
|||
$('#ignored-' + ident).removeClass('unignored');
|
||||
$('#ignore-' + ident).addClass('hidden');
|
||||
$('#unignore-' + ident).removeClass('hidden');
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
$('#ignored-' + ident).addClass('unignored');
|
||||
$('#ignored-' + ident).removeClass('ignored');
|
||||
$('#ignore-' + ident).removeClass('hidden');
|
||||
|
|
@ -566,22 +546,19 @@
|
|||
|
||||
function getPosition(e) {
|
||||
var cursor = {x:0, y:0};
|
||||
|
||||
if (e.pageX || e.pageY) {
|
||||
cursor.x = e.pageX;
|
||||
cursor.y = e.pageY;
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
if (e.clientX || e.clientY) {
|
||||
cursor.x = e.clientX + (document.documentElement.scrollLeft || document.body.scrollLeft) - document.documentElement.clientLeft;
|
||||
cursor.y = e.clientY + (document.documentElement.scrollTop || document.body.scrollTop) - document.documentElement.clientTop;
|
||||
}
|
||||
else {
|
||||
if( e.x || e.y ) {
|
||||
} else if (e.x || e.y) {
|
||||
cursor.x = e.x;
|
||||
cursor.y = e.y;
|
||||
}
|
||||
}
|
||||
}
|
||||
return cursor;
|
||||
}
|
||||
|
||||
|
|
@ -592,8 +569,7 @@
|
|||
cursor = getPosition(event);
|
||||
if (lockvisible) {
|
||||
lockviewhide();
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
lockvisible = true;
|
||||
$.get('lockview/' + id, function(data) {
|
||||
$('#panel').html(data);
|
||||
|
|
@ -621,11 +597,15 @@
|
|||
$("#comment-edit-wrapper-" + id).hide();
|
||||
$("#comment-edit-text-" + id).val('');
|
||||
var tarea = document.getElementById("comment-edit-text-" + id);
|
||||
if(tarea)
|
||||
if (tarea) {
|
||||
commentClose(tarea,id);
|
||||
if(timer) clearTimeout(timer);
|
||||
}
|
||||
if (timer) {
|
||||
clearTimeout(timer);
|
||||
}
|
||||
timer = setTimeout(NavUpdate,10);
|
||||
force_update = true;
|
||||
update_item = id;
|
||||
}
|
||||
if (data.reload) {
|
||||
window.location.href=data.reload;
|
||||
|
|
@ -636,7 +616,6 @@
|
|||
return false;
|
||||
}
|
||||
|
||||
|
||||
function preview_comment(id) {
|
||||
$("#comment-preview-inp-" + id).val("1");
|
||||
$("#comment-edit-preview-" + id).show();
|
||||
|
|
@ -654,21 +633,16 @@
|
|||
return true;
|
||||
}
|
||||
|
||||
|
||||
|
||||
function showHideComments(id) {
|
||||
if ($("#collapsed-comments-" + id).is(":visible")) {
|
||||
$("#collapsed-comments-" + id).hide();
|
||||
$("#hide-comments-" + id).html(window.showMore);
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
$("#collapsed-comments-" + id).show();
|
||||
$("#hide-comments-" + id).html(window.showFewer);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
function preview_post() {
|
||||
$("#jot-preview").val("1");
|
||||
$("#jot-preview-content").show();
|
||||
|
|
@ -687,7 +661,6 @@
|
|||
return true;
|
||||
}
|
||||
|
||||
|
||||
function unpause() {
|
||||
// unpause auto reloads if they are currently stopped
|
||||
totStopped = false;
|
||||
|
|
@ -697,7 +670,9 @@
|
|||
|
||||
// load more network content (used for infinite scroll)
|
||||
function loadScrollContent() {
|
||||
if (lockLoadContent) return;
|
||||
if (lockLoadContent) {
|
||||
return;
|
||||
}
|
||||
lockLoadContent = true;
|
||||
|
||||
$("#scroll-loader").fadeIn('normal');
|
||||
|
|
@ -733,14 +708,12 @@
|
|||
} else {
|
||||
id = "0";
|
||||
}
|
||||
// console.log("Received: " + received + " - Commented: " + commented+ " - Created: " + created + " - ID: " + id);
|
||||
|
||||
// get the raw content from the next page and insert this content
|
||||
// right before "#conversation-end"
|
||||
$.get('network?mode=raw' + infinite_scroll.reload_uri + '&last_received=' + received + '&last_commented=' + commented + '&last_created=' + created + '&last_id=' + id + '&page=' + infinite_scroll.pageno, function(data) {
|
||||
$("#scroll-loader").hide();
|
||||
if ($(data).length > 0) {
|
||||
|
||||
$(data).insertBefore('#conversation-end');
|
||||
lockLoadContent = false;
|
||||
} else {
|
||||
|
|
@ -795,19 +768,19 @@
|
|||
});
|
||||
}
|
||||
|
||||
|
||||
function checkboxhighlight(box) {
|
||||
if ($(box).is(':checked')) {
|
||||
$(box).addClass('checkeditem');
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
$(box).removeClass('checkeditem');
|
||||
}
|
||||
}
|
||||
|
||||
function notifyMarkAll() {
|
||||
$.get('notify/mark/all', function(data) {
|
||||
if(timer) clearTimeout(timer);
|
||||
if (timer) {
|
||||
clearTimeout(timer);
|
||||
}
|
||||
timer = setTimeout(NavUpdate,1000);
|
||||
force_update = true;
|
||||
});
|
||||
|
|
@ -847,9 +820,12 @@ function getNotificationPermission() {
|
|||
if (window["Notification"] === undefined) {
|
||||
return null;
|
||||
}
|
||||
|
||||
if (Notification.permission === 'granted') {
|
||||
var val = localStorage.getItem('notification-permissions');
|
||||
if (val === null) return 'denied';
|
||||
if (val === null) {
|
||||
return 'denied';
|
||||
}
|
||||
return val;
|
||||
} else {
|
||||
return Notification.permission;
|
||||
|
|
@ -909,7 +885,9 @@ var Dialog = {
|
|||
|
||||
_get_url : function(type, name, id) {
|
||||
var hash = name;
|
||||
if (id !== undefined) hash = hash + "-" + id;
|
||||
if (id !== undefined) {
|
||||
hash = hash + "-" + id;
|
||||
}
|
||||
return baseurl + "/fbrowser/"+type+"/?mode=minimal#"+hash;
|
||||
},
|
||||
|
||||
|
|
|
|||
|
|
@ -752,6 +752,7 @@ function doLikeAction(ident, verb) {
|
|||
$.get('like/' + ident.toString() + '?verb=' + verb, NavUpdate );
|
||||
liking = 1;
|
||||
force_update = true;
|
||||
update_item = ident.toString();
|
||||
}
|
||||
|
||||
// Decodes a hexadecimally encoded binary string
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user