A little bit of cleanup

Bumps version number.
Fixes unit tests.
Moves backdrop fix - was inserted between the button validation.

CHANGELOG.md

@@ -1,4 +1,8 @@
-## 5.4.0 (Latest Release)
+## 5.4.1 (Latest Release)
+
+- Updates to how backdrop is handled. Fixes #766.
+
+### 5.4.0
 
 - Adds function hooks for `onShow`, `onShown`, `onHide`, and `onHidden` events, which map to their Bootstrap modal equivalents.
 

LICENSE.md

@@ -2,7 +2,7 @@
 
 (The MIT License)
 
-Copyright (C) 2011-2019 by Nick Payne <[email protected]>
+Copyright (C) 2011-2020 by Nick Payne <[email protected]>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -35,9 +35,9 @@ Bootbox **3.3.0** is the *last* release to support Bootstrap 2.2.x.
 
 Much more dependency information can be found [on the Bootbox website](http://bootboxjs.com/getting-started.html#bootbox-dependencies).
 
-## 5.4.0 (Latest Release)
+## 5.4.1 (Latest Release)
 
-- Adds function hooks for `onShow`, `onShown`, `onHide`, and `onHidden` events, which map to their Bootstrap modal equivalents.
+- Updates to how backdrop is handled. Fixes #766.
 
 For a full list of releases and changes please see [the changelog](https://github.com/makeusabrew/bootbox/blob/master/CHANGELOG.md).
 

bootbox.all.js

@@ -1,6 +1,6 @@
 /*! @preserve
  * bootbox.js
- * version: 5.4.0
+ * version: 5.4.1
  * author: Nick Payne <[email protected]>
  * license: MIT
  * http://bootboxjs.com/
@@ -1259,6 +1259,13 @@
     // make sure any supplied options take precedence over defaults
     options = $.extend({}, defaults, options);
 
+    //make sure backdrop is either true, false, or 'static'
+    if (!options.backdrop) {
+      options.backdrop = (options.backdrop === false || options.backdrop === 0) ? false : 'static';
+    } else {
+      options.backdrop = typeof options.backdrop === 'string' && options.backdrop.toLowerCase() === 'static' ? 'static' : true;
+    } 
+
     // no buttons is still a valid dialog but it's cleaner to always have
     // a buttons object to iterate over, even if it's empty
     if (!options.buttons) {

bootbox.js

@@ -1,6 +1,6 @@
 /*! @preserve
  * bootbox.js
- * version: 5.4.0
+ * version: 5.4.1
  * author: Nick Payne <[email protected]>
  * license: MIT
  * http://bootboxjs.com/
@@ -1064,17 +1064,18 @@
     // make sure any supplied options take precedence over defaults
     options = $.extend({}, defaults, options);
 
-    // no buttons is still a valid dialog but it's cleaner to always have
-    // a buttons object to iterate over, even if it's empty
-    if (!options.buttons) {
-      options.buttons = {};
-    }
-    //make sure backdrop is either true/false/static
+    //make sure backdrop is either true, false, or 'static'
     if (!options.backdrop) {
       options.backdrop = (options.backdrop === false || options.backdrop === 0) ? false : 'static';
     } else {
       options.backdrop = typeof options.backdrop === 'string' && options.backdrop.toLowerCase() === 'static' ? 'static' : true;
     } 
+
+    // no buttons is still a valid dialog but it's cleaner to always have
+    // a buttons object to iterate over, even if it's empty
+    if (!options.buttons) {
+      options.buttons = {};
+    }
 
     buttons = options.buttons;
 

bootbox.locales.js

@@ -1,6 +1,6 @@
 /*! @preserve
  * bootbox.locales.js
- * version: 5.4.0
+ * version: 5.4.1
  * author: Nick Payne <[email protected]>
  * license: MIT
  * http://bootboxjs.com/

header.txt

@@ -1,5 +1,5 @@
 /**
- * bootbox.js 5.4.0
+ * bootbox.js 5.4.1
  *
  * http://bootboxjs.com/license.txt
  */