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

Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge

Browse Source
This commit is contained in:
zotlabs
2017-11-21 17:32:09 -08:00
parent fb1e3cba8b d942818bd9
commit 2cb3ccbf14
3 changed files with 42 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
view/js/mod_hq.js
View File

@@ -1,4 +1,4 @@
function hqLiveUpdate(notify_id, b64mid) {
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; }
@@ -65,7 +65,7 @@ function hqLiveUpdate(notify_id, b64mid) {
// else data was valid - reset the recursion counter
liveRecurse = 0;
if(notify_id !== 'undefined') {
if(notify_id !== 'undefined') {
$.post(
"hq",
{

42
view/tpl/notifications_widget.tpl
View File

@@ -1,5 +1,6 @@
<script>
var notifications_parent;
$(document).ready(function() {
notifications_parent = $('#notifications_wrapper')[0].parentElement.id;
$('.notifications-btn').click(function() {
@@ -13,6 +14,11 @@
$('#navbar-collapse-2').removeClass('show');
}
});
window.onpopstate = function(e) {
if(e.state !== null)
getData(e.state.b64mid, '');
};
});
{{if $module == 'display' || $module == 'hq'}}
@@ -20,8 +26,14 @@
var b64mid = $(this).data('b64mid');
var notify_id = $(this).data('notify_id');
var path = $(this)[0].pathname.substr(1,7);
var stateObj = { b64mid: b64mid };
console.log(path);
{{if $module == 'display'}}
history.pushState(stateObj, '', 'display/' + b64mid);
{{/if}}
{{if $module == 'hq'}}
history.pushState(stateObj, '', 'hq/' + b64mid);
{{/if}}
{{if $module == 'hq'}}
if(b64mid !== 'undefined' && path !== 'pubstre') {
@@ -31,25 +43,29 @@
e.preventDefault();
e.stopPropagation();
$('.thread-wrapper').remove();
if(! page_load)
if(! page_load) {
$(this).fadeOut();
bParam_mid = b64mid;
mode = 'replace';
page_load = true;
{{if $module == 'hq'}}
hqLiveUpdate(notify_id);
{{else}}
liveUpdate();
{{/if}}
getData(b64mid, notify_id);
}
if($('#notifications_wrapper').hasClass('fs'))
$('#notifications_wrapper').prependTo('#' + notifications_parent).removeClass('fs');
}
});
{{/if}}
function getData(b64mid, notify_id) {
$('.thread-wrapper').remove();
bParam_mid = b64mid;
mode = 'replace';
page_load = true;
{{if $module == 'hq'}}
hqLiveUpdate(notify_id);
{{/if}}
{{if $module == 'display'}}
liveUpdate();
{{/if}}
}
</script>