Skip to content

Commit

Permalink
Merge pull request #887 from PrestaShop/dev
Browse files Browse the repository at this point in the history
v3.13.0
  • Loading branch information
Hlavtox authored Jul 27, 2023
2 parents 25d0a3f + d429b5e commit 42f30f0
Show file tree
Hide file tree
Showing 29 changed files with 2,630 additions and 2,222 deletions.
1 change: 1 addition & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ module.exports = {
filters: true,
prestashop: true,
translations: true,
Sortable: true,
},
rules: {
'no-new': 0,
Expand Down
61 changes: 3 additions & 58 deletions .github/workflows/build-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,61 +2,6 @@ name: Build
on: [push, pull_request]

jobs:
deploy:
name: build dependencies & create artifact
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/[email protected]
- name: Install composer dependencies
run: composer install --no-dev -o
- name: Clean-up project
uses: PrestaShopCorp/[email protected]
- name: Prepare auto-index tool
run: |
composer global require prestashop/autoindex
- name: Generate index.php
run: |
~/.composer/vendor/bin/autoindex
- name: Create & upload artifact
uses: actions/upload-artifact@v1
with:
name: ${{ github.event.repository.name }}
path: ../
update_release_draft:
runs-on: ubuntu-latest
needs: [deploy]
if: github.event_name == 'push' && github.event.ref == 'refs/heads/master'
steps:
- name: Download artifact
uses: actions/download-artifact@v1
with:
name: ${{ github.event.repository.name }}
- id: release_info
uses: toolmantim/release-drafter@v5
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Prepare for Release
run: |
cd ${{ github.event.repository.name }}
zip -r ${{ github.event.repository.name }}.zip ${{ github.event.repository.name }}
- name: Clean existing assets
shell: bash
run: |
curl -fsSL https://github.com/github/hub/raw/master/script/get | bash -s 2.14.1
assets=`bin/hub api -t repos/${{ github.repository }}/releases/${{ steps.release_info.outputs.id }}/assets | awk '/\].url/ { print $2 }'`
for asset in $assets
do
bin/hub api -X DELETE $asset
done
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Publish to GitHub Release
uses: actions/[email protected]
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.release_info.outputs.upload_url }}
asset_path: ./${{ github.event.repository.name }}/${{ github.event.repository.name }}.zip
asset_name: ${{ github.event.repository.name }}.zip
asset_content_type: application/zip
build-and-release-draft:
name: Build & Release draft
uses: PrestaShop/.github/.github/workflows/build-release.yml@master
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@

Filter your catalog to help visitors picture the category tree and browse your store easily.

## Compatibility

PrestaShop: 1.7.6.0 or later

## Multistore compatibility

This module is partially compatible with the multistore feature. Some of its options might not be available.
Expand Down
3 changes: 3 additions & 0 deletions _dev/back/blocklayered.scss
Original file line number Diff line number Diff line change
Expand Up @@ -54,3 +54,6 @@
}
}
}
.sortable-ghost {
color: orange;
}
17 changes: 14 additions & 3 deletions _dev/back/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -192,9 +192,20 @@ $(document).ready(() => {
$('#full-index').click();
}

$('.sortable').sortable({
forcePlaceholderSize: true,
});
if (typeof Sortable !== 'undefined') {
const listFilters = document.getElementById('list-filters');

if (listFilters !== null) {
new Sortable(listFilters, {
animation: 150,
ghostClass: 'sortable-ghost',
});
}
} else {
$('.sortable').sortable({
forcePlaceholderSize: true,
});
}

$('.filter_list_item input[type=checkbox]').click(function onFilterLickItemCheckboxesClicked() {
const currentSelectedFiltersCount = parseInt($('#selected_filters').html(), 10);
Expand Down
2 changes: 1 addition & 1 deletion config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<module>
<name>ps_facetedsearch</name>
<displayName><![CDATA[Faceted search]]></displayName>
<version><![CDATA[3.12.1]]></version>
<version><![CDATA[3.13.0]]></version>
<description><![CDATA[Displays a block allowing multiple filters.]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[front_office_features]]></tab>
Expand Down
Loading

0 comments on commit 42f30f0

Please sign in to comment.