aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2019-02-23 21:48:45 +0100
committerMario Vavti <mario@mariovavti.com>2019-02-23 21:48:45 +0100
commit06aa32db224926227794fe4e76bcdfdb1b6b62e5 (patch)
tree9e5b9de14c0c91f12ecfe8a1865235a348c6af4d
parentef6a280019e105bd90aca5c25e395237f9de934b (diff)
downloadvolse-hubzilla-06aa32db224926227794fe4e76bcdfdb1b6b62e5.tar.gz
volse-hubzilla-06aa32db224926227794fe4e76bcdfdb1b6b62e5.tar.bz2
volse-hubzilla-06aa32db224926227794fe4e76bcdfdb1b6b62e5.zip
fix regression from commit 04ec35d9cc39cbf62c8db2818574c1f6d56f2a20 where selecting multiple images from embed photos dialog broke and fix issue where items were not scrolled to there correct position if justifiedGalleryActive flag was true
-rw-r--r--view/js/main.js16
-rwxr-xr-xview/tpl/jot-header.tpl10
-rwxr-xr-xview/tpl/jot.tpl2
3 files changed, 18 insertions, 10 deletions
diff --git a/view/js/main.js b/view/js/main.js
index 4e4431f33..b1af29846 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -784,16 +784,26 @@ function updateConvItems(mode,data) {
collapseHeight();
}
+ if(bParam_mid && mode === 'replace')
+ scrollToItem();
+
+ $(document.body).trigger("sticky_kit:recalc");
+}
+
+function scrollToItem() {
// auto-scroll to a particular comment in a thread (designated by mid) when in single-thread mode
// use the same method to generate the submid as we use in ThreadItem,
// base64_encode + replace(['+','='],['','']);
+ if(justifiedGalleryActive)
+ return;
+
var submid = ((bParam_mid.length) ? bParam_mid : 'abcdefg');
var encoded = ((submid.substr(0,4) == 'b64.') ? true : false);
var submid_encoded = ((encoded) ? submid.substr(4) : window.btoa(submid));
submid_encoded = submid_encoded.replace(/[\+\=]/g,'');
- if($('.item_' + submid_encoded).length && !$('.item_' + submid_encoded).hasClass('toplevel_item') && mode == 'replace') {
+ if($('.item_' + submid_encoded).length && !$('.item_' + submid_encoded).hasClass('toplevel_item')) {
if($('.collapsed-comments').length) {
var scrolltoid = $('.collapsed-comments').attr('id').substring(19);
$('#collapsed-comments-' + scrolltoid + ' .autotime').timeago();
@@ -801,11 +811,9 @@ function updateConvItems(mode,data) {
$('#hide-comments-' + scrolltoid).html(aStr.showfewer);
$('#hide-comments-total-' + scrolltoid).hide();
}
- $('html, body').animate({ scrollTop: $('.item_' + submid_encoded).offset().top - $('nav').outerHeight() }, 'slow');
+ $('html, body').animate({ scrollTop: $('.item_' + submid_encoded).offset().top - $('nav').outerHeight(true) }, 'slow');
$('.item_' + submid_encoded).addClass('item-highlight');
}
-
- $(document.body).trigger("sticky_kit:recalc");
}
function collapseHeight() {
diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl
index 9a44f1a54..afaaa62d9 100755
--- a/view/tpl/jot-header.tpl
+++ b/view/tpl/jot-header.tpl
@@ -427,7 +427,9 @@ var activeCommentText = '';
var imageparent = document.getElementById($(image).parent()[0].id);
$(imageparent).toggleClass('embed-photo-selected-photo');
var href = $(imageparent).attr('href');
- $.post("embedphotos/photolink", {href: href},
+ $.post(
+ "embedphotos/photolink",
+ {href: href},
function(ddata) {
if (ddata['status']) {
addeditortext(ddata['photolink']);
@@ -437,10 +439,8 @@ var activeCommentText = '';
}
return false;
},
- 'json');
- $('#embedPhotoModalBodyAlbumDialog').html('');
- $('#embedPhotoModalBodyAlbumDialog').off('click');
- $('#embedPhotoModal').modal('hide');
+ 'json'
+ );
}
});
$('#embedPhotoModalBodyAlbumListDialog').addClass('d-none');
diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index 12509fc59..b4616db6d 100755
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -302,7 +302,7 @@
{{if $embedPhotos}}
<div class="modal" id="embedPhotoModal" tabindex="-1" role="dialog" aria-labelledby="embedPhotoLabel" aria-hidden="true">
- <div class="modal-dialog">
+ <div class="modal-dialog modal-lg">
<div class="modal-content">
<div class="modal-header">
<h3 class="modal-title" id="embedPhotoModalLabel">{{$embedPhotosModalTitle}}</h3>