#8374: Addessing review comments
This commit is contained in:
parent
858904090e
commit
ab24c621b2
|
@ -1,81 +1,74 @@
|
||||||
$(document).ready(function(){
|
$(document).ready(function(){
|
||||||
handleNewWallItemBodies();
|
handleNewWallItemBodies();
|
||||||
|
|
||||||
var mutationObserver = new MutationObserver(function(mutations) {
|
document.addEventListener("postprocess_liveupdate", function() {
|
||||||
handleNewWallItemBodies();
|
handleNewWallItemBodies();
|
||||||
});
|
});
|
||||||
mutationObserver.observe($("#content")[0], { attributes: false, characterData: false, childList: true, subtree: true, attributeOldValue: false, characterDataOldValue: false });
|
|
||||||
});
|
});
|
||||||
|
|
||||||
function handleNewWallItemBodies() {
|
function handleNewWallItemBodies() {
|
||||||
$('.wall-item-body:not(.showmore-done)').each(function(i, el) {
|
$('.wall-item-body:not(.showmore-done)').each(function() {
|
||||||
$(el).addClass('showmore-done');
|
var $el = $(this);
|
||||||
if ($(el).has('button.content-filter-button').length > 0) {
|
$el.addClass('showmore-done');
|
||||||
$(el).removeClass('limitable');
|
if ($el.has('button.content-filter-button').length > 0) {
|
||||||
return;
|
$el.removeClass('limitable');
|
||||||
}
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
var itemId = $(el).attr('id');
|
addHeightToggleHandler($el);
|
||||||
addHeightToggleHandler(itemId);
|
var limited = processHeightLimit($el);
|
||||||
var limited = processHeightLimit(itemId);
|
|
||||||
|
|
||||||
if (!limited) {
|
if (!limited) {
|
||||||
var mutationObserver = new MutationObserver(function(mutations) {
|
var mutationObserver = new MutationObserver(function(mutations) {
|
||||||
var limited = processHeightLimit(itemId);
|
var limited = processHeightLimit($el);
|
||||||
if (limited) {
|
if (limited) {
|
||||||
mutationObserver.disconnect()
|
mutationObserver.disconnect()
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
mutationObserver.observe(el, { attributes: true, characterData: true, childList: true, subtree: true, attributeOldValue: true, characterDataOldValue: true });
|
mutationObserver.observe($el[0], { attributes: true, characterData: true, childList: true, subtree: true, attributeOldValue: true, characterDataOldValue: true });
|
||||||
|
|
||||||
$(el).imagesLoaded().then(function(){
|
$el.imagesLoaded().then(function(){
|
||||||
processHeightLimit(itemId);
|
processHeightLimit($el);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function addHeightToggleHandler(id) {
|
function addHeightToggleHandler($item) {
|
||||||
var itemIdSel = "#" + id;
|
var itemId = parseInt($item.attr("id").replace("wall-item-body-", ""));
|
||||||
var itemId = parseInt(id.replace("wall-item-body-", ""));
|
$item.data("item-id", itemId);
|
||||||
$(itemIdSel).data("item-id", itemId);
|
var wrapperId = "wall-item-body-wrapper-" + itemId;
|
||||||
var wrapperId = "wall-item-body-wrapper-" + itemId;
|
var toggleId = "wall-item-body-toggle-" + itemId;
|
||||||
var wrapperIdSel = "#" + wrapperId;
|
|
||||||
var toggleId = "wall-item-body-toggle-" + itemId;
|
|
||||||
var toggleIdSel = "#" + toggleId;
|
|
||||||
|
|
||||||
$(itemIdSel).wrap('<div id="' + wrapperId + '" class="wall-item-body-wrapper"></div>');
|
$item.wrap('<div id="' + wrapperId + '" class="wall-item-body-wrapper"></div>');
|
||||||
$(wrapperIdSel).append('<div class="wall-item-body-toggle" data-item-id="' + itemId + '" id="' + toggleId + '" ><a href="javascript:void(0)" class="wall-item-body-toggle-text">Show more ...</a></div>');
|
$("#" + wrapperId).append('<div class="wall-item-body-toggle" data-item-id="' + itemId + '" id="' + toggleId + '" ><a href="javascript:void(0)" class="wall-item-body-toggle-text">Show more ...</a></div>');
|
||||||
$(itemIdSel).addClass("limitable");
|
$item.addClass("limitable limit-height");
|
||||||
$(itemIdSel).addClass("limit-height");
|
|
||||||
|
|
||||||
$(toggleIdSel).show();
|
var $toggle = $("#" + toggleId);
|
||||||
$(toggleIdSel).click(function(el) {
|
$toggle.show();
|
||||||
$(itemIdSel).toggleClass("limit-height");
|
$toggle.click(function(el) {
|
||||||
$(this).hide();
|
$item.toggleClass("limit-height");
|
||||||
$(itemIdSel).removeClass("limitable");
|
$(this).hide();
|
||||||
});
|
$item.removeClass("limitable");
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function processHeightLimit(id) {
|
function processHeightLimit($item) {
|
||||||
var idSel = "#" + id;
|
if (!$item.hasClass("limitable")) {
|
||||||
|
return false;
|
||||||
if (!$(idSel).hasClass("limitable")) {
|
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
var itemId = $(idSel).data("item-id");
|
var itemId = $item.data("item-id");
|
||||||
var toggleSelector = "#wall-item-body-toggle-" + itemId;
|
var $toggle = $("#wall-item-body-toggle-" + itemId);
|
||||||
if ($(idSel).height() < 250) {
|
if ($item.height() < 250) {
|
||||||
$(idSel).removeClass("limit-height");
|
$item.removeClass("limit-height");
|
||||||
$(toggleSelector).hide();
|
$toggle.hide();
|
||||||
return false;
|
return false;
|
||||||
} else {
|
} else {
|
||||||
$(idSel).addClass("limit-height");
|
$item.addClass("limit-height");
|
||||||
$(toggleSelector).show();
|
$toggle.show();
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -13,22 +13,22 @@ use Friendica\DI;
|
||||||
|
|
||||||
function showmore_dyn_install() {
|
function showmore_dyn_install() {
|
||||||
Hook::register('head' , __FILE__, 'showmore_dyn_head');
|
Hook::register('head' , __FILE__, 'showmore_dyn_head');
|
||||||
Hook::register('footer', __FILE__, 'showmore_dyn_footer');
|
Hook::register('footer', __FILE__, 'showmore_dyn_footer');
|
||||||
}
|
}
|
||||||
|
|
||||||
function showmore_dyn_uninstall()
|
function showmore_dyn_uninstall()
|
||||||
{
|
{
|
||||||
Hook::unregister('head' , __FILE__, 'showmore_dyn_head');
|
Hook::unregister('head' , __FILE__, 'showmore_dyn_head');
|
||||||
Hook::unregister('footer', __FILE__, 'showmore_dyn_footer');
|
Hook::unregister('footer', __FILE__, 'showmore_dyn_footer');
|
||||||
}
|
}
|
||||||
|
|
||||||
function showmore_dyn_head(App $a, &$b)
|
function showmore_dyn_head(App $a, &$b)
|
||||||
{
|
{
|
||||||
DI::page()->registerStylesheet(__DIR__ . '/showmore_dyn.css');
|
DI::page()->registerStylesheet(__DIR__ . '/showmore_dyn.css');
|
||||||
}
|
}
|
||||||
|
|
||||||
function showmore_dyn_footer(App $a, &$b)
|
function showmore_dyn_footer(App $a, &$b)
|
||||||
{
|
{
|
||||||
DI::page()->registerFooterScript(__DIR__ . '/showmore_dyn.js');
|
DI::page()->registerFooterScript(__DIR__ . '/showmore_dyn.js');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue