diff --git a/CHANGE.md b/CHANGE.md index e211276c..0693e32b 100755 --- a/CHANGE.md +++ b/CHANGE.md @@ -1,6 +1,14 @@ Change Log: `yii2-grid` ======================= +## Version 3.3.5 + +**Date:** _under development_ + +- (enh #934, #938): Correct ternary operator for PHP 7.4 support. +- (enh #932): Correct Expand Row container parsing for nested expand row columns. +- (enh #929): Enhance Expand Row Column plugin and correct expand one only. + ## Version 3.3.4 **Date:** 26-Aug-2019 diff --git a/src/ActionColumn.php b/src/ActionColumn.php index ba2221d9..4cf0b98b 100644 --- a/src/ActionColumn.php +++ b/src/ActionColumn.php @@ -3,7 +3,7 @@ /** * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2019 * @package yii2-grid - * @version 3.3.4 + * @version 3.3.5 */ namespace kartik\grid; diff --git a/src/ActionColumnAsset.php b/src/ActionColumnAsset.php index d4616c6e..2405de84 100644 --- a/src/ActionColumnAsset.php +++ b/src/ActionColumnAsset.php @@ -4,7 +4,7 @@ * @package yii2-grid * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2019 - * @version 3.3.4 + * @version 3.3.5 */ namespace kartik\grid; diff --git a/src/BooleanColumn.php b/src/BooleanColumn.php index 78d80d4f..e54ce125 100644 --- a/src/BooleanColumn.php +++ b/src/BooleanColumn.php @@ -4,7 +4,7 @@ * @package yii2-grid * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2019 - * @version 3.3.4 + * @version 3.3.5 */ namespace kartik\grid; diff --git a/src/CheckboxColumn.php b/src/CheckboxColumn.php index 58e17380..aa2c987c 100644 --- a/src/CheckboxColumn.php +++ b/src/CheckboxColumn.php @@ -4,7 +4,7 @@ * @package yii2-grid * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2019 - * @version 3.3.4 + * @version 3.3.5 */ namespace kartik\grid; diff --git a/src/CheckboxColumnAsset.php b/src/CheckboxColumnAsset.php index 8ab53bd0..6dfb0651 100644 --- a/src/CheckboxColumnAsset.php +++ b/src/CheckboxColumnAsset.php @@ -4,7 +4,7 @@ * @package yii2-grid * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2019 - * @version 3.3.4 + * @version 3.3.5 */ namespace kartik\grid; diff --git a/src/ColumnTrait.php b/src/ColumnTrait.php index 92f0816a..d960b197 100644 --- a/src/ColumnTrait.php +++ b/src/ColumnTrait.php @@ -4,17 +4,19 @@ * @package yii2-grid * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2019 - * @version 3.3.4 + * @version 3.3.5 */ namespace kartik\grid; use Closure; use kartik\base\Config; +use yii\base\InvalidConfigException; use yii\base\Model; use yii\helpers\ArrayHelper; use yii\helpers\Html; use yii\helpers\Json; +use yii\web\View; /** * ColumnTrait maintains generic methods used by all column widgets in [[GridView]]. @@ -161,7 +163,7 @@ trait ColumnTrait protected $_rows = []; /** - * @var \yii\web\View the view instance + * @var View the view instance */ protected $_view; @@ -348,7 +350,7 @@ protected function renderPageSummaryCellContent() */ protected function getPageSummaryCellContent() { - if ($this->pageSummary === true || $this->pageSummary instanceof \Closure) { + if ($this->pageSummary === true || $this->pageSummary instanceof Closure) { $summary = $this->calculateSummary(); return ($this->pageSummary === true) ? $summary : call_user_func( $this->pageSummary, @@ -396,7 +398,7 @@ protected function calculateSummary() /** * Checks if the filter input types are valid - * @throws \yii\base\InvalidConfigException + * @throws InvalidConfigException */ protected function checkValidFilters() { @@ -510,7 +512,7 @@ protected function isValidAlignment($type = 'hAlign') */ protected function fetchContentOptions($model, $key, $index) { - if ($this->contentOptions instanceof \Closure) { + if ($this->contentOptions instanceof Closure) { $options = call_user_func($this->contentOptions, $model, $key, $index, $this); } else { $options = $this->contentOptions; diff --git a/src/DataColumn.php b/src/DataColumn.php index 25c85fc1..1a7fc2e7 100644 --- a/src/DataColumn.php +++ b/src/DataColumn.php @@ -4,7 +4,7 @@ * @package yii2-grid * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2019 - * @version 3.3.4 + * @version 3.3.5 */ namespace kartik\grid; diff --git a/src/Demo.php b/src/Demo.php index 45c21fd2..72f4f849 100644 --- a/src/Demo.php +++ b/src/Demo.php @@ -4,7 +4,7 @@ * @package yii2-grid * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2019 - * @version 3.3.4 + * @version 3.3.5 */ namespace kartik\grid; diff --git a/src/EditableColumn.php b/src/EditableColumn.php index ccf6ec2e..fc482346 100644 --- a/src/EditableColumn.php +++ b/src/EditableColumn.php @@ -4,7 +4,7 @@ * @package yii2-grid * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2019 - * @version 3.3.4 + * @version 3.3.5 */ namespace kartik\grid; diff --git a/src/EditableColumnAction.php b/src/EditableColumnAction.php index 37b52553..20bef91a 100644 --- a/src/EditableColumnAction.php +++ b/src/EditableColumnAction.php @@ -4,7 +4,7 @@ * @package yii2-grid * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2019 - * @version 3.3.4 + * @version 3.3.5 */ namespace kartik\grid; diff --git a/src/EditableColumnAsset.php b/src/EditableColumnAsset.php index e82323b2..3668a44c 100644 --- a/src/EditableColumnAsset.php +++ b/src/EditableColumnAsset.php @@ -4,7 +4,7 @@ * @package yii2-grid * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2019 - * @version 3.3.4 + * @version 3.3.5 */ namespace kartik\grid; diff --git a/src/EnumColumn.php b/src/EnumColumn.php index 7001ff6f..80cdbb4e 100644 --- a/src/EnumColumn.php +++ b/src/EnumColumn.php @@ -4,7 +4,7 @@ * @package yii2-grid * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2019 - * @version 3.3.4 + * @version 3.3.5 */ namespace kartik\grid; diff --git a/src/ExpandRowColumn.php b/src/ExpandRowColumn.php index e04f5ca3..e1b56a03 100644 --- a/src/ExpandRowColumn.php +++ b/src/ExpandRowColumn.php @@ -4,7 +4,7 @@ * @package yii2-grid * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2019 - * @version 3.3.4 + * @version 3.3.5 */ namespace kartik\grid; @@ -244,7 +244,7 @@ public function init() 'mergeHeader' => true, 'hAlign' => GridView::ALIGN_CENTER, 'vAlign' => GridView::ALIGN_MIDDLE, - 'width' => '50px' + 'width' => '50px', ]); parent::init(); if (empty($this->detail) && empty($this->detailUrl)) { diff --git a/src/ExpandRowColumnAsset.php b/src/ExpandRowColumnAsset.php index 787bb870..ddb44d18 100644 --- a/src/ExpandRowColumnAsset.php +++ b/src/ExpandRowColumnAsset.php @@ -4,7 +4,7 @@ * @package yii2-grid * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2019 - * @version 3.3.4 + * @version 3.3.5 */ namespace kartik\grid; diff --git a/src/FormulaColumn.php b/src/FormulaColumn.php index a3617205..f3babcde 100644 --- a/src/FormulaColumn.php +++ b/src/FormulaColumn.php @@ -4,7 +4,7 @@ * @package yii2-grid * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2019 - * @version 3.3.4 + * @version 3.3.5 */ namespace kartik\grid; diff --git a/src/GridExportAsset.php b/src/GridExportAsset.php index e9d3688e..6cc3da38 100644 --- a/src/GridExportAsset.php +++ b/src/GridExportAsset.php @@ -4,7 +4,7 @@ * @package yii2-grid * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2019 - * @version 3.3.4 + * @version 3.3.5 */ namespace kartik\grid; diff --git a/src/GridFloatHeadAsset.php b/src/GridFloatHeadAsset.php index f54298bd..f89a921f 100644 --- a/src/GridFloatHeadAsset.php +++ b/src/GridFloatHeadAsset.php @@ -4,7 +4,7 @@ * @package yii2-grid * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2019 - * @version 3.3.4 + * @version 3.3.5 */ namespace kartik\grid; diff --git a/src/GridGroupAsset.php b/src/GridGroupAsset.php index 4dfcc44f..4b5f01d5 100644 --- a/src/GridGroupAsset.php +++ b/src/GridGroupAsset.php @@ -4,7 +4,7 @@ * @package yii2-grid * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2019 - * @version 3.3.4 + * @version 3.3.5 */ namespace kartik\grid; diff --git a/src/GridPerfectScrollbarAsset.php b/src/GridPerfectScrollbarAsset.php index ad9f217d..402a5a9e 100644 --- a/src/GridPerfectScrollbarAsset.php +++ b/src/GridPerfectScrollbarAsset.php @@ -4,7 +4,7 @@ * @package yii2-grid * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2019 - * @version 3.3.4 + * @version 3.3.5 */ namespace kartik\grid; diff --git a/src/GridResizeColumnsAsset.php b/src/GridResizeColumnsAsset.php index 12052d27..3cd97df2 100644 --- a/src/GridResizeColumnsAsset.php +++ b/src/GridResizeColumnsAsset.php @@ -4,7 +4,7 @@ * @package yii2-grid * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2019 - * @version 3.3.4 + * @version 3.3.5 */ namespace kartik\grid; diff --git a/src/GridResizeStoreAsset.php b/src/GridResizeStoreAsset.php index 96fcaef1..25951977 100644 --- a/src/GridResizeStoreAsset.php +++ b/src/GridResizeStoreAsset.php @@ -4,7 +4,7 @@ * @package yii2-grid * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2019 - * @version 3.3.4 + * @version 3.3.5 */ namespace kartik\grid; diff --git a/src/GridToggleDataAsset.php b/src/GridToggleDataAsset.php index 279eb142..5481dbb0 100644 --- a/src/GridToggleDataAsset.php +++ b/src/GridToggleDataAsset.php @@ -4,7 +4,7 @@ * @package yii2-grid * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2019 - * @version 3.3.4 + * @version 3.3.5 */ namespace kartik\grid; diff --git a/src/GridView.php b/src/GridView.php index b2bad667..f284b1bf 100644 --- a/src/GridView.php +++ b/src/GridView.php @@ -4,7 +4,7 @@ * @package yii2-grid * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2019 - * @version 3.3.4 + * @version 3.3.5 */ namespace kartik\grid; diff --git a/src/GridViewAsset.php b/src/GridViewAsset.php index 5f0b18ab..0c03e140 100644 --- a/src/GridViewAsset.php +++ b/src/GridViewAsset.php @@ -4,7 +4,7 @@ * @package yii2-grid * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2019 - * @version 3.3.4 + * @version 3.3.5 */ namespace kartik\grid; diff --git a/src/Module.php b/src/Module.php index 21713498..618ea564 100644 --- a/src/Module.php +++ b/src/Module.php @@ -4,7 +4,7 @@ * @package yii2-grid * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2019 - * @version 3.3.4 + * @version 3.3.5 */ namespace kartik\grid; diff --git a/src/RadioColumn.php b/src/RadioColumn.php index fba348c1..a8fa3a3d 100644 --- a/src/RadioColumn.php +++ b/src/RadioColumn.php @@ -4,7 +4,7 @@ * @package yii2-grid * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2019 - * @version 3.3.4 + * @version 3.3.5 */ namespace kartik\grid; diff --git a/src/RadioColumnAsset.php b/src/RadioColumnAsset.php index 0c0bd350..d8ccb084 100644 --- a/src/RadioColumnAsset.php +++ b/src/RadioColumnAsset.php @@ -4,7 +4,7 @@ * @package yii2-grid * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2019 - * @version 3.3.4 + * @version 3.3.5 */ namespace kartik\grid; diff --git a/src/SerialColumn.php b/src/SerialColumn.php index 65f97ac9..9dfd2826 100644 --- a/src/SerialColumn.php +++ b/src/SerialColumn.php @@ -4,7 +4,7 @@ * @package yii2-grid * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2019 - * @version 3.3.4 + * @version 3.3.5 */ namespace kartik\grid; diff --git a/src/assets/css/kv-grid-expand.css b/src/assets/css/kv-grid-expand.css index e8c1c969..6839c86e 100644 --- a/src/assets/css/kv-grid-expand.css +++ b/src/assets/css/kv-grid-expand.css @@ -2,7 +2,7 @@ * @package yii2-grid * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2019 - * @version 3.3.4 + * @version 3.3.5 * * Gridview ExpandRowColumn styling and enhancements * diff --git a/src/assets/css/kv-grid-expand.min.css b/src/assets/css/kv-grid-expand.min.css index 8831ca91..4c167c16 100644 --- a/src/assets/css/kv-grid-expand.min.css +++ b/src/assets/css/kv-grid-expand.min.css @@ -2,7 +2,7 @@ * @package yii2-grid * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2019 - * @version 3.3.4 + * @version 3.3.5 * * Gridview ExpandRowColumn styling and enhancements * diff --git a/src/assets/css/kv-grid.css b/src/assets/css/kv-grid.css index 3b14d1c8..066d089a 100644 --- a/src/assets/css/kv-grid.css +++ b/src/assets/css/kv-grid.css @@ -2,7 +2,7 @@ * @package yii2-grid * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2019 - * @version 3.3.4 + * @version 3.3.5 * * Yii2 Gridview widget styling and enhancements for Bootstrap. * diff --git a/src/assets/css/kv-grid.min.css b/src/assets/css/kv-grid.min.css index ee88b2ae..634c25d8 100644 --- a/src/assets/css/kv-grid.min.css +++ b/src/assets/css/kv-grid.min.css @@ -2,7 +2,7 @@ * @package yii2-grid * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2019 - * @version 3.3.4 + * @version 3.3.5 * * Yii2 Gridview widget styling and enhancements for Bootstrap. * diff --git a/src/assets/js/kv-grid-checkbox.js b/src/assets/js/kv-grid-checkbox.js index 529e1fe4..c87ffc4a 100644 --- a/src/assets/js/kv-grid-checkbox.js +++ b/src/assets/js/kv-grid-checkbox.js @@ -2,7 +2,7 @@ * @package yii2-grid * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2019 - * @version 3.3.4 + * @version 3.3.5 * * Client actions for kartik\grid\CheckboxColumn * diff --git a/src/assets/js/kv-grid-checkbox.min.js b/src/assets/js/kv-grid-checkbox.min.js index 1e5ef1ac..46b65b07 100644 --- a/src/assets/js/kv-grid-checkbox.min.js +++ b/src/assets/js/kv-grid-checkbox.min.js @@ -2,7 +2,7 @@ * @package yii2-grid * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2019 - * @version 3.3.4 + * @version 3.3.5 * * Client actions for yii2-grid CheckboxColumn * diff --git a/src/assets/js/kv-grid-editable.js b/src/assets/js/kv-grid-editable.js index 828400ed..4a754385 100644 --- a/src/assets/js/kv-grid-editable.js +++ b/src/assets/js/kv-grid-editable.js @@ -2,7 +2,7 @@ * @package yii2-grid * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2019 - * @version 3.3.4 + * @version 3.3.5 * * Client actions for yii2-grid EditableColumn * diff --git a/src/assets/js/kv-grid-editable.min.js b/src/assets/js/kv-grid-editable.min.js index e2f1d3d3..8f01b65c 100644 --- a/src/assets/js/kv-grid-editable.min.js +++ b/src/assets/js/kv-grid-editable.min.js @@ -2,7 +2,7 @@ * @package yii2-grid * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2019 - * @version 3.3.4 + * @version 3.3.5 * * Client actions for yii2-grid EditableColumn * diff --git a/src/assets/js/kv-grid-expand.js b/src/assets/js/kv-grid-expand.js index 073ea15e..30a039e0 100644 --- a/src/assets/js/kv-grid-expand.js +++ b/src/assets/js/kv-grid-expand.js @@ -2,10 +2,10 @@ * @package yii2-grid * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2019 - * @version 3.3.4 + * @version 3.3.5 * * jQuery methods library for yii2-grid expand row column - * + * * Author: Kartik Visweswaran * Copyright: 2014 - 2019, Kartik Visweswaran, Krajee.com * For more JQuery plugins visit http://plugins.krajee.com @@ -13,7 +13,7 @@ */ var kvExpandRow; (function ($) { - "use strict"; + 'use strict'; kvExpandRow = function (options, id) { //noinspection JSUnresolvedVariable var NS = '.kvExpandRowColumn', @@ -41,8 +41,8 @@ var kvExpandRow; $hdrIcon = $hdrCell.find('.kv-expand-header-icon'), collapseAll = options.collapseAll === undefined ? false : options.collapseAll, expandAll = options.expandAll === undefined ? false : options.expandAll, - $rows = $grid.find('td.kv-expand-icon-cell' + idCss + ' .kv-expand-row:not(.kv-state-disabled)'), - numRows = $rows.length, progress = 'kv-expand-detail-loading', + $cells = $grid.find('td.kv-expand-icon-cell' + idCss + ' .kv-expand-row:not(.kv-state-disabled)'), + numRows = $cells.length, progress = 'kv-expand-detail-loading', getCols = function () { var $col = $grid.find('td.kv-expand-icon-cell' + idCss + ':first'), $row = $col && $col.length ? $col.closest('tr') : '', cols = 0; @@ -86,15 +86,15 @@ var kvExpandRow; $c.removeClass(progress); }, delay); }, - getRowNum = function() { + getRowNum = function () { var num = $grid.data(kvRowNumVar); num = num ? parseInt(num) : 0; return isNaN(num) ? 0 : num; }, - setRowNum = function(value) { + setRowNum = function (value) { $grid.data(kvRowNumVar, value); }, - incrementRowNum = function() { + incrementRowNum = function () { var num = getRowNum(); $grid.data(kvRowNumVar, num + 1); }, @@ -104,237 +104,265 @@ var kvExpandRow; $el.off(ev).on(ev, callback); } }; - if (!$grid.data(kvRowNumVar)) { - setRowNum(0); - } - if (extraData.length === 0) { - extraData = {}; - } - if ($rows.length === 0) { - setCss($hdrCell, 'kv-state-disabled'); - return; - } - $rows.each(function () { - var $el = $(this), $newRow, $tr, $icon = $el.find('>.kv-expand-icon'), - $cell = $icon.closest('.kv-expand-icon-cell'), - $row = $el.closest('tr'), $container = $cell.find('.kv-expand-detail'), - $detail = $el.find('.kv-expanded-row' + idCss + ':first'), - vKey = $detail.data('key'), vInd = $detail.data('index'); - if (!isExpanded($icon) && !isCollapsed($icon)) { - return true; - } - if ($detail.length === 0) { - vKey = $row.data('key'); - $newRow = $row.next('tr.kv-expand-detail-row[data-key="' + vKey + '"]'); - $detail = $newRow.find('.kv-expanded-row'); - } - var loadDetail = function (postProcess) { - var params = $.extend({ - expandRowKey: vKey, - expandRowInd: vInd - }, extraData), - reload = enableCache ? $detail.html().length === 0 : true; - if (detailUrl.length > 0 && reload) { - $.ajax({ - type: 'POST', - data: params, - url: detailUrl, - beforeSend: function() { - beginLoading($cell); - $grid.trigger('kvexprow:beforeLoad', [vInd, vKey, extraData]); - }, - success: function(out) { - $detail.html(out); - endLoading($cell); - if (typeof onDetailLoaded === 'function') { - onDetailLoaded(); - } - postProcess(); - $grid.trigger('kvexprow:loaded', [vInd, vKey, extraData]); - }, - error: function() { - $detail.html('
Error fetching data. Please try again later.
'); - $grid.trigger('kvexprow:error', [vInd, vKey, extraData]); - endLoading($cell); + var ToggleManager = function ($element) { + var self = this; + self.$element = $element; + self.init(); + }; + ToggleManager.prototype = { + constructor: ToggleManager, + init: function () { + var self = this, $newRow; + self.$row = self.$element.closest('tr'); + self.$icon = self.$element.find('>.kv-expand-icon'); + self.$detail = self.$element.find('.kv-expanded-row' + idCss + ':first'); + self.$cell = self.$icon.closest('.kv-expand-icon-cell'); + self.$container = self.$cell.find('.kv-expand-detail:first'); + self.vKey = self.$detail.data('key'); + self.vInd = self.$detail.data('index'); + if (self.$detail.length === 0) { + self.vKey = self.$row.data('key'); + $newRow = self.$row.next('tr.kv-expand-detail-row[data-key="' + self.vKey + '"]'); + self.$detail = $newRow.find('.kv-expanded-row'); + } + }, + run: function () { + var self = this, $row = self.$row, $cell = self.$cell, $icon = self.$icon; + if (!isExpanded($icon) && !isCollapsed($icon)) { + return; + } + if (expandAll) { + if (isCollapsed($icon)) { + self.load(function () { + self.expand(true); + incrementRowNum(); + if (getRowNum() >= numRows) { + endLoading($hdrCell); + $hdrIcon.focus(); } }); - return; - } else { - endLoading($cell); } - postProcess(); - }, - expandRow = function (animate) { - $grid.find('tr[data-index="' + vInd + '"]').remove(); - $detail.hide(); - $row.after($detail); - var newRow = ''; - //noinspection JSValidateTypes - $detail.wrap('').parent().wrap(newRow); - $icon.html(collapseIcon); - $cell.attr('title', collapseTitle); - if (animate) { - $detail.slideDown(duration, function () { - setCollapsed($icon); - $detail.show(); + if (getRowNum() >= numRows) { + endLoading($hdrCell); + $hdrIcon.focus(); + } + return; + } + if (collapseAll) { + if (isExpanded($icon)) { + self.collapse(); + incrementRowNum(); + if (getRowNum() >= numRows) { + endLoading($hdrCell); + $hdrIcon.focus(); + } + } + if (getRowNum() >= numRows) { + endLoading($hdrCell); + $hdrIcon.focus(); + } + return; + } + if (isExpanded($icon)) { + if (detailUrl) { + self.load(function () { + self.expand(false); }); } else { - $detail.show(); - setCollapsed($icon); + self.expand(false); + } + } + handler($cell, 'click', function (event) { + self.toggle(); + event.stopPropagation(); + }); + handler($row, 'click', function (event) { + var target = event.target, clickDisabled = $(target).length && + $(target).hasClass('kv-disable-click') || + $.inArray(target.nodeName, rowClickExcludedTags) !== -1; + if (enableRowClick && !clickDisabled) { + self.toggle(); } + }); + }, + load: function (postProcess) { + var self = this, $cell = self.$cell, $detail = self.$detail, vKey = self.vKey, vInd = self.vInd, + params = $.extend({expandRowKey: vKey, expandRowInd: vInd}, extraData), + reload = enableCache ? $detail.html().length === 0 : true; + if (detailUrl.length > 0 && reload) { + $.ajax({ + type: 'POST', + data: params, + url: detailUrl, + beforeSend: function () { + beginLoading($cell); + $grid.trigger('kvexprow:beforeLoad', [vInd, vKey, extraData]); + }, + success: function (out) { + $detail.html(out); + endLoading($cell); + if (typeof onDetailLoaded === 'function') { + onDetailLoaded(); + } + postProcess(); + $grid.trigger('kvexprow:loaded', [vInd, vKey, extraData]); + }, + error: function () { + $detail.html( + '
Error fetching data. Please try again later.
'); + $grid.trigger('kvexprow:error', [vInd, vKey, extraData]); + endLoading($cell); + } + }); + return; + } else { + endLoading($cell); + } + if (typeof postProcess === 'function') { + postProcess(); + } + }, + expand: function (animate) { + var self = this, $row = self.$row, $icon = self.$icon, $cell = self.$cell, + $detail = self.$detail, vKey = self.vKey, vInd = self.vInd, isAjax = detailUrl.length > 0; + if (isExpanded($icon)) { + return; + } + if (!isAjax) { + beginLoading($cell); + } + $grid.find('tr[data-index="' + vInd + '"]').remove(); + $detail.hide(); + $row.after($detail); + var newRow = ''; + //noinspection JSValidateTypes + $detail.wrap('').parent().wrap(newRow); + $icon.html(collapseIcon); + $cell.attr('title', collapseTitle); + if (animate) { + $detail.slideDown(duration, function () { + setCollapsed($icon); + $detail.show(); + }); + } else { + $detail.show(); + setCollapsed($icon); + } + // needed when used together with grouping + var $rowsBefore = $row.prevAll(), expandRowPosition = $row.index() + 1; + $rowsBefore.push($row); + $.each($rowsBefore, function (i, tr) { + var $rowSpanTds = $(tr).find('td[rowspan]'); + $.each($rowSpanTds, function (j, td) { + var rowSpan = parseInt($(td).attr('rowspan')); + if ($(tr).index() + rowSpan > expandRowPosition) { + $(td).attr('rowspan', rowSpan + 1); + } + }); + }); + if (!isAjax) { + endLoading($cell); + } + }, + collapse: function (hideProgress) { + var self = this, $row = self.$row, $icon = self.$icon, $cell = self.$cell, $detail = self.$detail, + $container = self.$container; + if (isCollapsed($icon)) { + return; + } + if (!hideProgress) { + beginLoading($cell); + } + $container.html(''); + $icon.html(expandIcon); + $cell.attr('title', expandTitle); + $detail.slideUp(duration, function () { + $detail.unwrap().unwrap(); + $detail.appendTo($container); + setExpanded($icon); // needed when used together with grouping - var $rowsBefore = $row.prevAll(), expandRowPosition = $row.index() + 1; + var $rowsBefore = $row.prevAll(); $rowsBefore.push($row); + var expandRowPosition = $row.index() + 1; $.each($rowsBefore, function (i, tr) { var $rowSpanTds = $(tr).find('td[rowspan]'); - $.each($rowSpanTds, function(j, td) { + $.each($rowSpanTds, function (j, td) { var rowSpan = parseInt($(td).attr('rowspan')); if ($(tr).index() + rowSpan > expandRowPosition) { - $(td).attr('rowspan', rowSpan + 1); + $(td).attr('rowspan', rowSpan - 1); } }); }); - if (detailUrl.length === 0) { - endLoading($cell); - } - }, - collapseRow = function () { - beginLoading($cell); - $container.html(''); - $icon.html(expandIcon); - $cell.attr('title', expandTitle); - $tr = $detail.closest('.kv-expand-detail-row'); - $detail.slideUp(duration, function () { - $detail.unwrap().unwrap(); - $detail.appendTo($container); - setExpanded($icon); - // needed when used together with grouping - var $rowsBefore = $row.prevAll(); - $rowsBefore.push($row); - var expandRowPosition = $row.index() + 1; - $.each($rowsBefore, function (i, tr) { - var $rowSpanTds = $(tr).find('td[rowspan]'); - $.each($rowSpanTds, function(j, td) { - var rowSpan = parseInt($(td).attr('rowspan')); - if ($(tr).index() + rowSpan > expandRowPosition) { - $(td).attr('rowspan', rowSpan - 1); - } - }); - }); - }); + }); + if (!hideProgress) { endLoading($cell); - }, - toggleRow = function () { - var opt, chk, collapsed = false, loading = false; - if ($cell.hasClass(progress)) { - return; - } - if (isCollapsed($icon)) { - chk = expandOneOnly && !collapseAll; - if (chk) { - opt = $.extend({}, options, {collapseAll: true}); - $rows.each(function () { - if ($(this).closest('.kv-expand-icon-cell').hasClass(progress)) { - loading = true; - //noinspection UnnecessaryReturnStatementJS - return; - } - }); - if (loading) { - return; - } - kvExpandRow(opt); - collapsed = true; - } - loadDetail(function () { - expandRow(true); + } + }, + toggle: function () { + var self = this, $icon = self.$icon, $cell = self.$cell, chk, collapsed = false, + vKey = self.vKey, vInd = self.vInd; + if ($cell.hasClass(progress)) { + return; + } + if (isCollapsed($icon)) { + chk = expandOneOnly && !collapseAll; + if (chk) { + $cells.each(function () { + var manager = new ToggleManager($(this)); + manager.collapse(true); }); - if (!chk || collapsed) { - $grid.trigger('kvexprow:toggle', [vInd, vKey, extraData, true]); - $icon.focus(); - } - return; + collapsed = true; } - if (isExpanded($icon)) { - collapseRow(); - $grid.trigger('kvexprow:toggle', [vInd, vKey, extraData, false]); + self.load(function () { + self.expand(true); + }); + if (!chk || collapsed) { + $grid.trigger('kvexprow:toggle', [vInd, vKey, extraData, true]); $icon.focus(); } - }; - if (expandAll) { - if (isCollapsed($icon)) { - loadDetail(function () { - expandRow(true); - incrementRowNum(); - if (getRowNum() >= numRows) { - endLoading($hdrCell); - $hdrIcon.focus(); - } - }); - } - if (getRowNum() >= numRows) { - endLoading($hdrCell); - $hdrIcon.focus(); + return; } - return true; - } - if (collapseAll) { if (isExpanded($icon)) { - collapseRow(); - incrementRowNum(); - if (getRowNum() >= numRows) { - endLoading($hdrCell); - $hdrIcon.focus(); - } - } - if (getRowNum() >= numRows) { - endLoading($hdrCell); - $hdrIcon.focus(); - } - return true; - } - if (isExpanded($icon)) { - if (detailUrl) { - loadDetail(function () { - expandRow(false); - }); - } else { - expandRow(false); + self.collapse(); + $grid.trigger('kvexprow:toggle', [vInd, vKey, extraData, false]); + $icon.focus(); } } - handler($cell, 'click', function (event) { - toggleRow($cell); - event.stopPropagation(); - }); - handler($row, 'click', function (event) { - var target = event.target, clickDisabled = $(target).length && - $(target).hasClass('kv-disable-click') || - $.inArray(target.nodeName, rowClickExcludedTags) !== -1; - if (enableRowClick && !clickDisabled) { - toggleRow($cell); - } - }); + }; + if (!$grid.data(kvRowNumVar)) { + setRowNum(0); + } + if (extraData.length === 0) { + extraData = {}; + } + if ($cells.length === 0) { + setCss($hdrCell, 'kv-state-disabled'); + return; + } + $cells.each(function () { + var expandRow = new ToggleManager($(this)); + expandRow.run(); }); if (!$hdrCell.length) { return; } handler($hdrCell, 'click', function () { - if ($hdrCell.hasClass(progress) || $rows.length === 0) { + if ($hdrCell.hasClass(progress) || $cells.length === 0) { return; } var collAll = isCollapsed($hdrIcon), expAll = isExpanded($hdrIcon), - opt = $.extend({}, options, {expandAll: expAll, collapseAll: collAll}); + opt = $.extend(true, {}, options, {expandAll: expAll, collapseAll: collAll}); beginLoading($hdrCell); if (expAll) { - setRowNum($rows.find(".kv-state-collapsed").length); + setRowNum($cells.find('.kv-state-collapsed').length); setExpanded($hdrIcon); $hdrIcon.html(collapseIcon); $hdrCell.attr('title', collapseAllTitle); $grid.trigger('kvexprow:toggleAll', [extraData, false]); } else { if (collAll) { - setRowNum($rows.find(".kv-state-expanded").length); + setRowNum($cells.find('.kv-state-expanded').length); setCollapsed($hdrIcon); $hdrIcon.html(expandIcon); $hdrCell.attr('title', expandAllTitle); diff --git a/src/assets/js/kv-grid-expand.min.js b/src/assets/js/kv-grid-expand.min.js index c4316ea6..5e41996d 100644 --- a/src/assets/js/kv-grid-expand.min.js +++ b/src/assets/js/kv-grid-expand.min.js @@ -2,7 +2,7 @@ * @package yii2-grid * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2019 - * @version 3.3.4 + * @version 3.3.5 * * jQuery methods library for yii2-grid expand row column * @@ -10,4 +10,4 @@ * Copyright: 2014 - 2019, Kartik Visweswaran, Krajee.com * For more JQuery plugins visit http://plugins.krajee.com * For more Yii related demos visit http://demos.krajee.com - */var kvExpandRow;!function(e){"use strict";kvExpandRow=function(t,a){var n=".kvExpandRowColumn",l="kvRowNum_"+a,o=t.gridId,i=t.hiddenFromExport,d=t.detailUrl,r=t.onDetailLoaded,s=t.expandIcon,c=t.collapseIcon,p=t.expandTitle,v=t.collapseTitle,f=t.expandAllTitle,u=t.collapseAllTitle,x=t.expandOneOnly,h=t.enableRowClick,k=t.rowClickExcludedTags,g=t.enableCache,w=t.extraData,C=i?t.rowCssClass+" skip-export":t.rowCssClass,m=t.animationDuration,A=e("#"+o),y="."+a,b=A.find(".kv-expand-header-cell.kv-batch-toggle"+y),R=b.find(".kv-expand-header-icon"),E=void 0===t.collapseAll?!1:t.collapseAll,T=void 0===t.expandAll?!1:t.expandAll,I=A.find("td.kv-expand-icon-cell"+y+" .kv-expand-row:not(.kv-state-disabled)"),N=I.length,D="kv-expand-detail-loading",j=function(){var t=A.find("td.kv-expand-icon-cell"+y+":first"),a=t&&t.length?t.closest("tr"):"",n=0;return a&&a.length?(a.find("> td").each(function(){"none"!==e(this).css("display")&&n++}),n):0},O=j(),P=function(e){return e.hasClass("kv-state-collapsed")&&!e.hasClass("kv-state-disabled")},L=function(e){return e.hasClass("kv-state-expanded")&&!e.hasClass("kv-state-disabled")},S=function(e,t){e.length&&e.removeClass(t).addClass(t)},U=function(e){e.removeClass("kv-state-collapsed").addClass("kv-state-expanded")},F=function(e){e.removeClass("kv-state-expanded").addClass("kv-state-collapsed")},K=function(e){S(e,D)},Q=function(e){if(e.length){var t=isNaN(m)?1e3:m+200;setTimeout(function(){e.removeClass(D)},t)}},_=function(){var e=A.data(l);return e=e?parseInt(e):0,isNaN(e)?0:e},q=function(e){A.data(l,e)},z=function(){var e=_();A.data(l,e+1)},B=function(e,t,a,l){var o=l?t:t.split(" ").join(n+" ")+n;e.length&&e.off(o).on(o,a)};return A.data(l)||q(0),0===w.length&&(w={}),0===I.length?void S(b,"kv-state-disabled"):(I.each(function(){var a,n,l=e(this),o=l.find(">.kv-expand-icon"),i=o.closest(".kv-expand-icon-cell"),f=l.closest("tr"),u=i.find(".kv-expand-detail"),j=l.find(".kv-expanded-row"+y+":first"),S=j.data("key"),q=j.data("index");if(!P(o)&&!L(o))return!0;0===j.length&&(S=f.data("key"),a=f.next('tr.kv-expand-detail-row[data-key="'+S+'"]'),j=a.find(".kv-expanded-row"));var G=function(t){var a=e.extend({expandRowKey:S,expandRowInd:q},w),n=g?0===j.html().length:!0;return d.length>0&&n?void e.ajax({type:"POST",data:a,url:d,beforeSend:function(){K(i),A.trigger("kvexprow:beforeLoad",[q,S,w])},success:function(e){j.html(e),Q(i),"function"==typeof r&&r(),t(),A.trigger("kvexprow:loaded",[q,S,w])},error:function(){j.html('
Error fetching data. Please try again later.
'),A.trigger("kvexprow:error",[q,S,w]),Q(i)}}):(Q(i),void t())},H=function(t){A.find('tr[data-index="'+q+'"]').remove(),j.hide(),f.after(j);var a='';j.wrap('').parent().wrap(a),o.html(c),i.attr("title",v),t?j.slideDown(m,function(){F(o),j.show()}):(j.show(),F(o));var n=f.prevAll(),l=f.index()+1;n.push(f),e.each(n,function(t,a){var n=e(a).find("td[rowspan]");e.each(n,function(t,n){var o=parseInt(e(n).attr("rowspan"));e(a).index()+o>l&&e(n).attr("rowspan",o+1)})}),0===d.length&&Q(i)},J=function(){K(i),u.html(""),o.html(s),i.attr("title",p),n=j.closest(".kv-expand-detail-row"),j.slideUp(m,function(){j.unwrap().unwrap(),j.appendTo(u),U(o);var t=f.prevAll();t.push(f);var a=f.index()+1;e.each(t,function(t,n){var l=e(n).find("td[rowspan]");e.each(l,function(t,l){var o=parseInt(e(l).attr("rowspan"));e(n).index()+o>a&&e(l).attr("rowspan",o-1)})})}),Q(i)},M=function(){var a,n,l=!1,d=!1;if(!i.hasClass(D)){if(L(o)){if(n=x&&!E){if(a=e.extend({},t,{collapseAll:!0}),I.each(function(){return e(this).closest(".kv-expand-icon-cell").hasClass(D)?void(d=!0):void 0}),d)return;kvExpandRow(a),l=!0}return G(function(){H(!0)}),void(n&&!l||(A.trigger("kvexprow:toggle",[q,S,w,!0]),o.focus()))}P(o)&&(J(),A.trigger("kvexprow:toggle",[q,S,w,!1]),o.focus())}};return T?(L(o)&&G(function(){H(!0),z(),_()>=N&&(Q(b),R.focus())}),_()>=N&&(Q(b),R.focus()),!0):E?(P(o)&&(J(),z(),_()>=N&&(Q(b),R.focus())),_()>=N&&(Q(b),R.focus()),!0):(P(o)&&(d?G(function(){H(!1)}):H(!1)),B(i,"click",function(e){M(i),e.stopPropagation()}),void B(f,"click",function(t){var a=t.target,n=e(a).length&&e(a).hasClass("kv-disable-click")||-1!==e.inArray(a.nodeName,k);h&&!n&&M(i)}))}),void(b.length&&B(b,"click",function(){if(!b.hasClass(D)&&0!==I.length){var n=L(R),l=P(R),o=e.extend({},t,{expandAll:l,collapseAll:n});K(b),l?(q(I.find(".kv-state-collapsed").length),U(R),R.html(c),b.attr("title",u),A.trigger("kvexprow:toggleAll",[w,!1])):n&&(q(I.find(".kv-state-expanded").length),F(R),R.html(s),b.attr("title",f),A.trigger("kvexprow:toggleAll",[w,!0])),kvExpandRow(o,a)}})))}}(window.jQuery); \ No newline at end of file + */var kvExpandRow;!function(e){"use strict";kvExpandRow=function(t,n){var a=".kvExpandRowColumn",l="kvRowNum_"+n,o=t.gridId,i=t.hiddenFromExport,d=t.detailUrl,r=t.onDetailLoaded,s=t.expandIcon,c=t.collapseIcon,v=t.expandTitle,p=t.collapseTitle,f=t.expandAllTitle,u=t.collapseAllTitle,h=t.expandOneOnly,x=t.enableRowClick,g=t.rowClickExcludedTags,k=t.enableCache,w=t.extraData,$=i?t.rowCssClass+" skip-export":t.rowCssClass,m=t.animationDuration,C=e("#"+o),y="."+n,A=C.find(".kv-expand-header-cell.kv-batch-toggle"+y),I=A.find(".kv-expand-header-icon"),b=void 0===t.collapseAll?!1:t.collapseAll,R=void 0===t.expandAll?!1:t.expandAll,T=C.find("td.kv-expand-icon-cell"+y+" .kv-expand-row:not(.kv-state-disabled)"),E=T.length,K="kv-expand-detail-loading",N=function(){var t=C.find("td.kv-expand-icon-cell"+y+":first"),n=t&&t.length?t.closest("tr"):"",a=0;return n&&n.length?(n.find("> td").each(function(){"none"!==e(this).css("display")&&a++}),a):0},D=N(),j=function(e){return e.hasClass("kv-state-collapsed")&&!e.hasClass("kv-state-disabled")},O=function(e){return e.hasClass("kv-state-expanded")&&!e.hasClass("kv-state-disabled")},P=function(e,t){e.length&&e.removeClass(t).addClass(t)},L=function(e){e.removeClass("kv-state-collapsed").addClass("kv-state-expanded")},S=function(e){e.removeClass("kv-state-expanded").addClass("kv-state-collapsed")},U=function(e){P(e,K)},F=function(e){if(e.length){var t=isNaN(m)?1e3:m+200;setTimeout(function(){e.removeClass(K)},t)}},Q=function(){var e=C.data(l);return e=e?parseInt(e):0,isNaN(e)?0:e},_=function(e){C.data(l,e)},q=function(){var e=Q();C.data(l,e+1)},z=function(e,t,n,l){var o=l?t:t.split(" ").join(a+" ")+a;e.length&&e.off(o).on(o,n)},B=function(e){var t=this;t.$element=e,t.init()};return B.prototype={constructor:B,init:function(){var e,t=this;t.$row=t.$element.closest("tr"),t.$icon=t.$element.find(">.kv-expand-icon"),t.$detail=t.$element.find(".kv-expanded-row"+y+":first"),t.$cell=t.$icon.closest(".kv-expand-icon-cell"),t.$container=t.$cell.find(".kv-expand-detail:first"),t.vKey=t.$detail.data("key"),t.vInd=t.$detail.data("index"),0===t.$detail.length&&(t.vKey=t.$row.data("key"),e=t.$row.next('tr.kv-expand-detail-row[data-key="'+t.vKey+'"]'),t.$detail=e.find(".kv-expanded-row"))},run:function(){var t=this,n=t.$row,a=t.$cell,l=t.$icon;if(j(l)||O(l)){if(R)return O(l)&&t.load(function(){t.expand(!0),q(),Q()>=E&&(F(A),I.focus())}),void(Q()>=E&&(F(A),I.focus()));if(b)return j(l)&&(t.collapse(),q(),Q()>=E&&(F(A),I.focus())),void(Q()>=E&&(F(A),I.focus()));j(l)&&(d?t.load(function(){t.expand(!1)}):t.expand(!1)),z(a,"click",function(e){t.toggle(),e.stopPropagation()}),z(n,"click",function(n){var a=n.target,l=e(a).length&&e(a).hasClass("kv-disable-click")||-1!==e.inArray(a.nodeName,g);x&&!l&&t.toggle()})}},load:function(t){var n=this,a=n.$cell,l=n.$detail,o=n.vKey,i=n.vInd,s=e.extend({expandRowKey:o,expandRowInd:i},w),c=k?0===l.html().length:!0;return d.length>0&&c?void e.ajax({type:"POST",data:s,url:d,beforeSend:function(){U(a),C.trigger("kvexprow:beforeLoad",[i,o,w])},success:function(e){l.html(e),F(a),"function"==typeof r&&r(),t(),C.trigger("kvexprow:loaded",[i,o,w])},error:function(){l.html('
Error fetching data. Please try again later.
'),C.trigger("kvexprow:error",[i,o,w]),F(a)}}):(F(a),void("function"==typeof t&&t()))},expand:function(t){var n=this,a=n.$row,l=n.$icon,o=n.$cell,i=n.$detail,r=n.vKey,s=n.vInd,v=d.length>0;if(!j(l)){v||U(o),C.find('tr[data-index="'+s+'"]').remove(),i.hide(),a.after(i);var f='';i.wrap('').parent().wrap(f),l.html(c),o.attr("title",p),t?i.slideDown(m,function(){S(l),i.show()}):(i.show(),S(l));var u=a.prevAll(),h=a.index()+1;u.push(a),e.each(u,function(t,n){var a=e(n).find("td[rowspan]");e.each(a,function(t,a){var l=parseInt(e(a).attr("rowspan"));e(n).index()+l>h&&e(a).attr("rowspan",l+1)})}),v||F(o)}},collapse:function(t){var n=this,a=n.$row,l=n.$icon,o=n.$cell,i=n.$detail,d=n.$container;O(l)||(t||U(o),d.html(""),l.html(s),o.attr("title",v),i.slideUp(m,function(){i.unwrap().unwrap(),i.appendTo(d),L(l);var t=a.prevAll();t.push(a);var n=a.index()+1;e.each(t,function(t,a){var l=e(a).find("td[rowspan]");e.each(l,function(t,l){var o=parseInt(e(l).attr("rowspan"));e(a).index()+o>n&&e(l).attr("rowspan",o-1)})})}),t||F(o))},toggle:function(){var t,n=this,a=n.$icon,l=n.$cell,o=!1,i=n.vKey,d=n.vInd;if(!l.hasClass(K))return O(a)?(t=h&&!b,t&&(T.each(function(){var t=new B(e(this));t.collapse(!0)}),o=!0),n.load(function(){n.expand(!0)}),void(t&&!o||(C.trigger("kvexprow:toggle",[d,i,w,!0]),a.focus()))):void(j(a)&&(n.collapse(),C.trigger("kvexprow:toggle",[d,i,w,!1]),a.focus()))}},C.data(l)||_(0),0===w.length&&(w={}),0===T.length?void P(A,"kv-state-disabled"):(T.each(function(){var t=new B(e(this));t.run()}),void(A.length&&z(A,"click",function(){if(!A.hasClass(K)&&0!==T.length){var a=O(I),l=j(I),o=e.extend(!0,{},t,{expandAll:l,collapseAll:a});U(A),l?(_(T.find(".kv-state-collapsed").length),L(I),I.html(c),A.attr("title",u),C.trigger("kvexprow:toggleAll",[w,!1])):a&&(_(T.find(".kv-state-expanded").length),S(I),I.html(s),A.attr("title",f),C.trigger("kvexprow:toggleAll",[w,!0])),kvExpandRow(o,n)}})))}}(window.jQuery); \ No newline at end of file diff --git a/src/assets/js/kv-grid-export.js b/src/assets/js/kv-grid-export.js index f32156cf..cbba99a0 100644 --- a/src/assets/js/kv-grid-export.js +++ b/src/assets/js/kv-grid-export.js @@ -2,7 +2,7 @@ * @package yii2-grid * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2019 - * @version 3.3.4 + * @version 3.3.5 * * Grid Export Validation Module for Yii's Gridview. Supports export of * grid data as CSV, HTML, or Excel. diff --git a/src/assets/js/kv-grid-export.min.js b/src/assets/js/kv-grid-export.min.js index d9d1bf8f..765d00c6 100644 --- a/src/assets/js/kv-grid-export.min.js +++ b/src/assets/js/kv-grid-export.min.js @@ -2,7 +2,7 @@ * @package yii2-grid * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2019 - * @version 3.3.4 + * @version 3.3.5 * * Grid Export Validation Module for Yii's Gridview. Supports export of * grid data as CSV, HTML, or Excel. diff --git a/src/assets/js/kv-grid-group.min.js b/src/assets/js/kv-grid-group.min.js index 703e2295..88774a51 100644 --- a/src/assets/js/kv-grid-group.min.js +++ b/src/assets/js/kv-grid-group.min.js @@ -2,7 +2,7 @@ * @package yii2-grid * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2019 - * @version 3.3.4 + * @version 3.3.5 * * Grid grouping jquery library created for yii2-grid. * diff --git a/src/assets/js/kv-grid-radio.js b/src/assets/js/kv-grid-radio.js index 8f437018..b6e4887c 100644 --- a/src/assets/js/kv-grid-radio.js +++ b/src/assets/js/kv-grid-radio.js @@ -2,7 +2,7 @@ * @package yii2-grid * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2019 - * @version 3.3.4 + * @version 3.3.5 * * Client actions for yii2-grid RadioColumn * diff --git a/src/assets/js/kv-grid-radio.min.js b/src/assets/js/kv-grid-radio.min.js index 2dc8ba42..21e6b2ce 100644 --- a/src/assets/js/kv-grid-radio.min.js +++ b/src/assets/js/kv-grid-radio.min.js @@ -2,7 +2,7 @@ * @package yii2-grid * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2019 - * @version 3.3.4 + * @version 3.3.5 * * Client actions for yii2-grid RadioColumn * diff --git a/src/assets/js/kv-grid-toggle.js b/src/assets/js/kv-grid-toggle.js index e48efcb1..c0f47467 100644 --- a/src/assets/js/kv-grid-toggle.js +++ b/src/assets/js/kv-grid-toggle.js @@ -2,7 +2,7 @@ * @package yii2-grid * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2019 - * @version 3.3.4 + * @version 3.3.5 * * jQuery methods library for yii2-grid toggle data * diff --git a/src/assets/js/kv-grid-toggle.min.js b/src/assets/js/kv-grid-toggle.min.js index 883b689c..d0eb5028 100644 --- a/src/assets/js/kv-grid-toggle.min.js +++ b/src/assets/js/kv-grid-toggle.min.js @@ -2,7 +2,7 @@ * @package yii2-grid * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2019 - * @version 3.3.4 + * @version 3.3.5 * * jQuery methods library for yii2-grid toggle data * diff --git a/src/controllers/ExportController.php b/src/controllers/ExportController.php index b483fa05..40994a2c 100644 --- a/src/controllers/ExportController.php +++ b/src/controllers/ExportController.php @@ -4,7 +4,7 @@ * @package yii2-grid * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2019 - * @version 3.3.4 + * @version 3.3.5 */ namespace kartik\grid\controllers;