Skip to content

Commit

Permalink
Merge pull request #21 from SpiLLeR/custom-options
Browse files Browse the repository at this point in the history
Custom options
  • Loading branch information
kartik-v authored Jul 11, 2017
2 parents ff4317c + 6796356 commit 0dd2883
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 7 deletions.
5 changes: 5 additions & 0 deletions CHANGE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
Change Log: `yii2-dialog`
===================================

## Version 1.0.3

**Date** 03-Jul-2017
- Fixed accept custom options for dialog

## Version 1.0.2

**Date:** 01-Dec-2016
Expand Down
2 changes: 1 addition & 1 deletion Dialog.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* @package yii2-dialog
* @author Kartik Visweswaran <[email protected]>
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2016
* @version 1.0.2
* @version 1.0.3
*/

namespace kartik\dialog;
Expand Down
2 changes: 1 addition & 1 deletion DialogAsset.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* @package yii2-dialog
* @author Kartik Visweswaran <[email protected]>
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2015 - 2016
* @version 1.0.2
* @version 1.0.3
*/

namespace kartik\dialog;
Expand Down
2 changes: 1 addition & 1 deletion DialogBootstrapAsset.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* @package yii2-dialog
* @author Kartik Visweswaran <[email protected]>
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2015 - 2016
* @version 1.0.2
* @version 1.0.3
*/

namespace kartik\dialog;
Expand Down
4 changes: 2 additions & 2 deletions assets/js/dialog.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* @package yii2-dialog
* @author Kartik Visweswaran <[email protected]>
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2016
* @version 1.0.2
* @version 1.0.3
*
* Provides a polyfill for javascript native alert, confirm, and prompt boxes. The BootstrapDialog will be used if
* available or needed, else the javascript native dialogs will be rendered.
Expand Down Expand Up @@ -45,7 +45,7 @@ var KrajeeDialog;
},
getOpts: function (type) {
var self = this;
return window.jQuery.extend({}, self.defaults[type], self.options);
return window.jQuery.extend({}, self.defaults[type], self.options[type]);
},
_dialog: function (type, message, callback) {
var self = this, opts, out;
Expand Down
4 changes: 2 additions & 2 deletions assets/js/dialog.min.js

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

0 comments on commit 0dd2883

Please sign in to comment.