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

js errors with raw message-id, string update

Browse Source
This commit is contained in:
Hubzilla 2017-01-20 12:03:46 -08:00
parent f57926d9ec
commit ece1dd1d7e
4 changed files with 892 additions and 723 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Zotlabs/Lib/ThreadItem.php
View File

@ -409,7 +409,7 @@ class ThreadItem {
'comment' => $this->get_comment_box($indent), 'comment' => $this->get_comment_box($indent),
'previewing' => ($conv->is_preview() ? ' preview ' : ''), 'previewing' => ($conv->is_preview() ? ' preview ' : ''),
'wait' => t('Please wait'), 'wait' => t('Please wait'),
'submid' => base64_encode(substr($item['mid'],0,32)), 'submid' => str_replace(['+','='], ['',''], base64_encode(substr($item['mid'],0,32))),
'thread_level' => $thread_level 'thread_level' => $thread_level
); );

3
include/connections.php
View File

@ -822,7 +822,8 @@ function get_vcard_array($vc,$id) {
'address' => $adr->getParts() 'address' => $adr->getParts()
]; ];
$last_entry = end($adrs); $last_entry = end($adrs);
array_walk($adrs[$last_entry]['address'],'array_escape_tags'); if($adrs[$last_entry]['address'])
array_walk($adrs[$last_entry]['address'],'array_escape_tags');
} }
} }

1598
util/hmessages.po
View File

File diff suppressed because it is too large Load Diff

12
view/js/main.js
View File

@ -662,7 +662,13 @@ function updateConvItems(mode,data) {
} }
// auto-scroll to a particular comment in a thread (designated by mid) when in single-thread mode // auto-scroll to a particular comment in a thread (designated by mid) when in single-thread mode
if($('.item_' + bParam_mid.substring(0,32)).length && !$('.item_' + bParam_mid.substring(0,32)).hasClass('toplevel_item') && mode == 'replace') { // use the same method to generate the submid as we use in ThreadItem,
// substr(0,32) + base64_encode + replace(['+','='],['','']);
var submid = bParam_mid;
var submid_encoded = ((submid.length) ? submid.substring(0,32) : 'abcdefg');
submid_encoded = window.btoa(submid_encoded);
submid_encoded = submid_encoded.replace(/[\+\=]/g,'');
if($('.item_' + submid_encoded).length && !$('.item_' + submid_encoded).hasClass('toplevel_item') && mode == 'replace') {
if($('.collapsed-comments').length) { if($('.collapsed-comments').length) {
var scrolltoid = $('.collapsed-comments').attr('id').substring(19); var scrolltoid = $('.collapsed-comments').attr('id').substring(19);
$('#collapsed-comments-' + scrolltoid + ' .autotime').timeago(); $('#collapsed-comments-' + scrolltoid + ' .autotime').timeago();
@ -670,8 +676,8 @@ function updateConvItems(mode,data) {
$('#hide-comments-' + scrolltoid).html(aStr.showfewer); $('#hide-comments-' + scrolltoid).html(aStr.showfewer);
$('#hide-comments-total-' + scrolltoid).hide(); $('#hide-comments-total-' + scrolltoid).hide();
} }
$('html, body').animate({ scrollTop: $('.item_' + bParam_mid.substring(0,32)).offset().top - $('nav').outerHeight() }, 'slow'); $('html, body').animate({ scrollTop: $('.item_' + submid_encoded).offset().top - $('nav').outerHeight() }, 'slow');
$('.item_' + bParam_mid.substring(0,32)).addClass('item-highlight'); $('.item_' + submid_encoded).addClass('item-highlight');
} }
$(document.body).trigger("sticky_kit:recalc"); $(document.body).trigger("sticky_kit:recalc");