From bb08612837b01c628de5ea8f1e13832862f6f7e3 Mon Sep 17 00:00:00 2001
From: Helmut Hummel <info@helhum.io>
Date: Thu, 26 May 2016 00:34:01 +0200
Subject: [PATCH] [TASK] Simplify and harden pagination Fluid JS usage
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Fluid variables must never be used in JavaScript context.
Instead they should be put into data attributes, which can be
accessed from JavaScript easily.
Resolves: #76304
Releases: master
Change-Id: I16c0d6b265ad446d73cbe285be7653d1a8ebcfd2
Reviewed-on: https://review.typo3.org/48291
Reviewed-by: Stephan Großberndt <stephan@grossberndt.de>
Reviewed-by: Nicole Cordes <typo3@cordes.co>
Tested-by: Nicole Cordes <typo3@cordes.co>
Tested-by: Stephan Großberndt <stephan@grossberndt.de>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
---
.../ViewHelpers/Be/Widget/Paginate/Index.html | 40 +++++++++++--------
1 file changed, 23 insertions(+), 17 deletions(-)
diff --git a/typo3/sysext/fluid/Resources/Private/Templates/ViewHelpers/Be/Widget/Paginate/Index.html b/typo3/sysext/fluid/Resources/Private/Templates/ViewHelpers/Be/Widget/Paginate/Index.html
index a45e4f359494..744b9d0ea5bb 100644
--- a/typo3/sysext/fluid/Resources/Private/Templates/ViewHelpers/Be/Widget/Paginate/Index.html
+++ b/typo3/sysext/fluid/Resources/Private/Templates/ViewHelpers/Be/Widget/Paginate/Index.html
@@ -1,12 +1,31 @@
{namespace core=TYPO3\CMS\Core\ViewHelpers}
<f:if condition="{configuration.insertAbove}">
- <f:render section="paginator" arguments="{pagination: pagination, position:'top', recordsLabel: configuration.recordsLabel}" />
+ <f:render section="paginator" arguments="{pagination: pagination, recordsLabel: configuration.recordsLabel}" />
+</f:if>
+
+<f:if condition="{configuration.insertAbove} || {configuration.insertBelow}">
+ <script type="text/javascript">
+ function goToPage(formObject) {
+ var formField = formObject.elements['paginator-target-page'];
+ var url = formField.dataset.url;
+ var numberOfPages = formField.dataset.numberOfPages;
+ var page = formField.value;
+ if (page > numberOfPages) {
+ page = numberOfPages;
+ } else if (page < 1) {
+ page = 1;
+ }
+ url = url.replace('987654321', page);
+ self.location.href = url;
+ return false;
+ }
+ </script>
</f:if>
<f:renderChildren arguments="{contentArguments}" />
<f:if condition="{configuration.insertBelow}">
- <f:render section="paginator" arguments="{pagination: pagination, position:'bottom', recordsLabel: configuration.recordsLabel}" />
+ <f:render section="paginator" arguments="{pagination: pagination, recordsLabel: configuration.recordsLabel}" />
</f:if>
<f:section name="paginator">
@@ -55,21 +74,8 @@
<span>
<f:translate key="widget.pagination.page" />
- <form id="paginator-form-{position}" onsubmit="goToPage{position}(this); return false;" style="display:inline;">
- <script type="text/javascript">
- function goToPage{position}(formObject) {
- var url = '{f:widget.uri(arguments:{currentPage: 987654321}) -> f:format.raw()}';
- var page = formObject.elements['paginator-target-page'].value;
- if (page > {pagination.numberOfPages}) {
- page = {pagination.numberOfPages};
- } else if (page < 1) {
- page = 1;
- }
- url = url.replace('987654321', page);
- self.location.href= url;
- }
- </script>
- <f:form.textfield id="paginator-{position}" name="paginator-target-page" class="form-control input-sm paginator-input" size="5" value="{pagination.current}" />
+ <form onsubmit="return goToPage(this);" style="display:inline;">
+ <f:form.textfield additionalAttributes="{data-number-of-pages: '{pagination.numberOfPages}', data-url: '{f:widget.uri(arguments:{currentPage: 987654321})}'}" name="paginator-target-page" class="form-control input-sm paginator-input" size="5" value="{pagination.current}" />
</form>
/ {pagination.numberOfPages}
--
GitLab