Fix #45: Enhancements to support Bootstrap v5.x

Author: kartik-v

CHANGE.md

@@ -1,6 +1,14 @@
 Change Log: `yii2-dialog`
 =========================
 
+## Version 1.0.6
+
+**Date:** 02-Sep-2021
+
+- (enh #45): Enhancements to support Bootstrap v5.x.
+- (enh #44): Add Latvian Translations.
+- (enh #43): Add Uzbek Translations.
+
 ## Version 1.0.5
 
 **Date:** 09-Oct-2018

LICENSE.md

@@ -1,4 +1,4 @@
-Copyright (c) 2014 - 2018, Kartik Visweswaran  
+Copyright (c) 2014 - 2021, Kartik Visweswaran  
 Krajee.com  
 All rights reserved.  
 

README.md

@@ -18,7 +18,11 @@
 [![Monthly Downloads](https://poser.pugx.org/kartik-v/yii2-dialog/d/monthly)](https://packagist.org/packages/kartik-v/yii2-dialog)
 [![Daily Downloads](https://poser.pugx.org/kartik-v/yii2-dialog/d/daily)](https://packagist.org/packages/kartik-v/yii2-dialog)
 
-A widget component for Yii Framework 2.0 to easily configure and initialize popup notification dialog boxes. It provides a polyfill for the native javascript alert, confirm, and prompt dialog boxes. It includes inbuilt support for rendering rich dialog boxes via [bootstrap3-dialog](http://nakupanda.github.io/bootstrap3-dialog/) which makes using Bootstrap's modal more monkey-friendly. The key features provided by the library are:
+A widget component for Yii Framework 2.0 to easily configure and initialize popup notification dialog boxes. It provides a polyfill for 
+the native javascript alert, confirm, and prompt dialog boxes. It includes inbuilt support for rendering rich dialog boxes via a customized 
+plugin by Krajee based on and enhanced from [bootstrap3-dialog](http://nakupanda.github.io/bootstrap3-dialog/). This plugin makes using Bootstrap's 
+modal more monkey-friendly. The Krajee enhancements also includes enhanced support for Bootstrap 5.x, 4.x and 3.x. The key features provided by 
+the library are:
 
 - Control how you want to render JAVASCRIPT dialogs. Inbuilt quick support for following dialog types:
     - ALERT dialog
@@ -38,7 +42,7 @@ Refer this [git workflow for contributors](.github/GIT-WORKFLOW.md).
 The preferred way to install this extension is through [composer](http://getcomposer.org/download/).
 
 ### Pre-requisites
-> Note: Check the [composer.json](https://github.com/kartik-v/yii2-dropdown-x/blob/master/composer.json) for this extension's requirements and dependencies. 
+> Note: Check the [composer.json](https://github.com/kartik-v/yii2-dialog/blob/master/composer.json) for this extension's requirements and dependencies. 
 You must set the `minimum-stability` to `dev` in the **composer.json** file in your application root folder before installation of this extension OR
 if your `minimum-stability` is set to any other value other than `dev`, then set the following in the require section of your composer.json file
 

composer.json

@@ -20,7 +20,7 @@
         }
     ],
     "require": {
-        "kartik-v/yii2-krajee-base": ">=2.0.0"
+        "kartik-v/yii2-krajee-base": ">=3.0.0"
     },
     "autoload": {
         "psr-4": {

src/Dialog.php

@@ -3,14 +3,17 @@
 /**
  * @package   yii2-dialog
  * @author    Kartik Visweswaran <[email protected]>
- * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2018
- * @version   1.0.5
+ * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2021
+ * @version   1.0.6
  */
 
 namespace kartik\dialog;
 
+use Exception;
+use ReflectionException;
 use Yii;
 use kartik\base\Widget;
+use yii\base\InvalidConfigException;
 use yii\helpers\Json;
 use yii\web\View;
 
@@ -169,7 +172,7 @@ class Dialog extends Widget
      * @var boolean (DEPRECATED) applicable only for versions v1.0.3 and below, where if set to `true` 
      * will enable a draggable cursor for draggable dialog boxes when dragging.
      *
-     * for v1.0.5 and above the cursor will always be displayed irrespective of this setting 
+     * for v1.0.6 and above the cursor will always be displayed irrespective of this setting 
      * (which can be controlled via CSS).
      */
     public $showDraggable = true;
@@ -197,8 +200,8 @@ class Dialog extends Widget
 
     /**
      * @inheritdoc
-     * @throws \ReflectionException
-     * @throws \yii\base\InvalidConfigException
+     * @throws ReflectionException
+     * @throws InvalidConfigException
      */
     public function run()
     {
@@ -209,15 +212,15 @@ public function run()
 
     /**
      * Initialize the dialog buttons.
-     * @throws \yii\base\InvalidConfigException
+     * @throws InvalidConfigException|Exception
      */
     public function initOptions()
     {
-        $isBs4 = $this->isBs4();
-        $defaultBtnCss = $isBs4 ? 'btn-outline-secondary' : 'btn-default';
-        $this->iconOk = $isBs4 ? 'fas fa-check' : 'glyphicon glyphicon-ok';
-        $this->iconCancel = $isBs4 ? 'fas fa-ban' : 'glyphicon glyphicon-ban-circle';
-        $this->iconSpinner = $isBs4 ? 'fas fa-asterisk' : 'glyphicon glyphicon-asterisk';
+        $notBs3 = !$this->isBs(3);
+        $defaultBtnCss = $notBs3 ? 'btn-outline-secondary' : 'btn-default';
+        $this->iconOk = $notBs3 ? 'fas fa-check' : 'glyphicon glyphicon-ok';
+        $this->iconCancel = $notBs3 ? 'fas fa-ban' : 'glyphicon glyphicon-ban-circle';
+        $this->iconSpinner = $notBs3 ? 'fas fa-asterisk' : 'glyphicon glyphicon-asterisk';
         $ok = Yii::t('kvdialog', 'Ok');
         $cancel = Yii::t('kvdialog', 'Cancel');
         $info = Yii::t('kvdialog', 'Information');

src/DialogAsset.php

@@ -3,8 +3,8 @@
 /**
  * @package   yii2-dialog
  * @author    Kartik Visweswaran <[email protected]>
- * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2018
- * @version   1.0.5
+ * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2021
+ * @version   1.0.6
  */
 
 namespace kartik\dialog;

src/DialogBootstrapAsset.php

@@ -3,8 +3,8 @@
 /**
  * @package   yii2-dialog
  * @author    Kartik Visweswaran <[email protected]>
- * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2018
- * @version   1.0.5
+ * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2021
+ * @version   1.0.6
  */
 
 namespace kartik\dialog;
@@ -26,7 +26,7 @@ public function init()
         $this->depends = array_merge(['kartik\dialog\DialogAsset'], $this->depends);
         $this->setSourcePath(__DIR__ . '/assets');
         $this->setupAssets('js', ['js/bootstrap-dialog']);
-        $this->setupAssets('css', ['css/bootstrap-dialog-bs' . ($this->isBs4() ? '4' : '3')]);
+        $this->setupAssets('css', ['css/bootstrap-dialog-bs' . (!$this->isBs(3) ? '4' : '3')]);
         parent::init();
     }
 }

src/DialogYiiAsset.php

@@ -3,13 +3,12 @@
 /**
  * @package   yii2-dialog
  * @author    Kartik Visweswaran <[email protected]>
- * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2018
- * @version   1.0.5
+ * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2021
+ * @version   1.0.6
  */
 
 namespace kartik\dialog;
 
-use yii\web\View;
 use kartik\base\AssetBundle;
 
 /**

src/assets/css/bootstrap-dialog-bs3.css

@@ -1,19 +1,23 @@
 /*!
  * @package   yii2-dialog
  * @author    Kartik Visweswaran <[email protected]>
- * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2018
- * @version   1.0.5
+ * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2021
+ * @version   1.0.6
  *
  * Bootstrap 3.x styling for bootstrap-dialog plugin.
  *
  * For more JQuery plugins visit http://plugins.krajee.com
  * For more Yii related demos visit http://demos.krajee.com
- */.bootstrap-dialog {
-}
+ */
 .bootstrap-dialog .modal-header {
   border-top-left-radius: 4px;
   border-top-right-radius: 4px;
 }
+.bootstrap-dialog .btn-modal-close {
+    margin: -5px;
+    background: none;
+    border-radius: 50%;
+}
 .bootstrap-dialog .modal-header.bootstrap-dialog-draggable {
     cursor: move;
 }