harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

allow an optional notify_id arg for liveUpdate()

Browse Source
This commit is contained in:
Mario Vavti 2017-11-29 11:22:59 +01:00
parent e375224dfe
commit e6a59ad36f
3 changed files with 11 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
view/js/main.js
View File

@ -692,7 +692,7 @@ function updateInit() {
} }
} }
function liveUpdate() { function liveUpdate(notify_id) {
if(typeof profile_uid === 'undefined') profile_uid = false; /* Should probably be unified with channelId defined in head.tpl */ if(typeof profile_uid === 'undefined') profile_uid = false; /* Should probably be unified with channelId defined in head.tpl */
@ -762,6 +762,15 @@ function liveUpdate() {
// else data was valid - reset the recursion counter // else data was valid - reset the recursion counter
liveRecurse = 0; liveRecurse = 0;
if(notify_id !== 'undefined') {
$.post(
"hq",
{
"notify_id" : notify_id
}
);
}
var dready = new Date(); var dready = new Date();
console.log('DATA ready in: ' + (dready - dstart)/1000 + ' seconds.'); console.log('DATA ready in: ' + (dready - dstart)/1000 + ' seconds.');

126
view/js/mod_hq.js
View File

@ -8,129 +8,3 @@ $(document).on('click', '#jot-toggle', function(e) {
$('#profile-jot-text').focus(); $('#profile-jot-text').focus();
}); });
function hqLiveUpdate(notify_id) {
if(typeof profile_uid === 'undefined') profile_uid = false; /* Should probably be unified with channelId defined in head.tpl */
if((src === null) || (stopped) || (! profile_uid)) { $('.like-rotator').hide(); return; }
if(($('.comment-edit-text.expanded').length) || (in_progress) || (mediaPlaying)) {
if(livetime) {
clearTimeout(livetime);
}
livetime = setTimeout(liveUpdate, 10000);
return;
}
if(livetime !== null)
livetime = null;
prev = 'live-' + src;
in_progress = true;
var update_url;
var update_mode;
if(scroll_next) {
bParam_page = next_page;
page_load = true;
}
else {
bParam_page = 1;
}
update_url = buildCmd();
if(page_load) {
$("#page-spinner").show();
if(bParam_page == 1)
update_mode = 'replace';
else
update_mode = 'append';
}
else {
update_mode = 'update';
var orgHeight = $("#region_2").height();
}
var dstart = new Date();
console.log('LOADING data...');
$.get(update_url, function(data) {
// on shared hosts occasionally the live update process will be killed
// leaving an incomplete HTML structure, which leads to conversations getting
// truncated and the page messed up if all the divs aren't closed. We will try
// again and give up if we can't get a valid HTML response after 10 tries.
if((data.indexOf("<html>") != (-1)) && (data.indexOf("</html>") == (-1))) {
console.log('Incomplete data. Reloading');
in_progress = false;
liveRecurse ++;
if(liveRecurse < 10) {
liveUpdate();
}
else {
console.log('Incomplete data. Too many attempts. Giving up.');
}
}
// else data was valid - reset the recursion counter
liveRecurse = 0;
if(notify_id !== 'undefined') {
$.post(
"hq",
{
"notify_id" : notify_id
},
function(data) {
if(timer) clearTimeout(timer);
timer = setTimeout(NavUpdate,10);
}
);
}
var dready = new Date();
console.log('DATA ready in: ' + (dready - dstart)/1000 + ' seconds.');
if(update_mode === 'update' || preloadImages) {
console.log('LOADING images...');
$('.wall-item-body, .wall-photo-item',data).imagesLoaded( function() {
var iready = new Date();
console.log('IMAGES ready in: ' + (iready - dready)/1000 + ' seconds.');
page_load = false;
scroll_next = false;
updateConvItems(update_mode,data);
$("#page-spinner").hide();
$("#profile-jot-text-loading").hide();
// adjust scroll position if new content was added above viewport
if(update_mode === 'update') {
$(window).scrollTop($(window).scrollTop() + $("#region_2").height() - orgHeight + contentHeightDiff);
}
in_progress = false;
});
}
else {
page_load = false;
scroll_next = false;
updateConvItems(update_mode,data);
$("#page-spinner").hide();
$("#profile-jot-text-loading").hide();
in_progress = false;
}
})
.done(function() {
notificationsUpdate();
});
}

2
view/tpl/notifications_widget.tpl
View File

@ -59,7 +59,7 @@
mode = 'replace'; mode = 'replace';
page_load = true; page_load = true;
{{if $module == 'hq'}} {{if $module == 'hq'}}
hqLiveUpdate(notify_id); liveUpdate(notify_id);
{{/if}} {{/if}}
{{if $module == 'display'}} {{if $module == 'display'}}
liveUpdate(); liveUpdate();