Skip to content

Check using js if we are on mobile and modify the links when needed. #178

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
parapente merged 1 commit into from
Jan 5, 2026
Merged

Check using js if we are on mobile and modify the links when needed. #178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions attachments_component/site/src/Helper/AttachmentsJavascript.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,4 +84,20 @@ public static function closeModal()
myparent.location.reload();
</script>';
}

public static function modifyLinksForDesktop(): void
{
echo '<script type="text/javascript">
document.addEventListener("DOMContentLoaded", function() {
if (!/mobi|android|webos|iphone|ipad|ipod|blackberry|opera mini/i.test(navigator.userAgent)) {
const links = document.querySelectorAll("a.attachment.modal-button");
links.forEach(function(link) {
link.removeAttribute("href");
link.setAttribute("type", "button");
link.setAttribute("data-bs-toggle", "modal");
});
}
});
</script>';
}
}
82 changes: 38 additions & 44 deletions attachments_component/site/tmpl/attachments/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,58 +231,49 @@
}
}

$show_in_modal = (!$app->client->mobile) &&
($this->file_link_open_mode == 'in_a_popup') &&
$show_in_modal = ($this->file_link_open_mode == 'in_a_popup') &&
($attachment->file_type === "application/pdf" ||
str_starts_with($attachment->file_type, "text/") ||
str_starts_with($attachment->file_type, "image/"));

AttachmentsJavascript::setupModalJavascript();

$randomId = base64_encode('show' . $attachment->id . $actual_filename);
// Remove +,/,= from the $randomId
$randomId = strtr($randomId, "+/=", "AAA");
$modalParams['title'] = $this->escape($tooltip);
$modalParams['url'] = $url;
$modalParams['height'] = '80%';
$modalParams['width'] = '80%';
$modalParams['bodyHeight'] = '80';
$modalParams['modalWidth'] = '80';
if ($this->secure) {
$url .= "&popup=1";
}
$html .= LayoutHelper::render(
'libraries.html.bootstrap.modal.main',
[
'selector' => 'modal-' . $randomId,
'body' => "<iframe src=\"$url\" scrolling=\"auto\" loading=\"lazy\" width='95%' height='95%'>
</iframe>",
'params' => $modalParams
]
);

if ($show_in_modal) {
$a_class = 'modal-button';
AttachmentsJavascript::setupModalJavascript();

$randomId = base64_encode('show' . $attachment->id . $actual_filename);
// Remove +,/,= from the $randomId
$randomId = strtr($randomId, "+/=", "AAA");
$modalParams['title'] = $this->escape($tooltip);
$modalParams['url'] = $url;
$modalParams['height'] = '80%';
$modalParams['width'] = '80%';
$modalParams['bodyHeight'] = '80';
$modalParams['modalWidth'] = '80';
if ($this->secure) {
$url .= "&popup=1";
}
$html .= LayoutHelper::render(
'libraries.html.bootstrap.modal.main',
[
'selector' => 'modal-' . $randomId,
'body' => "<iframe src=\"$url\" scrolling=\"auto\" loading=\"lazy\" width='95%' height='95%'>
</iframe>",
'params' => $modalParams
]
);

$show_link = "<a class=\"$a_class\"
type=\"button\" data-bs-toggle='modal'
data-bs-target='#modal-$randomId'";
$show_link .= "title=\"$tooltip\">";
if ($this->use_fontawesome_icons) {
$show_link .= '<i class="' . $faIconsStyle . ' ' . $icon . '"></i>';
} else {
$show_link .= HTMLHelper::image('com_attachments/file_icons/' . $icon, null, null, true);
}
$show_link .= "&nbsp;" . $filename . "</a>";
$a_class = 'attachment modal-button';
} else {
$a_class = 'at_icon';
$show_link = "<a class=\"" . $a_class . "\" href=\"$url\"$target title=\"$tooltip\">";
if ($this->use_fontawesome_icons) {
$show_link .= '<i class="' . $faIconsStyle . ' ' . $icon . '"></i>';
} else {
$show_link .= HTMLHelper::image('com_attachments/file_icons/' . $icon, null, null, true);
}
$show_link .= "&nbsp;" . $filename . "</a>";
}

$show_link = "<a class=\"" . $a_class . "\" href=\"$url\"$target data-bs-target='#modal-$randomId' title=\"$tooltip\">";
if ($this->use_fontawesome_icons) {
$show_link .= '<i class="' . $faIconsStyle . ' ' . $icon . '"></i>';
} else {
$show_link .= HTMLHelper::image('com_attachments/file_icons/' . $icon, null, null, true);
}
$show_link .= "&nbsp;" . $filename . "</a>";

$html .= $show_link;
if (($attachment->uri_type == 'url') && $this->superimpose_link_icons) {
if ($attachment->url_valid) {
Expand Down Expand Up @@ -535,6 +526,9 @@
// Close the HTML
$html .= "</tbody></table>\n";

// If attachments should be opened in a popup on desktop, modify the links
AttachmentsJavascript::modifyLinksForDesktop();

if ($format != 'raw') {
$html .= "</div>\n";
}
Expand Down