Skip to content

Commit

Permalink
Fix DateRangeFilter Blade Items (#1394)
Browse files Browse the repository at this point in the history
  • Loading branch information
lrljoe authored Oct 6, 2023
1 parent 66ece40 commit 154f726
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 14 deletions.
7 changes: 5 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@

All notable changes to `laravel-livewire-tables` will be documented in this file

## [Unreleased] - 3.x Amends
## [3.0.0-beta.2] - Removing superfluous item from blade
- Removes superfluous @endphp from the DateRangeFilter blade
- Removes reference to remote/published 3rd party assets

## [3.0.0-beta.1] - 3.x Amends
- Amending Documentation for Reordering
- Adding capabilities & tests for setTrAttributes
- Force calculation of even/odd only once in reorder mode
Expand All @@ -27,7 +31,6 @@ All notable changes to `laravel-livewire-tables` will be documented in this file

- Add setExcludeDeselectedColumnsFromQueryEnabled and setExcludeDeselectedColumnsFromQueryDisabled methods to configure()

## [Unreleased] - 3.x (beta-0)
- Requirements Change
- Requires LiveWire 3.x
- Requires PHP 8.1+
Expand Down
12 changes: 0 additions & 12 deletions resources/views/components/tools/filters/date-range.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,20 +22,8 @@
@endphp

<div x-cloak id="{{ $tableName }}-dateRangeFilter-{{ $filterKey }}" x-data="flatpickrFilter($wire, '{{ $filterKey }}', @js($filter->getConfigs()), $refs.dateRangeInput, '{{ App::currentLocale() }}')" >
@if(config('livewire-tables.remote_third_party_assets'))
@once
<script src="https://cdn.jsdelivr.net/npm/flatpickr"></script>
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/flatpickr/dist/flatpickr.min.css">
@endonce
@elseif(config('livewire-tables.published_third_party_assets'))
@once
<script src="/vendor/rappasoft/livewire-tables/js/flatpickr.min.js"></script>
<link rel="stylesheet" href="/vendor/rappasoft/livewire-tables/css/flatpickr.css">
@endonce
@endif


@endphp
<div>
@if($filter->hasCustomFilterLabel() && !$filter->hasCustomPosition())
@include($filter->getCustomFilterLabel(), ['filter' => $filter, 'filterLayout' => $filterLayout, 'tableName' => $tableName])
Expand Down

0 comments on commit 154f726

Please sign in to comment.