see cl 1.0.1

heimrichhannot · Apr 14, 2020 · 4c3d4ab · 4c3d4ab
1 parent 8f4379f
commit 4c3d4ab
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,9 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [1.0.1] - 2020-04-14
+- fixed resolving wether reset button was clicked when `clickedButton` is not set for form
+
 ## [1.0.0] - 2020-04-14
 - added async form submit support to select fields
 - updated import in filter bundle js 

diff --git a/src/Config/FilterConfig.php b/src/Config/FilterConfig.php
@@ -313,22 +313,17 @@ protected function isResetButtonClicked(FormInterface $form): bool
     {
       if(!(null !== $form->getClickedButton() && \in_array($form->getClickedButton()->getName(),
               $this->getResetNames(), true))) {
-          return $this->isAsyncResetButtonClicked();
+          return $this->isResetButtonClickedFromRequest();
       }
 
       return true;
     }
 
-    protected function isAsyncResetButtonClicked(): bool
+    protected function isResetButtonClickedFromRequest(): bool
     {
-        $request = $this->container->get('huh.request');
-
-        if(!$request->isXmlHttpRequest()) {
-            return false;
-        }
-
-        $data = in_array($request->getMethod(), ['GET', 'HEAD']) ? $request->getGet($this->getFilter()['name']) : $request->getPost($this->getFilter()['name']);
-
+         $request = $this->container->get('huh.request');
+         $data    = in_array($request->getMethod(), ['GET', 'HEAD']) ? $request->getGet($this->getFilter()['name']) : $request->getPost($this->getFilter()['name']);
+
         return isset($data['reset']);
     }