Skip to content

Commit

Permalink
Fix #355: Correct dropdown init for Bootstrap v5.x
Browse files Browse the repository at this point in the history
  • Loading branch information
kartik-v committed Nov 16, 2021
1 parent 6b313c5 commit ffae06b
Show file tree
Hide file tree
Showing 13 changed files with 20 additions and 13 deletions.
6 changes: 6 additions & 0 deletions CHANGE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
Change Log: `yii2-export`
=========================

## version 1.4.3

**Date:** _under development_

- (enh #355): Correct dropdown init for Bootstrap v5.x.

## version 1.4.2

**Date:** 03-Nov-2021
Expand Down
2 changes: 1 addition & 1 deletion src/ExportColumnAsset.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* @copyright Copyright © Kartik Visweswaran, Krajee.com, 2015 - 2021
* @package yii2-export
* @version 1.4.2
* @version 1.4.3
*/

namespace kartik\export;
Expand Down
5 changes: 3 additions & 2 deletions src/ExportMenu.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* @package yii2-export
* @author Kartik Visweswaran <[email protected]>
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2015 - 2021
* @version 1.4.2
* @version 1.4.3
*/

namespace kartik\export;
Expand Down Expand Up @@ -1750,13 +1750,14 @@ protected function initColumnSelector()
],
$this->columnSelectorMenuOptions
);
$dataToggle = 'data-'.($this->isBs(5) ? 'bs-' : '').'toggle';
$this->columnSelectorOptions = array_replace_recursive(
[
'id' => $id,
'icon' => !$this->isBs(3) ? '<i class="fas fa-list"></i>' : '<i class="glyphicon glyphicon-list"></i>',
'title' => Yii::t('kvexport', 'Select columns to export'),
'type' => 'button',
'data-toggle' => 'dropdown',
$dataToggle => 'dropdown',
'aria-haspopup' => 'true',
'aria-expanded' => 'false',
],
Expand Down
2 changes: 1 addition & 1 deletion src/ExportMenuAsset.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2015 - 2021
* @package yii2-export
* @version 1.4.2
* @version 1.4.3
*/

namespace kartik\export;
Expand Down
2 changes: 1 addition & 1 deletion src/ExportWriterPdf.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2015 - 2021
* @package yii2-export
* @version 1.4.2
* @version 1.4.3
*/

namespace kartik\export;
Expand Down
2 changes: 1 addition & 1 deletion src/assets/css/kv-export-columns.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* @package yii2-export
* @author Kartik Visweswaran <[email protected]>
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2015 - 2021
* @version 1.4.2
* @version 1.4.3
*
* Export Columns Selector Style Sheet
*
Expand Down
2 changes: 1 addition & 1 deletion src/assets/css/kv-export-columns.min.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* @package yii2-export
* @author Kartik Visweswaran <[email protected]>
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2015 - 2021
* @version 1.4.2
* @version 1.4.3
*
* Export Columns Selector Style Sheet
*
Expand Down
2 changes: 1 addition & 1 deletion src/assets/js/kv-export-columns.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* @package yii2-export
* @author Kartik Visweswaran <[email protected]>
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2015 - 2021
* @version 1.4.2
* @version 1.4.3
*
* Export Columns Selector Validation Module.
*
Expand Down
2 changes: 1 addition & 1 deletion src/assets/js/kv-export-columns.min.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* @package yii2-export
* @author Kartik Visweswaran <[email protected]>
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2015 - 2021
* @version 1.4.2
* @version 1.4.3
*
* Export Columns Selector Validation Module.
*
Expand Down
2 changes: 1 addition & 1 deletion src/assets/js/kv-export-data.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* @package yii2-export
* @author Kartik Visweswaran <[email protected]>
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2015 - 2021
* @version 1.4.2
* @version 1.4.3
*
* Export Data Validation Module.
*
Expand Down
2 changes: 1 addition & 1 deletion src/assets/js/kv-export-data.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/views/_columns.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* @package yii2-export
* @author Kartik Visweswaran <[email protected]>
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2015 - 2021
* @version 1.4.2
* @version 1.4.3
*
* Column Selector View
*
Expand Down
2 changes: 1 addition & 1 deletion src/views/_view.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* @package yii2-export
* @author Kartik Visweswaran <[email protected]>
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2015 - 2021
* @version 1.4.2
* @version 1.4.3
*
* Export Submission View
*
Expand Down

0 comments on commit ffae06b

Please sign in to comment.