Merge pull request #820 from makeusabrew/v6-wip

v6 release

.jshintrc

@@ -9,6 +9,7 @@
     "quotmark": "single",
     "browser": true,
     "node": true,
+    "esversion": 6,
     "globals": {
       "beforeEach": true,
       "afterEach": true,

CHANGELOG.md

@@ -1,4 +1,18 @@
-## 5.5.2 (Latest Release)
+## 6.0.0 (Latest Release)
+
+- Removes various IE polyfills
+- Replaces `var` with `let`
+- JSDoc cleanup
+- Adds code to handle cases when click starts on the modal body and ends on the backdrop and `backdrop` is set to `true`
+- `bootbox.locale.js` and `bootbox.all.js` are now generated files and will be found in the `/dist` directory
+- Simplify locale file structure
+- Changed a few locale identifiers to match IANA specifications:
+  - `bg_BG` -> `bg-BG`
+  - `pt-br` -> `pt-BR`
+  - `zh_CN` -> `zh-CN`
+  - `zh_TW` -> `zh-CW`
+
+### 5.5.2
 
 - Adds Vietnamese locale
 

CONTRIBUTING.md

@@ -5,10 +5,8 @@
 * Please rebase your branch against the current master
 * Run ```npm install``` to make sure your development dependencies are up-to-date
 * [grunt-cli](https://github.com/gruntjs/grunt-cli) >= 0.4.0 is required to sanity check your contribution
-* Please ensure that the test suite passes **and** that bootbox.js is lint free before submitting a PR by running:
- * ```grunt```
-* If you've added new functionality, **please** include tests which validate its behaviour
- * **this includes pull requests which _only_ add new locales!**
+* Please ensure that the test suite passes **and** that bootbox.js is lint free before submitting a PR by running ```grunt```
+* If you've added new functionality, **please** include tests which validate its behaviour -- **this includes pull requests which _only_ add new locales!**
 
 ## Submitting bug reports
 

Gruntfile.js

@@ -1,6 +1,32 @@
 module.exports = function (grunt) {
     'use strict';
     grunt.initConfig({
+        concat: {
+            copy : {
+                src: ['bootbox.js'],
+                dest: 'dist/bootbox.js'
+            },
+
+            locales: {
+                src: ['templates/umd-header-locales.txt', 'locales/**/*.js', 'templates/umd-footer.txt'],
+                dest: 'dist/bootbox.locales.js'
+            },
+
+            all : {
+                src: ['bootbox.js', 'dist/bootbox.locales.js'],
+                dest: 'dist/bootbox.all.js'
+            }
+        },
+
+        jsbeautifier : {
+            src : ['dist/bootbox.locales.js','dist/bootbox.all.js'],
+            options:{
+                js: {
+                    indentSize: 2
+                }
+            }
+        },
+
         uglify: {
             options: {
                 compress: true,
@@ -13,8 +39,8 @@ module.exports = function (grunt) {
             my_target: {
                 files: {
                     'dist/bootbox.min.js': ['bootbox.js'],
-                    'dist/bootbox.locales.min.js': ['bootbox.locales.js'],
-                    'dist/bootbox.all.min.js': ['bootbox.all.js']
+                    'dist/bootbox.locales.min.js': ['dist/bootbox.locales.js'],
+                    'dist/bootbox.all.min.js': ['dist/bootbox.all.js']
                 }
             }
         },
@@ -24,19 +50,24 @@ module.exports = function (grunt) {
                 jshintrc: '.jshintrc',
                 force: true
             },
-            all: ['bootbox.js', 'bootbox.locales.js', 'bootbox.all.js']
+            all: ['bootbox.js', 'dist/bootbox.locales.js']
         },
 
         karma: {
-            unit: {
+            current: {
                 configFile: 'karma.conf.js'
+            },
+            legacy: {
+                configFile: 'karma.conf.legacy.js'
             }
-        }
+        },
     });
 
+    grunt.loadNpmTasks('grunt-contrib-concat');
+    grunt.loadNpmTasks("grunt-jsbeautifier");
     grunt.loadNpmTasks('grunt-contrib-uglify');
     grunt.loadNpmTasks('grunt-contrib-jshint');
     grunt.loadNpmTasks('grunt-karma');
 
-    grunt.registerTask('default', ['uglify', 'jshint', 'karma']);
+    grunt.registerTask('default', ['concat', 'jsbeautifier', 'uglify', 'jshint', 'karma']);
 };  

LICENSE.md

@@ -2,7 +2,7 @@
 
 (The MIT License)
 
-Copyright (C) 2011-2020 by Nick Payne <[email protected]>
+Copyright (C) 2011-2022 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

@@ -13,17 +13,27 @@ The easiest thing is to [find me on twitter @makeusabrew](http://twitter.com/mak
 
 Please see the [CONTRIBUTING](https://github.com/makeusabrew/bootbox/blob/master/CONTRIBUTING.md) file for guidelines.
 
-## Running Tests [![Build Status](https://api.travis-ci.org/makeusabrew/bootbox.svg)](http://travis-ci.org/makeusabrew/bootbox)
+## Running Tests
 
-Tests are run using [Karma](http://karma-runner.github.io/0.8/index.html) using the Mocha test adapter.
-To run the tests yourself, simply run ```npm install``` within the project followed by ```npm test```.
+Tests are run using [Karma](http://karma-runner.github.io/0.8/index.html) using the Mocha test adapter. To run the tests yourself, simply run 
 
-The project is also hosted on [Travis CI](https://travis-ci.org/makeusabrew/bootbox) - when submitting
-pull requests **please** ensure your tests pass as failing requests will be rejected. See the
+```
+npm install
+``` 
+
+within the project followed by 
+
+```
+npm test
+```
+
+When submitting pull requests, ensure your tests pass. **Pull-requests with failing tests will be rejected.** See the
 [CONTRIBUTING](https://github.com/makeusabrew/bootbox/blob/master/CONTRIBUTING.md) file for more information.
 
 ## A note on Bootstrap dependencies
 
+Bootbox **6.0.0** is the first release to support Bootstrap 5.0.0.
+
 Bootbox **5.0.0** is the first release to support Bootstrap 4.0.0.
 
 Bootbox **4.0.0** is the first release to support Bootstrap 3.0.0.
@@ -32,10 +42,19 @@ 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.5.3 (Latest Release)
-
-- Adds `relatedTarget` option. Allows the caller to determine which element, if any, triggered the modal
-- Various bugfixes and package updates
+## 6.0.0 (Latest Release)
+
+- Removes various IE polyfills
+- Replaces `var` with `let`
+- JSDoc cleanup
+- Adds code to handle cases when click starts on the modal body and ends on the backdrop and `backdrop` is set to `true`
+- `bootbox.locale.js` and `bootbox.all.js` are now generated files and will be found in the `/dist` directory
+- Simplify locale file structure
+- Changed a few locale identifiers to match IANA specifications:
+  - `bg_BG` -> `bg-BG`
+  - `pt-br` -> `pt-BR`
+  - `zh_CN` -> `zh-CN`
+  - `zh_TW` -> `zh-CW`
 
 For a full list of releases and changes please see [the changelog](https://github.com/makeusabrew/bootbox/blob/master/CHANGELOG.md).