Browse Source

Added option 'btnsOrder'

Dante 9 years ago
parent
commit
be65cc4950
4 changed files with 30 additions and 12 deletions
  1. 3 1
      changelog.txt
  2. 13 5
      dist/js/bootstrap-dialog.js
  3. 1 1
      dist/js/bootstrap-dialog.min.js
  4. 13 5
      src/js/bootstrap-dialog.js

+ 3 - 1
changelog.txt

@@ -1,6 +1,8 @@
 LASTEST NOT RELEASED
 ------------------------------
-NONE
+* Refs #144 *
+* Refs #284 *
+* Refs #231 *
 
 V1.35.2
 ------------------------------

+ 13 - 5
dist/js/bootstrap-dialog.js

@@ -218,6 +218,8 @@
     BootstrapDialog.BUTTON_SIZES[BootstrapDialog.SIZE_WIDE] = '';
     BootstrapDialog.BUTTON_SIZES[BootstrapDialog.SIZE_LARGE] = 'btn-lg';
     BootstrapDialog.ICON_SPINNER = 'glyphicon glyphicon-asterisk';
+    BootstrapDialog.BUTTONS_ORDER_CANCEL_OK = 'btns-order-cancel-ok';
+    BootstrapDialog.BUTTONS_ORDER_OK_CANCEL = 'btns-order-ok-cancel';
 
     /**
      * Default options.
@@ -238,7 +240,8 @@
         draggable: false,
         animate: true,
         description: '',
-        tabindex: -1
+        tabindex: -1,
+        btnsOrder: BootstrapDialog.BUTTONS_ORDER_CANCEL_OK
     };
 
     /**
@@ -1278,6 +1281,7 @@
             btnCancelClass: null,
             btnOKLabel: BootstrapDialog.DEFAULT_TEXTS.OK,
             btnOKClass: null,
+            btnsOrder: BootstrapDialog.defaultOptions.btnsOrder,
             callback: null
         };
         if (typeof arguments[0] === 'object' && arguments[0].constructor === {}.constructor) {
@@ -1294,7 +1298,8 @@
 
         var dialog = new BootstrapDialog(confirmOptions);
         dialog.setData('callback', confirmOptions.callback);
-        dialog.addButton({
+        
+        var buttons = [{
             label: confirmOptions.btnCancelLabel,
             cssClass: confirmOptions.btnCancelClass,
             action: function (dialog) {
@@ -1304,8 +1309,7 @@
 
                 return dialog.close();
             }
-        });
-        dialog.addButton({
+        }, {
             label: confirmOptions.btnOKLabel,
             cssClass: confirmOptions.btnOKClass,
             action: function (dialog) {
@@ -1315,7 +1319,11 @@
 
                 return dialog.close();
             }
-        });
+        }];
+        if(confirmOptions.btnsOrder === BootstrapDialog.BUTTONS_ORDER_OK_CANCEL) {
+            buttons.reverse();
+        }
+        dialog.addButtons(buttons);
 
         return dialog.open();
 

File diff suppressed because it is too large
+ 1 - 1
dist/js/bootstrap-dialog.min.js


+ 13 - 5
src/js/bootstrap-dialog.js

@@ -218,6 +218,8 @@
     BootstrapDialog.BUTTON_SIZES[BootstrapDialog.SIZE_WIDE] = '';
     BootstrapDialog.BUTTON_SIZES[BootstrapDialog.SIZE_LARGE] = 'btn-lg';
     BootstrapDialog.ICON_SPINNER = 'glyphicon glyphicon-asterisk';
+    BootstrapDialog.BUTTONS_ORDER_CANCEL_OK = 'btns-order-cancel-ok';
+    BootstrapDialog.BUTTONS_ORDER_OK_CANCEL = 'btns-order-ok-cancel';
 
     /**
      * Default options.
@@ -238,7 +240,8 @@
         draggable: false,
         animate: true,
         description: '',
-        tabindex: -1
+        tabindex: -1,
+        btnsOrder: BootstrapDialog.BUTTONS_ORDER_CANCEL_OK
     };
 
     /**
@@ -1278,6 +1281,7 @@
             btnCancelClass: null,
             btnOKLabel: BootstrapDialog.DEFAULT_TEXTS.OK,
             btnOKClass: null,
+            btnsOrder: BootstrapDialog.defaultOptions.btnsOrder,
             callback: null
         };
         if (typeof arguments[0] === 'object' && arguments[0].constructor === {}.constructor) {
@@ -1294,7 +1298,8 @@
 
         var dialog = new BootstrapDialog(confirmOptions);
         dialog.setData('callback', confirmOptions.callback);
-        dialog.addButton({
+        
+        var buttons = [{
             label: confirmOptions.btnCancelLabel,
             cssClass: confirmOptions.btnCancelClass,
             action: function (dialog) {
@@ -1304,8 +1309,7 @@
 
                 return dialog.close();
             }
-        });
-        dialog.addButton({
+        }, {
             label: confirmOptions.btnOKLabel,
             cssClass: confirmOptions.btnOKClass,
             action: function (dialog) {
@@ -1315,7 +1319,11 @@
 
                 return dialog.close();
             }
-        });
+        }];
+        if(confirmOptions.btnsOrder === BootstrapDialog.BUTTONS_ORDER_OK_CANCEL) {
+            buttons.reverse();
+        }
+        dialog.addButtons(buttons);
 
         return dialog.open();