Skip to content

Commit

Permalink
Updates to release v1.8.0 fixes #217
Browse files Browse the repository at this point in the history
  • Loading branch information
kartik-v committed Apr 29, 2022
1 parent 8bac554 commit ae4cc23
Show file tree
Hide file tree
Showing 12 changed files with 68 additions and 54 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-editable`
===========================

## Version 1.8.0

**Date:** 29-Apr-2022

- (enh #217): PHP 8.1 enhancements for native functions.

## Version 1.7.9

**Date:** 20-Nov-2021
Expand Down
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2015 - 2021, Kartik Visweswaran
Copyright (c) 2015 - 2022, Kartik Visweswaran
Krajee.com
All rights reserved.

Expand Down
60 changes: 34 additions & 26 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,29 +1,37 @@
{
"name": "kartik-v/yii2-editable",
"description": "An enhanced editable widget for Yii 2.0 that allows easy editing of displayed data with numerous configuration possibilities.",
"keywords": ["bootstrap", "editable", "input", "widget", "popover-x", "popover", "jquery"],
"homepage": "https://github.com/kartik-v/yii2-editable",
"type": "yii2-extension",
"license": "BSD-3-Clause",
"authors": [
{
"name": "Kartik Visweswaran",
"email": "kartikv2@gmail.com",
"homepage": "http://www.krajee.com/"
}
],
"require": {
"kartik-v/yii2-widget-activeform": ">=1.6.0",
"kartik-v/yii2-popover-x": "~1.3"
},
"autoload": {
"psr-4": {
"kartik\\editable\\": "src"
}
},
"extra": {
"branch-alias": {
"dev-master": "1.7.x-dev"
}
"name": "kartik-v/yii2-editable",
"description": "An enhanced editable widget for Yii 2.0 that allows easy editing of displayed data with numerous configuration possibilities.",
"keywords": [
"bootstrap",
"editable",
"input",
"widget",
"popover-x",
"popover",
"jquery"
],
"homepage": "https://github.com/kartik-v/yii2-editable",
"type": "yii2-extension",
"license": "BSD-3-Clause",
"authors": [
{
"name": "Kartik Visweswaran",
"email": "kartikv2@gmail.com",
"homepage": "http://www.krajee.com/"
}
],
"require": {
"kartik-v/yii2-widget-activeform": ">=1.6.2",
"kartik-v/yii2-popover-x": "~1.3"
},
"autoload": {
"psr-4": {
"kartik\\editable\\": "src"
}
},
"extra": {
"branch-alias": {
"dev-master": "1.8.x-dev"
}
}
}
21 changes: 11 additions & 10 deletions src/Editable.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
/**
* @package yii2-editable
* @author Kartik Visweswaran <kartikv2@gmail.com>
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2015 - 2021
* @version 1.7.9
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2015 - 2022
* @version 1.8.0
*/

namespace kartik\editable;
Expand All @@ -12,6 +12,7 @@
use Exception;
use kartik\base\Config;
use kartik\base\InputWidget;
use kartik\base\Lib;
use kartik\popover\PopoverX;
use Yii;
use yii\base\InvalidConfigException;
Expand Down Expand Up @@ -602,7 +603,7 @@ public function registerAssets()
if (!empty($this->pjaxContainerId)) {
EditablePjaxAsset::register($view);
$toggleButton = $this->_popoverOptions['toggleButton']['id'];
$initPjaxVar = 'kvEdPjax_' . str_replace('-', '_', $this->_popoverOptions['options']['id']);
$initPjaxVar = 'kvEdPjax_' . Lib::str_replace('-', '_', $this->_popoverOptions['options']['id']);
$view->registerJs("var {$initPjaxVar} = false;", View::POS_HEAD);
if ($this->asPopover) {
$js = "initEditablePjax('{$this->pjaxContainerId}', '{$toggleButton}', '{$initPjaxVar}');";
Expand Down Expand Up @@ -836,8 +837,8 @@ protected function initOptions()
}
if ($this->header == null) {
$attribute = $this->attribute;
if (strpos($attribute, ']') > 0) {
$tags = explode(']', $attribute);
if (Lib::strpos($attribute, ']') > 0) {
$tags = Lib::explode(']', $attribute);
$attribute = array_pop($tags);
}
$this->_popoverOptions['header'] = $this->preHeader .
Expand Down Expand Up @@ -896,7 +897,7 @@ protected function renderActionButtons()
'{reset}' => Html::button($resetLabel, $resetOpts),
'{submit}' => Html::button($submitLabel, $submitOpts),
];
return strtr($this->buttonsTemplate, $params);
return Lib::strtr($this->buttonsTemplate, $params);
}

/**
Expand All @@ -906,7 +907,7 @@ protected function renderActionButtons()
*/
protected function renderFooter()
{
return strtr($this->footer, ['{loading}' => self::LOAD_INDICATOR, '{buttons}' => $this->renderActionButtons()]);
return Lib::strtr($this->footer, ['{loading}' => self::LOAD_INDICATOR, '{buttons}' => $this->renderActionButtons()]);
}

/**
Expand All @@ -926,11 +927,11 @@ protected function parseTemplate($template)
'{close}' => $this->inlineSettings['closeButton'],
'{loading}' => self::LOAD_INDICATOR,
];
$out = strtr($this->inlineSettings[$template], $params);
if (strpos($out, '{buttons}') === false) {
$out = Lib::strtr($this->inlineSettings[$template], $params);
if (Lib::strpos($out, '{buttons}') === false) {
return $out;
}
return strtr($out, ['{buttons}' => $this->renderActionButtons()]);
return Lib::strtr($out, ['{buttons}' => $this->renderActionButtons()]);
}

/**
Expand Down
4 changes: 2 additions & 2 deletions src/EditableAsset.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
/**
* @package yii2-editable
* @author Kartik Visweswaran <kartikv2@gmail.com>
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2015 - 2021
* @version 1.7.9
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2015 - 2022
* @version 1.8.0
*/

namespace kartik\editable;
Expand Down
5 changes: 2 additions & 3 deletions src/EditablePjaxAsset.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,12 @@
/**
* @package yii2-editable
* @author Kartik Visweswaran <kartikv2@gmail.com>
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2015 - 2021
* @version 1.7.9
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2015 - 2022
* @version 1.8.0
*/

namespace kartik\editable;

use Yii;
use kartik\base\AssetBundle;

/**
Expand Down
4 changes: 2 additions & 2 deletions src/assets/css/editable.css
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*!
* @package yii2-editable
* @author Kartik Visweswaran <kartikv2@gmail.com>
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2015 - 2021
* @version 1.7.9
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2015 - 2022
* @version 1.8.0
*
* Styling for the Editable widget
* Built for Yii Framework 2.0
Expand Down
4 changes: 2 additions & 2 deletions src/assets/css/editable.min.css

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

4 changes: 2 additions & 2 deletions src/assets/js/editable-pjax.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*!
* @package yii2-editable
* @author Kartik Visweswaran <kartikv2@gmail.com>
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2015 - 2021
* @version 1.7.9
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2015 - 2022
* @version 1.8.0
*
* Editable Extension - PJAX processing script for popover-x
*
Expand Down
4 changes: 2 additions & 2 deletions src/assets/js/editable-pjax.min.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*!
* @package yii2-editable
* @author Kartik Visweswaran <kartikv2@gmail.com>
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2015 - 2021
* @version 1.7.9
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2015 - 2022
* @version 1.8.0
*
* Editable Extension - PJAX processing script for popover-x
*
Expand Down
4 changes: 2 additions & 2 deletions src/assets/js/editable.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*!
* @package yii2-editable
* @author Kartik Visweswaran <kartikv2@gmail.com>
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2015 - 2021
* @version 1.7.9
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2015 - 2022
* @version 1.8.0
*
* Editable Extension jQuery plugin
*
Expand Down
4 changes: 2 additions & 2 deletions src/assets/js/editable.min.js

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

0 comments on commit ae4cc23

Please sign in to comment.