Merge branch 'release-2.1.5'

otto-torino · Apr 2, 2021 · 9915e2c · 9915e2c
2 parents 935a0f0 + c351c04
commit 9915e2c
Show file tree

Hide file tree

Showing 12 changed files with 44 additions and 69 deletions.
diff --git a/baton/static/baton/app/dist/baton.min.js b/baton/static/baton/app/dist/baton.min.js
diff --git a/baton/static/baton/app/dist/baton.min.js.map b/baton/static/baton/app/dist/baton.min.js.map
diff --git a/baton/static/baton/app/package-lock.json b/baton/static/baton/app/package-lock.json
diff --git a/baton/static/baton/app/package.json b/baton/static/baton/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "baton",
-  "version": "2.1.4",
+  "version": "2.1.5",
   "description": "Django Baton App",
   "main": "index.js",
   "scripts": {
@@ -15,13 +15,11 @@
     "@babel/preset-env": "^7.9.6",
     "@babel/register": "^7.9.0",
     "@fortawesome/fontawesome-free": "^5.8.1",
-    "@popperjs/core": "^2.6.0",
     "autoprefixer": "^9.2.1",
     "babel-cli": "^6.26.0",
     "babel-loader": "^8.1.0",
     "babel-register": "^6.18.0",
-    "bootstrap": "^5.0.0-beta2",
-    "bootstrap-icons": "^1.2.1",
+    "bootstrap": "^5.0.0-beta3",
     "css-loader": "^3.5.3",
     "file-loader": "^6.0.0",
     "ini": "^2.0.0",
@@ -31,7 +29,6 @@
     "lodash": "^4.17.19",
     "mini-svg-data-uri": "^1.2.3",
     "node-sass": "^4.5.0",
-    "popper.js": "^1.16.1",
     "postcss-loader": "^3.0.0",
     "sass": "^1.26.5",
     "sass-loader": "^8.0.2",

diff --git a/baton/static/baton/app/src/core/Messages.js b/baton/static/baton/app/src/core/Messages.js
@@ -1,5 +1,5 @@
 import $ from 'jquery'
-import bootstrap from 'bootstrap/dist/js/bootstrap'
+import bootstrap from 'bootstrap/dist/js/bootstrap.bundle'
 
 let Messages = {
   /**

diff --git a/baton/static/baton/app/src/core/Tabs.js b/baton/static/baton/app/src/core/Tabs.js
@@ -1,5 +1,5 @@
 import $ from 'jquery'
-import bootstrap from 'bootstrap/dist/js/bootstrap'
+import bootstrap from 'bootstrap/dist/js/bootstrap.bundle'
 
 let Tabs = {
   /**
@@ -86,7 +86,10 @@ let Tabs = {
     this.main.before(this.nav)
 
     $('a[data-bs-toggle="tab"]').on('shown.bs.tab', function (e) {
-      $('[title]:not(iframe)').tooltip()
+      let tooltipTriggerList = [].slice.call($('[title]:not(iframe)'))
+      tooltipTriggerList.map(function (tooltipTriggerEl) {
+        return new bootstrap.Tooltip(tooltipTriggerEl)
+      })
     })
   },
   createInlineEl: function (el, setDataTab = false) {

diff --git a/baton/static/baton/app/src/index.js b/baton/static/baton/app/src/index.js
@@ -1,5 +1,5 @@
 // jQuery is provided by webpack provider plugin
-import 'bootstrap/dist/js/bootstrap'
+import bootstrap from 'bootstrap/dist/js/bootstrap.bundle'
 import './styles/baton.scss'
 
 import Template from './core/Template'
@@ -70,7 +70,10 @@ window.Baton = {
     Dispatcher.emit('onReady')
   },
   loadTooltips: function () {
-    $('[title]:not(iframe)').tooltip()
+    let tooltipTriggerList = [].slice.call($('[title]:not(iframe)'))
+    tooltipTriggerList.map(function (tooltipTriggerEl) {
+      return new bootstrap.Tooltip(tooltipTriggerEl)
+    })
   },
   page: function () {
     if (/^(\/[a-z]{2})?\/admin\/$/.test(location.pathname)) {

diff --git a/docs/conf.py b/docs/conf.py
@@ -54,9 +54,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = u'2.1.4'
+version = u'2.1.5'
 # The full version, including alpha/beta/rc tags.
-release = u'2.1.4'
+release = u'2.1.5'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/package-lock.json b/package-lock.json
diff --git a/setup.py b/setup.py
@@ -11,7 +11,7 @@
 
 setup(
     name='django-baton',
-    version='2.1.4',
+    version='2.1.5',
     packages=['baton', 'baton.autodiscover', 'baton.templatetags'],
     include_package_data=True,
     license='MIT License',

diff --git a/testapp/app/db.sqlite3 b/testapp/app/db.sqlite3
diff --git a/testapp/app/package-lock.json b/testapp/app/package-lock.json