Merge branch 'master' of github.com:nakupanda/bootstrap3-dialog

Author: avan06

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.35.3",
+    "version": "1.35.4",
     "keywords": [
         "css",
         "js",

changelog.txt

@@ -1,8 +1,14 @@
 LASTEST NOT RELEASED
 ------------------------------
-* Merged PR #300 *
-* Merged PR #308 *
-* Merged PR #232 *
+* Merged #347 *
+
+V1.35.4
+------------------------------
+* Refs #300 *
+* Refs #308 *
+* Refs #232 *
+* Refs #334 *
+* Refs #331 *
 
 V1.35.3
 ------------------------------

dist/js/bootstrap-dialog.js

@@ -1098,6 +1098,9 @@
                     $(this).remove();
                 }
                 BootstrapDialog.moveFocus();
+                if ($('.modal').hasClass('in')) {
+                  $('body').addClass('modal-open');
+                }
             });
 
             // Backdrop, I did't find a way to change bs3 backdrop option after the dialog is popped up, so here's a new wheel.
@@ -1113,7 +1116,7 @@
                 var dialog = event.data.dialog;
                 if (typeof dialog.registeredButtonHotkeys[event.which] !== 'undefined') {
                     var $button = $(dialog.registeredButtonHotkeys[event.which]);
-                    !$button.prop('disabled') && $button.focus().trigger('click');
+                    !$button.prop('disabled') && !$button.is(':focus') && $button.focus().trigger('click');
                 }
             });
 

dist/js/bootstrap-dialog.min.js

@@ -151,6 +151,10 @@ <h3>Buttons</h3>
                 label: 'Button 2',
                 // no title as it is optional
                 cssClass: 'btn-primary',
+                data: {
+                    js: 'btn-confirm',
+                    'user-id': '3'
+                },
                 action: function(){
                     alert('Hi Orange!');
                 }
@@ -996,7 +1000,11 @@ <h2>Available options</h2>
         id: 'btn-ok',   
         icon: 'glyphicon glyphicon-check',       
         label: 'OK',
-        cssClass: 'btn-primary', 
+        cssClass: 'btn-primary',
+        data: {
+            js: 'btn-confirm',
+            'user-id': '3'
+        },
         autospin: false,
         action: function(dialogRef){    
             dialogRef.close();
@@ -1007,7 +1015,8 @@ <h2>Available options</h2>
                     <strong>id</strong>: optional, if id is set, you can use dialogInstance.getButton(id) to get the button later. <br />
                     <strong>icon</strong>: optional, if set, the specified icon will be added to the button. <br />
                     <strong>cssClass</strong>: optional, additional css class to be added to the button. <br />
-                    <strong>autospin</strong>: optinal, if it's true, after clicked the button a spinning icon appears. <br />
+                    <strong>data</strong>: optional, object containing data attributes to be added to the button. <br />
+                    <strong>autospin</strong>: optional, if it's true, after clicked the button a spinning icon appears. <br />
                     <strong>action</strong>: optional, if provided, the callback will be invoked after the button is clicked, and the dialog instance will be passed to the callback function.
                 </td>
             </tr>

examples/index.html

@@ -1,6 +1,6 @@
 {
   "name": "bootstrap3-dialog",
-  "version": "1.35.3",
+  "version": "1.35.4",
   "description": "Make use of Bootstrap Modal more monkey-friendly.",
   "directories": {
     "example": "examples"

package.json

@@ -1098,6 +1098,9 @@
                     $(this).remove();
                 }
                 BootstrapDialog.moveFocus();
+                if ($('.modal').hasClass('in')) {
+                  $('body').addClass('modal-open');
+                }
             });
 
             // Backdrop, I did't find a way to change bs3 backdrop option after the dialog is popped up, so here's a new wheel.
@@ -1113,7 +1116,7 @@
                 var dialog = event.data.dialog;
                 if (typeof dialog.registeredButtonHotkeys[event.which] !== 'undefined') {
                     var $button = $(dialog.registeredButtonHotkeys[event.which]);
-                    !$button.prop('disabled') && $button.focus().trigger('click');
+                    !$button.prop('disabled') && !$button.is(':focus') && $button.focus().trigger('click');
                 }
             });