Fixed #221

bower.json

@@ -1,7 +1,7 @@
 {
     "name": "bootstrap3-dialog",
     "description": "Make use of Bootstrap Modal more monkey-friendly. http://nakupanda.github.io/bootstrap3-dialog/",
-    "version": "1.34.8",
+    "version": "1.34.9",
     "keywords": [
         "css",
         "js",

changelog.txt

@@ -2,6 +2,10 @@ LASTEST NOT RELEASED
 ------------------------------
 NONE
 
+V1.34.9
+------------------------------
+* Fixed #221 *
+
 V1.34.8
 ------------------------------
 * Set 'realized' status to false when closing a 'autodestroy' dialog. *

dist/js/bootstrap-dialog.js

@@ -853,7 +853,7 @@
                     $button.toggleSpin(true);
                 }
                 if (typeof button.action === 'function') {
-                    button.action.call($button, dialog, event);
+                    return button.action.call($button, dialog, event);
                 }
             });
 
@@ -1233,9 +1233,11 @@
                     label: options.buttonLabel,
                     action: function (dialog) {
                         dialog.setData('btnClicked', true);
-                        if (typeof dialog.getData('callback') === 'function' && dialog.getData('callback').call(this, true) !== false) {
-                            dialog.close();
+                        if (typeof dialog.getData('callback') === 'function' && dialog.getData('callback').call(this, true) === false) {
+                            return false;
                         }
+
+                        return dialog.close();
                     }
                 }]
         }).open();
@@ -1285,17 +1287,21 @@
             buttons: [{
                     label: options.btnCancelLabel,
                     action: function (dialog) {
-                        if (typeof dialog.getData('callback') === 'function' && dialog.getData('callback').call(this, false) !== false) {
-                            dialog.close();
+                        if (typeof dialog.getData('callback') === 'function' && dialog.getData('callback').call(this, false) === false) {
+                            return false;
                         }
+
+                        return dialog.close();
                     }
                 }, {
                     label: options.btnOKLabel,
                     cssClass: options.btnOKClass,
                     action: function (dialog) {
-                        if (typeof dialog.getData('callback') === 'function' && dialog.getData('callback').call(this, true) !== false) {
-                            dialog.close();
+                        if (typeof dialog.getData('callback') === 'function' && dialog.getData('callback').call(this, true) === false) {
+                            return false;
                         }
+
+                        return dialog.close();
                     }
                 }]
         }).open();

examples/index.html

@@ -6,7 +6,7 @@
 <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js"></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/prettify/r298/run_prettify.min.js"></script>
 <link href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap3-dialog/1.34.7/css/bootstrap-dialog.min.css" rel="stylesheet" type="text/css" />
-<script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap3-dialog/1.34.7/js/bootstrap-dialog.min.js"></script>
+<script src="../src/js/bootstrap-dialog.js"></script>
 <meta charset="utf-8" />
 <title>BootstrapDialog examples</title>
 <style>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "bootstrap3-dialog",
-  "version": "1.34.8",
+  "version": "1.34.9",
   "description": "Make use of Bootstrap Modal more monkey-friendly.",
   "private": true,
   "directories": {

src/js/bootstrap-dialog.js

@@ -853,7 +853,7 @@
                     $button.toggleSpin(true);
                 }
                 if (typeof button.action === 'function') {
-                    button.action.call($button, dialog, event);
+                    return button.action.call($button, dialog, event);
                 }
             });
 
@@ -1233,9 +1233,11 @@
                     label: options.buttonLabel,
                     action: function (dialog) {
                         dialog.setData('btnClicked', true);
-                        if (typeof dialog.getData('callback') === 'function' && dialog.getData('callback').call(this, true) !== false) {
-                            dialog.close();
+                        if (typeof dialog.getData('callback') === 'function' && dialog.getData('callback').call(this, true) === false) {
+                            return false;
                         }
+
+                        return dialog.close();
                     }
                 }]
         }).open();
@@ -1285,17 +1287,21 @@
             buttons: [{
                     label: options.btnCancelLabel,
                     action: function (dialog) {
-                        if (typeof dialog.getData('callback') === 'function' && dialog.getData('callback').call(this, false) !== false) {
-                            dialog.close();
+                        if (typeof dialog.getData('callback') === 'function' && dialog.getData('callback').call(this, false) === false) {
+                            return false;
                         }
+
+                        return dialog.close();
                     }
                 }, {
                     label: options.btnOKLabel,
                     cssClass: options.btnOKClass,
                     action: function (dialog) {
-                        if (typeof dialog.getData('callback') === 'function' && dialog.getData('callback').call(this, true) !== false) {
-                            dialog.close();
+                        if (typeof dialog.getData('callback') === 'function' && dialog.getData('callback').call(this, true) === false) {
+                            return false;
                         }
+
+                        return dialog.close();
                     }
                 }]
         }).open();