Improve alert window, customizing title, type and more options are no…

…w possible.
nakupanda · Mar 4, 2014 · 2af6b41 · 2af6b41
1 parent e483f86
commit 2af6b41
Showing 5 changed files with 85 additions and 16 deletions.
diff --git a/examples/assets/bootstrap-dialog/js/bootstrap-dialog.js b/examples/assets/bootstrap-dialog/js/bootstrap-dialog.js
@@ -734,20 +734,45 @@
     /**
      * Alert window
      * 
-     * @param {type} message
-     * @param {type} callback
      * @returns the created dialog instance
      */
-    BootstrapDialog.alert = function(message, callback) {
+    BootstrapDialog.alert = function() {
+        var options = {};
+        var defaultOptions = {
+            type: BootstrapDialog.TYPE_PRIMARY,
+            title: null,
+            message: null,
+            closable: true,
+            buttonLabel: 'OK',
+            callback: null
+        };
+
+        if (typeof arguments[0] === 'object' && arguments[0].constructor === {}.constructor) {
+            options = $.extend(true, defaultOptions, arguments[0]);
+        } else {
+            options = $.extend(true, defaultOptions, {
+                message: arguments[0],
+                closable: false,
+                buttonLabel: 'OK',
+                callback: typeof arguments[1] !== 'undefined' ? arguments[1] : null
+            });
+        }
+
         return new BootstrapDialog({
-            message: message,
+            type: options.type,
+            title: options.title,
+            message: options.message,
+            closable: options.closable,
             data: {
-                'callback': callback
+                callback: options.callback
+            },
+            onhide: function(dialog) {
+                !dialog.getData('btnClicked') && dialog.isClosable() && typeof dialog.getData('callback') === 'function' && dialog.getData('callback')(false);
             },
-            closable: false,
             buttons: [{
-                    label: 'OK',
+                    label: options.buttonLabel,
                     action: function(dialog) {
+                        dialog.setData('btnClicked', true);
                         typeof dialog.getData('callback') === 'function' && dialog.getData('callback')(true);
                         dialog.close();
                     }

diff --git a/examples/assets/bootstrap-dialog/js/bootstrap-dialog.min.js b/examples/assets/bootstrap-dialog/js/bootstrap-dialog.min.js
diff --git a/examples/index.html b/examples/index.html
@@ -592,6 +592,25 @@ <h3>Alert with callback</h3>
         -->
     </div>
 
+    <a name="advanced-alert-window"></a>
+    <h3>Customizing dialog type, title, and more.</h3>
+    <p>All options shown below are optional.</p>
+    <div class="source-code runnable">
+        <!--
+        BootstrapDialog.alert({
+            title: 'WARNING',
+            message: 'Warning! No Banana!',
+            type: BootstrapDialog.TYPE_WARNING, // <-- Default value is BootstrapDialog.TYPE_PRIMARY
+            closable: true, // <-- Default value is true
+            buttonLabel: 'Roar! Why!', // <-- Default value is 'OK',
+            callback: function(result) {
+                // result will be true if button was click, while it will be false if users close the dialog directly.
+                alert('Result is: ' + result);
+            }
+        });
+        -->
+    </div>
+
     <h3>Confirm</h3>
     <div class="source-code runnable">
         <!--

diff --git a/js/bootstrap-dialog.js b/js/bootstrap-dialog.js
@@ -734,20 +734,45 @@
     /**
      * Alert window
      * 
-     * @param {type} message
-     * @param {type} callback
      * @returns the created dialog instance
      */
-    BootstrapDialog.alert = function(message, callback) {
+    BootstrapDialog.alert = function() {
+        var options = {};
+        var defaultOptions = {
+            type: BootstrapDialog.TYPE_PRIMARY,
+            title: null,
+            message: null,
+            closable: true,
+            buttonLabel: 'OK',
+            callback: null
+        };
+
+        if (typeof arguments[0] === 'object' && arguments[0].constructor === {}.constructor) {
+            options = $.extend(true, defaultOptions, arguments[0]);
+        } else {
+            options = $.extend(true, defaultOptions, {
+                message: arguments[0],
+                closable: false,
+                buttonLabel: 'OK',
+                callback: typeof arguments[1] !== 'undefined' ? arguments[1] : null
+            });
+        }
+
         return new BootstrapDialog({
-            message: message,
+            type: options.type,
+            title: options.title,
+            message: options.message,
+            closable: options.closable,
             data: {
-                'callback': callback
+                callback: options.callback
+            },
+            onhide: function(dialog) {
+                !dialog.getData('btnClicked') && dialog.isClosable() && typeof dialog.getData('callback') === 'function' && dialog.getData('callback')(false);
             },
-            closable: false,
             buttons: [{
-                    label: 'OK',
+                    label: options.buttonLabel,
                     action: function(dialog) {
+                        dialog.setData('btnClicked', true);
                         typeof dialog.getData('callback') === 'function' && dialog.getData('callback')(true);
                         dialog.close();
                     }

diff --git a/js/bootstrap-dialog.min.js b/js/bootstrap-dialog.min.js