clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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 2018-02-28 07:55:32 -05:00 committed by GitHub
parent 99bea7f4c4 60d00087f0
commit 90f91dcbd5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 778 additions and 788 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
mod/network.php
View File

@ -358,7 +358,7 @@ function networkConversation($a, $items, $mode, $update, $ordering = '')
return $o; return $o;
} }
function network_content(App $a, $update = 0) function network_content(App $a, $update = 0, $parent = 0)
{ {
if (!local_user()) { if (!local_user()) {
return Login::form(); return Login::form();
@ -385,7 +385,7 @@ function network_content(App $a, $update = 0)
if ($nouveau) { if ($nouveau) {
$o = networkFlatView($a, $update); $o = networkFlatView($a, $update);
} else { } else {
$o = networkThreadedView($a, $update); $o = networkThreadedView($a, $update, $parent);
} }
return $o; return $o;
@ -476,7 +476,7 @@ function networkFlatView(App $a, $update = 0)
* @param integer $update Used for the automatic reloading * @param integer $update Used for the automatic reloading
* @return string HTML of the network content in flat view * @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 is used for fetching new content at the end of the page
$rawmode = (isset($_GET['mode']) AND ( $_GET['mode'] == 'raw')); $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 // Fetch a page full of parent items for this page
if ($update) { if ($update) {
if (Config::get('system', 'like_no_comment')) { if (!empty($parent)) {
$sql_extra4 = " AND `item`.`verb` = '" . ACTIVITY_POST . "'"; // Load only a single thread
$sql_extra4 = "`item`.`id` = ".intval($parent);
} else { } 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` $r = q("SELECT `item`.`parent-uri` AS `uri`, `item`.`parent` AS `item_id`, $sql_order AS `order_date`
FROM `item` $sql_post_table FROM `item` $sql_post_table
STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id` STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
AND (NOT `contact`.`blocked` OR `contact`.`pending`) AND (NOT `contact`.`blocked` OR `contact`.`pending`)
WHERE `item`.`uid` = %d AND `item`.`visible` AND NOT `item`.`deleted` $sql_extra4 WHERE `item`.`uid` = %d AND `item`.`visible` AND NOT `item`.`deleted`
AND NOT `item`.`moderated` AND `item`.`unseen` AND NOT `item`.`moderated` AND $sql_extra4
$sql_extra3 $sql_extra $sql_range $sql_nets $sql_extra3 $sql_extra $sql_range $sql_nets
ORDER BY `order_date` DESC LIMIT 100", ORDER BY `order_date` DESC LIMIT 100",
intval(local_user()) intval(local_user())

5
mod/update_network.php
View File

@ -12,14 +12,15 @@ require_once "mod/network.php";
function update_network_content(App $a) 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"); header("Content-type: text/html");
echo "<!DOCTYPE html><html><body>\r\n"; echo "<!DOCTYPE html><html><body>\r\n";
echo "<section>"; echo "<section>";
if (!PConfig::get($profile_uid, "system", "no_auto_update") || ($_GET["force"] == 1)) { 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 { } else {
$text = ""; $text = "";
} }

440
view/js/main.js
View File

@ -1,67 +1,69 @@
function resizeIframe(obj) { function resizeIframe(obj) {
//obj.style.height = 0;
_resizeIframe(obj, 0); _resizeIframe(obj, 0);
} }
function _resizeIframe(obj, desth) { function _resizeIframe(obj, desth) {
var h = obj.style.height; var h = obj.style.height;
var ch = obj.contentWindow.document.body.scrollHeight; var ch = obj.contentWindow.document.body.scrollHeight;
if (h == (ch + 'px')) { if (h == (ch + 'px')) {
return; return;
} }
if (desth == ch && ch>0) { if (desth == ch && ch > 0) {
obj.style.height = ch + 'px'; obj.style.height = ch + 'px';
} }
setTimeout(_resizeIframe, 100, obj, ch); setTimeout(_resizeIframe, 100, obj, ch);
} }
function openClose(theID) { function openClose(theID) {
if(document.getElementById(theID).style.display == "block") { if (document.getElementById(theID).style.display == "block") {
document.getElementById(theID).style.display = "none" document.getElementById(theID).style.display = "none"
} } else {
else {
document.getElementById(theID).style.display = "block" document.getElementById(theID).style.display = "block"
} }
} }
function openMenu(theID) { function openMenu(theID) {
var el = document.getElementById(theID) var el = document.getElementById(theID)
if (el) { if (el) {
el.style.display = "block"; el.style.display = "block";
} }
} }
function closeMenu(theID) { function closeMenu(theID) {
var el = document.getElementById(theID) var el = document.getElementById(theID)
if (el) { if (el) {
el.style.display = "none"; el.style.display = "none";
} }
} }
function decodeHtml(html) { function decodeHtml(html) {
var txt = document.createElement("textarea"); var txt = document.createElement("textarea");
txt.innerHTML = html; txt.innerHTML = html;
return txt.value; 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;
var pr = 0;
var liking = 0;
var in_progress = false;
var langSelect = false;
var commentBusy = false;
var last_popup_menu = null;
var last_popup_button = null;
var lockLoadContent = false;
var src = null; $(function() {
var prev = null;
var livetime = null;
var force_update = false;
var stopped = false;
var totStopped = false;
var timer = null;
var pr = 0;
var liking = 0;
var in_progress = false;
var langSelect = false;
var commentBusy = false;
var last_popup_menu = null;
var last_popup_button = null;
var lockLoadContent = false;
$(function() {
$.ajaxSetup({cache: false}); $.ajaxSetup({cache: false});
/* setup comment textarea buttons */ /* setup comment textarea buttons */
@ -75,7 +77,7 @@
var o = $(this); var o = $(this);
var bbcode = o.data('bbcode'); var bbcode = o.data('bbcode');
var id = o.data('id'); var id = o.data('id');
if (bbcode=="img") { if (bbcode == "img") {
Dialog.doImageBrowser("comment", id); Dialog.doImageBrowser("comment", id);
return; return;
} }
@ -93,28 +95,26 @@
$(textarea).trigger('change'); $(textarea).trigger('change');
}); });
/* setup onoff widgets */ /* setup onoff widgets */
$(".onoff input").each(function(){ $(".onoff input").each(function() {
val = $(this).val(); val = $(this).val();
id = $(this).attr("id"); id = $(this).attr("id");
$("#"+id+"_onoff ."+ (val==0?"on":"off")).addClass("hidden"); $("#"+id+"_onoff ." + (val == 0 ? "on":"off")).addClass("hidden");
}); });
$(".onoff > a").click(function(event){
$(".onoff > a").click(function(event) {
event.preventDefault(); event.preventDefault();
var input = $(this).siblings("input"); var input = $(this).siblings("input");
var val = 1-input.val(); var val = 1-input.val();
var id = input.attr("id"); var id = input.attr("id");
$("#"+id+"_onoff ."+ (val==0?"on":"off")).addClass("hidden"); $("#"+id+"_onoff ." + (val == 0 ? "on":"off")).addClass("hidden");
$("#"+id+"_onoff ."+ (val==1?"on":"off")).removeClass("hidden"); $("#"+id+"_onoff ." + (val == 1 ? "on":"off")).removeClass("hidden");
input.val(val); input.val(val);
}); });
/* popup menus */ /* popup menus */
function close_last_popup_menu() { function close_last_popup_menu() {
if(last_popup_menu) { if (last_popup_menu) {
last_popup_menu.hide(); last_popup_menu.hide();
last_popup_menu.off('click', function(e) {e.stopPropagation()}); last_popup_menu.off('click', function(e) {e.stopPropagation()});
last_popup_button.removeClass("selected"); last_popup_button.removeClass("selected");
@ -122,16 +122,20 @@
last_popup_button = null; last_popup_button = null;
} }
} }
$('a[rel^="#"]').click(function(e){ $('a[rel^="#"]').click(function(e) {
e.preventDefault(); e.preventDefault();
var parent = $(this).parent(); var parent = $(this).parent();
var isSelected = (last_popup_button && parent.attr('id') == last_popup_button.attr('id')); var isSelected = (last_popup_button && parent.attr('id') == last_popup_button.attr('id'));
close_last_popup_menu(); close_last_popup_menu();
if(isSelected) return false; if (isSelected) {
menu = $( $(this).attr('rel') ); return false;
}
menu = $($(this).attr('rel'));
e.preventDefault(); e.preventDefault();
e.stopPropagation(); e.stopPropagation();
if (menu.attr('popup')=="false") return false; if (menu.attr('popup') == "false") {
return false;
}
parent.toggleClass("selected"); parent.toggleClass("selected");
menu.toggle(); menu.toggle();
if (menu.css("display") == "none") { if (menu.css("display") == "none") {
@ -162,17 +166,19 @@
/* notifications template */ /* notifications template */
var notifications_tpl= unescape($("#nav-notifications-template[rel=template]").html()); var notifications_tpl= unescape($("#nav-notifications-template[rel=template]").html());
var notifications_all = unescape($('<div>').append( $("#nav-notifications-see-all").clone() ).html()); //outerHtml hack var notifications_all = unescape($('<div>').append($("#nav-notifications-see-all").clone()).html()); //outerHtml hack
var notifications_mark = unescape($('<div>').append( $("#nav-notifications-mark-all").clone() ).html()); //outerHtml hack var notifications_mark = unescape($('<div>').append($("#nav-notifications-mark-all").clone()).html()); //outerHtml hack
var notifications_empty = unescape($("#nav-notifications-menu").html()); var notifications_empty = unescape($("#nav-notifications-menu").html());
/* enable perfect-scrollbars for different elements */ /* enable perfect-scrollbars for different elements */
$('#nav-notifications-menu, aside').perfectScrollbar(); $('#nav-notifications-menu, aside').perfectScrollbar();
/* nav update event */ /* nav update event */
$('nav').bind('nav-update', function(e, data){ $('nav').bind('nav-update', function(e, data) {
var invalid = data.invalid || 0; 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) { ['net', 'home', 'intro', 'mail', 'events', 'birthdays', 'notify'].forEach(function(type) {
var number = data[type]; var number = data[type];
@ -186,11 +192,21 @@
}); });
var intro = data['intro']; 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); $('#intro-update-li').html(intro);
var mail = data['mail']; 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); $('#mail-update-li').html(mail);
$(".sidebar-group-li .notify").removeClass("show"); $(".sidebar-group-li .notify").removeClass("show");
@ -218,7 +234,7 @@
var notification_id = 0; var notification_id = 0;
// Insert notifs into the notifications-menu // Insert notifs into the notifications-menu
$(data.notifications).each(function(key, notif){ $(data.notifications).each(function(key, notif) {
var text = notif.message.format('<span class="contactname">' + notif.name + '</span>'); var text = notif.message.format('<span class="contactname">' + notif.name + '</span>');
var contact = ('<a href="' + notif.url + '"><span class="contactname">' + notif.name + '</span></a>'); var contact = ('<a href="' + notif.url + '"><span class="contactname">' + notif.name + '</span></a>');
var seenclass = (notif.seen == 1) ? "notify-seen" : "notify-unseen"; var seenclass = (notif.seen == 1) ? "notify-seen" : "notify-unseen";
@ -237,7 +253,7 @@
}); });
// Desktop Notifications // Desktop Notifications
$(data.notifications.reverse()).each(function(key, e){ $(data.notifications.reverse()).each(function(key, e) {
notification_id = parseInt(e.timestamp); notification_id = parseInt(e.timestamp);
if (notification_lastitem !== null && notification_id > notification_lastitem && Number(e.seen) === 0) { if (notification_lastitem !== null && notification_id > notification_lastitem && Number(e.seen) === 0) {
if (getNotificationPermission() === "granted") { if (getNotificationPermission() === "granted") {
@ -246,7 +262,7 @@
icon: e.photo, icon: e.photo,
}); });
notification['url'] = e.href; notification['url'] = e.href;
notification.addEventListener("click", function(ev){ notification.addEventListener("click", function(ev) {
window.location = ev.target.url; window.location = ev.target.url;
}); });
} }
@ -256,47 +272,49 @@
notification_lastitem = notification_id; notification_lastitem = notification_id;
localStorage.setItem(lastItemStorageKey, notification_lastitem) localStorage.setItem(lastItemStorageKey, notification_lastitem)
$("img[data-src]", nnm).each(function(i, el){ $("img[data-src]", nnm).each(function(i, el) {
// Add src attribute for images with a data-src attribute // Add src attribute for images with a data-src attribute
// However, don't bother if the data-src attribute is empty, because // However, don't bother if the data-src attribute is empty, because
// an empty "src" tag for an image will cause some browsers // an empty "src" tag for an image will cause some browsers
// to prefetch the root page of the Friendica hub, which will // to prefetch the root page of the Friendica hub, which will
// unnecessarily load an entire profile/ or network/ page // 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"));
}
}); });
} }
var notif = data['notify']; var notif = data['notify'];
if (notif > 0){ if (notif > 0) {
$("#nav-notifications-linkmenu").addClass("on"); $("#nav-notifications-linkmenu").addClass("on");
} else { } else {
$("#nav-notifications-linkmenu").removeClass("on"); $("#nav-notifications-linkmenu").removeClass("on");
} }
$(data.sysmsgs.notice).each(function(key, message){ $(data.sysmsgs.notice).each(function(key, message) {
$.jGrowl(message, {sticky: true, theme: 'notice'}); $.jGrowl(message, {sticky: true, theme: 'notice'});
}); });
$(data.sysmsgs.info).each(function(key, message){ $(data.sysmsgs.info).each(function(key, message) {
$.jGrowl(message, {sticky: false, theme: 'info', life: 5000}); $.jGrowl(message, {sticky: false, theme: 'info', life: 5000});
}); });
// Update the js scrollbars // Update the js scrollbars
$('#nav-notifications-menu').perfectScrollbar('update'); $('#nav-notifications-menu').perfectScrollbar('update');
}); });
NavUpdate(); NavUpdate();
// Allow folks to stop the ajax page updates with the pause/break key // Allow folks to stop the ajax page updates with the pause/break key
$(document).keydown(function(event) { $(document).keydown(function(event) {
if(event.keyCode == '8') { if (event.keyCode == '8') {
var target = event.target || event.srcElement; var target = event.target || event.srcElement;
if (!/input|textarea/i.test(target.nodeName)) { if (!/input|textarea/i.test(target.nodeName)) {
return false; return false;
} }
} }
if(event.keyCode == '19' || (event.ctrlKey && event.which == '32')) {
if (event.keyCode == '19' || (event.ctrlKey && event.which == '32')) {
event.preventDefault(); event.preventDefault();
if(stopped == false) { if (stopped == false) {
stopped = true; stopped = true;
if (event.ctrlKey) { if (event.ctrlKey) {
totStopped = true; totStopped = true;
@ -305,11 +323,9 @@
} else { } else {
unpause(); unpause();
} }
} else { } else if (!totStopped) {
if (!totStopped) {
unpause(); unpause();
} }
}
}); });
// Scroll to the next/previous thread when pressing J and K // Scroll to the next/previous thread when pressing J and K
@ -329,7 +345,7 @@
comparison = top < scrollTop - 1; comparison = top < scrollTop - 1;
} }
if (comparison) { if (comparison) {
$('html, body').animate({ scrollTop: top }, 200); $('html, body').animate({scrollTop: top}, 200);
return false; return false;
} }
}); });
@ -337,25 +353,23 @@
}); });
// Set an event listener for infinite scroll // Set an event listener for infinite scroll
if(typeof infinite_scroll !== 'undefined') { if (typeof infinite_scroll !== 'undefined') {
$(window).scroll(function(e){ $(window).scroll(function(e) {
if ($(document).height() != $(window).height()) { if ($(document).height() != $(window).height()) {
// First method that is expected to work - but has problems with Chrome // First method that is expected to work - but has problems with Chrome
if ($(window).scrollTop() > ($(document).height() - $(window).height() * 1.5)) if ($(window).scrollTop() > ($(document).height() - $(window).height() * 1.5))
loadScrollContent(); loadScrollContent();
} else { } else {
// This method works with Chrome - but seems to be much slower in Firefox // 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(); loadScrollContent();
} }
}
}); });
} }
});
function NavUpdate() {
});
function NavUpdate() {
if (!stopped) { if (!stopped) {
var pingCmd = 'ping?format=json' + ((localUser != 0) ? '&f=&uid=' + localUser : ''); var pingCmd = 'ping?format=json' + ((localUser != 0) ? '&f=&uid=' + localUser : '');
$.get(pingCmd, function(data) { $.get(pingCmd, function(data) {
@ -376,61 +390,56 @@
} }
} }
} }
}) ; });
} }
timer = setTimeout(NavUpdate, updateInterval); timer = setTimeout(NavUpdate, updateInterval);
}
function liveUpdate(src) {
if ((src == null) || stopped || !profile_uid) {
$('.like-rotator').hide(); return;
} }
function liveUpdate(src) { if (($('.comment-edit-text-full').length) || in_progress) {
if((src == null) || (stopped) || (! profile_uid)) { $('.like-rotator').hide(); return; } if (livetime) {
if(($('.comment-edit-text-full').length) || (in_progress)) {
if(livetime) {
clearTimeout(livetime); clearTimeout(livetime);
} }
livetime = setTimeout(function() {liveUpdate(src)}, 5000); livetime = setTimeout(function() {liveUpdate(src)}, 5000);
return; return;
} }
if(livetime != null)
livetime = null;
if (livetime != null) {
livetime = null;
}
prev = 'live-' + src; prev = 'live-' + src;
in_progress = true; in_progress = true;
if ($(document).scrollTop() == 0) if ($(document).scrollTop() == 0) {
force_update = true; force_update = true;
}
var udargs = ((netargs.length) ? '/' + netargs : ''); 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) { $.get(update_url,function(data) {
in_progress = false; in_progress = false;
force_update = false; force_update = false;
// $('.collapsed-comments',data).each(function() { update_item = 0;
// var ident = $(this).attr('id');
// var is_hidden = $('#' + ident).is(':hidden');
// if($('#' + ident).length) {
// $('#' + ident).replaceWith($(this));
// if(is_hidden)
// $('#' + ident).hide();
// }
//});
// add a new thread // add a new thread
$('.toplevel_item',data).each(function() { $('.toplevel_item',data).each(function() {
var ident = $(this).attr('id'); var ident = $(this).attr('id');
if($('#' + ident).length == 0 && profile_page == 1) { if ($('#' + ident).length == 0 && profile_page == 1) {
$('img',this).each(function() { $('img',this).each(function() {
$(this).attr('src',$(this).attr('dst')); $(this).attr('src',$(this).attr('dst'));
}); });
$('#' + prev).after($(this)); $('#' + prev).after($(this));
} } else {
else {
// Find out if the hidden comments are open, so we can keep it that way // Find out if the hidden comments are open, so we can keep it that way
// if a new comment has been posted // if a new comment has been posted
var id = $('.hide-comments-total', this).attr('id'); var id = $('.hide-comments-total', this).attr('id');
if(typeof id != 'undefined') { if (typeof id != 'undefined') {
id = id.split('-')[3]; id = id.split('-')[3];
var commentsOpen = $("#collapsed-comments-" + id).is(":visible"); var commentsOpen = $("#collapsed-comments-" + id).is(":visible");
} }
@ -438,48 +447,21 @@
$('img',this).each(function() { $('img',this).each(function() {
$(this).attr('src',$(this).attr('dst')); $(this).attr('src',$(this).attr('dst'));
}); });
//vScroll = $(document).scrollTop();
$('html').height($('html').height()); $('html').height($('html').height());
$('#' + ident).replaceWith($(this)); $('#' + ident).replaceWith($(this));
if(typeof id != 'undefined') { if (typeof id != 'undefined') {
if(commentsOpen) showHideComments(id); if (commentsOpen) {
showHideComments(id);
}
} }
$('html').height('auto'); $('html').height('auto');
//$(document).scrollTop(vScroll);
} }
prev = ident; 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(); $('.like-rotator').hide();
if(commentBusy) { if (commentBusy) {
commentBusy = false; commentBusy = false;
$('body').css('cursor', 'auto'); $('body').css('cursor', 'auto');
} }
@ -488,53 +470,52 @@
/* autocomplete bbcode */ /* autocomplete bbcode */
$(".comment-edit-form textarea").bbco_autocomplete('bbcode'); $(".comment-edit-form textarea").bbco_autocomplete('bbcode');
}); });
} }
function imgbright(node) { function imgbright(node) {
$(node).removeClass("drophide").addClass("drop"); $(node).removeClass("drophide").addClass("drop");
} }
function imgdull(node) { function imgdull(node) {
$(node).removeClass("drop").addClass("drophide"); $(node).removeClass("drop").addClass("drophide");
} }
// Since our ajax calls are asynchronous, we will give a few // Since our ajax calls are asynchronous, we will give a few
// seconds for the first ajax call (setting like/dislike), then // seconds for the first ajax call (setting like/dislike), then
// run the updater to pick up any changes and display on the page. // run the updater to pick up any changes and display on the page.
// The updater will turn any rotators off when it's done. // The updater will turn any rotators off when it's done.
// This function will have returned long before any of these // This function will have returned long before any of these
// events have completed and therefore there won't be any // events have completed and therefore there won't be any
// visible feedback that anything changed without all this // visible feedback that anything changed without all this
// trickery. This still could cause confusion if the "like" ajax call // trickery. This still could cause confusion if the "like" ajax call
// is delayed and NavUpdate runs before it completes. // is delayed and NavUpdate runs before it completes.
function dolike(ident,verb) { function dolike(ident,verb) {
unpause(); unpause();
$('#like-rotator-' + ident.toString()).show(); $('#like-rotator-' + ident.toString()).show();
$.get('like/' + ident.toString() + '?verb=' + verb, NavUpdate ); $.get('like/' + ident.toString() + '?verb=' + verb, NavUpdate);
liking = 1; liking = 1;
force_update = true; force_update = true;
} update_item = ident.toString();
}
function dosubthread(ident) { function dosubthread(ident) {
unpause(); unpause();
$('#like-rotator-' + ident.toString()).show(); $('#like-rotator-' + ident.toString()).show();
$.get('subthread/' + ident.toString(), NavUpdate ); $.get('subthread/' + ident.toString(), NavUpdate);
liking = 1; liking = 1;
} }
function dostar(ident) {
function dostar(ident) {
ident = ident.toString(); ident = ident.toString();
$('#like-rotator-' + ident).show(); $('#like-rotator-' + ident).show();
$.get('starred/' + ident, function(data) { $.get('starred/' + ident, function(data) {
if(data.match(/1/)) { if (data.match(/1/)) {
$('#starred-' + ident).addClass('starred'); $('#starred-' + ident).addClass('starred');
$('#starred-' + ident).removeClass('unstarred'); $('#starred-' + ident).removeClass('unstarred');
$('#star-' + ident).addClass('hidden'); $('#star-' + ident).addClass('hidden');
$('#unstar-' + ident).removeClass('hidden'); $('#unstar-' + ident).removeClass('hidden');
} } else {
else {
$('#starred-' + ident).addClass('unstarred'); $('#starred-' + ident).addClass('unstarred');
$('#starred-' + ident).removeClass('starred'); $('#starred-' + ident).removeClass('starred');
$('#star-' + ident).removeClass('hidden'); $('#star-' + ident).removeClass('hidden');
@ -542,19 +523,18 @@
} }
$('#like-rotator-' + ident).hide(); $('#like-rotator-' + ident).hide();
}); });
} }
function doignore(ident) { function doignore(ident) {
ident = ident.toString(); ident = ident.toString();
$('#like-rotator-' + ident).show(); $('#like-rotator-' + ident).show();
$.get('ignored/' + ident, function(data) { $.get('ignored/' + ident, function(data) {
if(data.match(/1/)) { if (data.match(/1/)) {
$('#ignored-' + ident).addClass('ignored'); $('#ignored-' + ident).addClass('ignored');
$('#ignored-' + ident).removeClass('unignored'); $('#ignored-' + ident).removeClass('unignored');
$('#ignore-' + ident).addClass('hidden'); $('#ignore-' + ident).addClass('hidden');
$('#unignore-' + ident).removeClass('hidden'); $('#unignore-' + ident).removeClass('hidden');
} } else {
else {
$('#ignored-' + ident).addClass('unignored'); $('#ignored-' + ident).addClass('unignored');
$('#ignored-' + ident).removeClass('ignored'); $('#ignored-' + ident).removeClass('ignored');
$('#ignore-' + ident).removeClass('hidden'); $('#ignore-' + ident).removeClass('hidden');
@ -562,53 +542,49 @@
} }
$('#like-rotator-' + ident).hide(); $('#like-rotator-' + ident).hide();
}); });
} }
function getPosition(e) { function getPosition(e) {
var cursor = {x:0, y:0}; var cursor = {x:0, y:0};
if ( e.pageX || e.pageY ) {
if (e.pageX || e.pageY) {
cursor.x = e.pageX; cursor.x = e.pageX;
cursor.y = e.pageY; cursor.y = e.pageY;
} } else {
else { if (e.clientX || e.clientY) {
if( e.clientX || e.clientY ) {
cursor.x = e.clientX + (document.documentElement.scrollLeft || document.body.scrollLeft) - document.documentElement.clientLeft; 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; 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.x = e.x;
cursor.y = e.y; cursor.y = e.y;
} }
} }
}
return cursor; return cursor;
} }
var lockvisible = false; var lockvisible = false;
function lockview(event,id) { function lockview(event,id) {
event = event || window.event; event = event || window.event;
cursor = getPosition(event); cursor = getPosition(event);
if(lockvisible) { if (lockvisible) {
lockviewhide(); lockviewhide();
} } else {
else {
lockvisible = true; lockvisible = true;
$.get('lockview/' + id, function(data) { $.get('lockview/' + id, function(data) {
$('#panel').html(data); $('#panel').html(data);
$('#panel').css({ 'left': cursor.x + 5 , 'top': cursor.y + 5}); $('#panel').css({'left': cursor.x + 5 , 'top': cursor.y + 5});
$('#panel').show(); $('#panel').show();
}); });
} }
} }
function lockviewhide() { function lockviewhide() {
lockvisible = false; lockvisible = false;
$('#panel').hide(); $('#panel').hide();
} }
function post_comment(id) { function post_comment(id) {
unpause(); unpause();
commentBusy = true; commentBusy = true;
$('body').css('cursor', 'wait'); $('body').css('cursor', 'wait');
@ -617,87 +593,86 @@
"item", "item",
$("#comment-edit-form-" + id).serialize(), $("#comment-edit-form-" + id).serialize(),
function(data) { function(data) {
if(data.success) { if (data.success) {
$("#comment-edit-wrapper-" + id).hide(); $("#comment-edit-wrapper-" + id).hide();
$("#comment-edit-text-" + id).val(''); $("#comment-edit-text-" + id).val('');
var tarea = document.getElementById("comment-edit-text-" + id); var tarea = document.getElementById("comment-edit-text-" + id);
if(tarea) if (tarea) {
commentClose(tarea,id); commentClose(tarea,id);
if(timer) clearTimeout(timer); }
if (timer) {
clearTimeout(timer);
}
timer = setTimeout(NavUpdate,10); timer = setTimeout(NavUpdate,10);
force_update = true; force_update = true;
update_item = id;
} }
if(data.reload) { if (data.reload) {
window.location.href=data.reload; window.location.href=data.reload;
} }
}, },
"json" "json"
); );
return false; return false;
} }
function preview_comment(id) {
function preview_comment(id) {
$("#comment-preview-inp-" + id).val("1"); $("#comment-preview-inp-" + id).val("1");
$("#comment-edit-preview-" + id).show(); $("#comment-edit-preview-" + id).show();
$.post( $.post(
"item", "item",
$("#comment-edit-form-" + id).serialize(), $("#comment-edit-form-" + id).serialize(),
function(data) { function(data) {
if(data.preview) { if (data.preview) {
$("#comment-edit-preview-" + id).html(data.preview); $("#comment-edit-preview-" + id).html(data.preview);
$("#comment-edit-preview-" + id + " a").click(function() { return false; }); $("#comment-edit-preview-" + id + " a").click(function() {return false;});
} }
}, },
"json" "json"
); );
return true; return true;
} }
function showHideComments(id) {
if ($("#collapsed-comments-" + id).is(":visible")) {
function showHideComments(id) {
if( $("#collapsed-comments-" + id).is(":visible")) {
$("#collapsed-comments-" + id).hide(); $("#collapsed-comments-" + id).hide();
$("#hide-comments-" + id).html(window.showMore); $("#hide-comments-" + id).html(window.showMore);
} } else {
else {
$("#collapsed-comments-" + id).show(); $("#collapsed-comments-" + id).show();
$("#hide-comments-" + id).html(window.showFewer); $("#hide-comments-" + id).html(window.showFewer);
} }
} }
function preview_post() {
function preview_post() {
$("#jot-preview").val("1"); $("#jot-preview").val("1");
$("#jot-preview-content").show(); $("#jot-preview-content").show();
$.post( $.post(
"item", "item",
$("#profile-jot-form").serialize(), $("#profile-jot-form").serialize(),
function(data) { function(data) {
if(data.preview) { if (data.preview) {
$("#jot-preview-content").html(data.preview); $("#jot-preview-content").html(data.preview);
$("#jot-preview-content" + " a").click(function() { return false; }); $("#jot-preview-content" + " a").click(function() {return false;});
} }
}, },
"json" "json"
); );
$("#jot-preview").val("0"); $("#jot-preview").val("0");
return true; return true;
} }
function unpause() {
function unpause() {
// unpause auto reloads if they are currently stopped // unpause auto reloads if they are currently stopped
totStopped = false; totStopped = false;
stopped = false; stopped = false;
$('#pause').html(''); $('#pause').html('');
} }
// load more network content (used for infinite scroll) // load more network content (used for infinite scroll)
function loadScrollContent() { function loadScrollContent() {
if (lockLoadContent) return; if (lockLoadContent) {
return;
}
lockLoadContent = true; lockLoadContent = true;
$("#scroll-loader").fadeIn('normal'); $("#scroll-loader").fadeIn('normal');
@ -733,23 +708,21 @@
} else { } else {
id = "0"; id = "0";
} }
// console.log("Received: " + received + " - Commented: " + commented+ " - Created: " + created + " - ID: " + id);
// get the raw content from the next page and insert this content // get the raw content from the next page and insert this content
// right before "#conversation-end" // 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) { $.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(); $("#scroll-loader").hide();
if ($(data).length > 0) { if ($(data).length > 0) {
$(data).insertBefore('#conversation-end'); $(data).insertBefore('#conversation-end');
lockLoadContent = false; lockLoadContent = false;
} else { } else {
$("#scroll-end").fadeIn('normal'); $("#scroll-end").fadeIn('normal');
} }
}); });
} }
function bin2hex(s){ function bin2hex(s) {
// Converts the binary representation of data to hex // Converts the binary representation of data to hex
// //
// version: 812.316 // version: 812.316
@ -770,44 +743,44 @@
} }
return a.join(''); return a.join('');
} }
function groupChangeMember(gid, cid, sec_token) { function groupChangeMember(gid, cid, sec_token) {
$('body .fakelink').css('cursor', 'wait'); $('body .fakelink').css('cursor', 'wait');
$.get('group/' + gid + '/' + cid + "?t=" + sec_token, function(data) { $.get('group/' + gid + '/' + cid + "?t=" + sec_token, function(data) {
$('#group-update-wrapper').html(data); $('#group-update-wrapper').html(data);
$('body .fakelink').css('cursor', 'auto'); $('body .fakelink').css('cursor', 'auto');
}); });
} }
function profChangeMember(gid,cid) { function profChangeMember(gid,cid) {
$('body .fakelink').css('cursor', 'wait'); $('body .fakelink').css('cursor', 'wait');
$.get('profperm/' + gid + '/' + cid, function(data) { $.get('profperm/' + gid + '/' + cid, function(data) {
$('#prof-update-wrapper').html(data); $('#prof-update-wrapper').html(data);
$('body .fakelink').css('cursor', 'auto'); $('body .fakelink').css('cursor', 'auto');
}); });
} }
function contactgroupChangeMember(gid,cid) { function contactgroupChangeMember(gid,cid) {
$('body').css('cursor', 'wait'); $('body').css('cursor', 'wait');
$.get('contactgroup/' + gid + '/' + cid, function(data) { $.get('contactgroup/' + gid + '/' + cid, function(data) {
$('body').css('cursor', 'auto'); $('body').css('cursor', 'auto');
}); });
} }
function checkboxhighlight(box) { function checkboxhighlight(box) {
if($(box).is(':checked')) { if ($(box).is(':checked')) {
$(box).addClass('checkeditem'); $(box).addClass('checkeditem');
} } else {
else {
$(box).removeClass('checkeditem'); $(box).removeClass('checkeditem');
} }
} }
function notifyMarkAll() { function notifyMarkAll() {
$.get('notify/mark/all', function(data) { $.get('notify/mark/all', function(data) {
if(timer) clearTimeout(timer); if (timer) {
clearTimeout(timer);
}
timer = setTimeout(NavUpdate,1000); timer = setTimeout(NavUpdate,1000);
force_update = true; force_update = true;
}); });
@ -847,9 +820,12 @@ function getNotificationPermission() {
if (window["Notification"] === undefined) { if (window["Notification"] === undefined) {
return null; return null;
} }
if (Notification.permission === 'granted') { if (Notification.permission === 'granted') {
var val = localStorage.getItem('notification-permissions'); var val = localStorage.getItem('notification-permissions');
if (val === null) return 'denied'; if (val === null) {
return 'denied';
}
return val; return val;
} else { } else {
return Notification.permission; return Notification.permission;
@ -909,7 +885,9 @@ var Dialog = {
_get_url : function(type, name, id) { _get_url : function(type, name, id) {
var hash = name; var hash = name;
if (id !== undefined) hash = hash + "-" + id; if (id !== undefined) {
hash = hash + "-" + id;
}
return baseurl + "/fbrowser/"+type+"/?mode=minimal#"+hash; return baseurl + "/fbrowser/"+type+"/?mode=minimal#"+hash;
}, },

1
view/theme/frio/js/theme.js
View File

@ -752,6 +752,7 @@ function doLikeAction(ident, verb) {
$.get('like/' + ident.toString() + '?verb=' + verb, NavUpdate ); $.get('like/' + ident.toString() + '?verb=' + verb, NavUpdate );
liking = 1; liking = 1;
force_update = true; force_update = true;
update_item = ident.toString();
} }
// Decodes a hexadecimally encoded binary string // Decodes a hexadecimally encoded binary string