diff --git a/examples/annotations/index.pug b/examples/annotations/index.pug index b99d5efc6f..331af77f6f 100644 --- a/examples/annotations/index.pug +++ b/examples/annotations/index.pug @@ -60,7 +60,7 @@ block append mainContent .modal-dialog form.modal-content .modal-header - button.close(type='button', data-dismiss='modal') × + button.close(type='button', data-bs-dismiss='modal') × h4.modal-title Edit Annotation .modal-body .row @@ -196,4 +196,4 @@ block append mainContent #edit-validation-error .modal-footer button.btn.btn-sm.btn-primary#edit-update(type='submit') Update - button.btn.btn-sm.btn-secondary(data-dismiss='modal') Cancel + button.btn.btn-sm.btn-secondary(data-bs-dismiss='modal') Cancel diff --git a/examples/annotations/main.js b/examples/annotations/main.js index d93275b31f..667e90b1af 100644 --- a/examples/annotations/main.js +++ b/examples/annotations/main.js @@ -1,4 +1,4 @@ -/* globals $, geo, utils */ +/* globals $, geo, utils, bootstrap */ var annotationDebug = {}; @@ -489,7 +489,7 @@ function show_edit_dialog(id) { dlg.one('shown.bs.modal', function () { $('[option="name"]', dlg).focus(); }); - dlg.modal(); + new bootstrap.Modal(dlg[0]).show(); } /** diff --git a/examples/common/index.pug b/examples/common/index.pug index ee84117979..21d8f3bae9 100644 --- a/examples/common/index.pug +++ b/examples/common/index.pug @@ -18,7 +18,7 @@ html(lang="en") nav.navbar.navbar-default(role="navigation") .container-fluid .navbar-header - button.navbar-toggle(type="button", data-toggle="collapse", data-target="gj-navbar-collapse") + button.navbar-toggle(type="button", data-bs-toggle="collapse", data-bs-target="gj-navbar-collapse") span.sr-only Toggle navigation span.icon-bar span.icon-bar @@ -44,7 +44,7 @@ html(lang="en") | Source if !about.hidden li - a.gj-show-about-link(href="#", data-toggle="modal", data-target="#about-modal") + a.gj-show-about-link(href="#", data-bs-toggle="modal", data-bs-target="#about-modal") | About if ! about.hidden @@ -58,7 +58,7 @@ html(lang="en") p.text-left !{about.text} p.text-right © Kitware, Inc. .modal-footer - button.btn.btn-primary(data-dismiss="modal", data-target="#about-modal") Close + button.btn.btn-primary(data-bs-dismiss="modal") Close // Add the default main content element block mainContent diff --git a/examples/index.js b/examples/index.js index 4cb58703df..767139f927 100644 --- a/examples/index.js +++ b/examples/index.js @@ -2,9 +2,10 @@ require('../src/vendor'); window.geo = require('../src/index'); // bootstrap and themes -require('bootstrap/dist/css/bootstrap.css'); -require('bootswatch/flatly/bootstrap.css'); -require('bootstrap'); +require('../website/legacycss/bootstrap3.min.css'); +require('../website/legacycss/bootswatch_flatly3.min.css'); +require('@fontsource/lato'); +window.bootstrap = require('bootstrap/dist/js/bootstrap.bundle'); // codemirror and plugins window.jsonlint = require('jsonlint-mod'); diff --git a/examples/index.pug b/examples/index.pug index 60fea4da8c..9c3645db11 100644 --- a/examples/index.pug +++ b/examples/index.pug @@ -14,7 +14,7 @@ mixin thumbnail(ex) block prepend headerButtons ul.nav.navbar-nav.navbar-right li.dropdown - a.dropdown-toggle(href="#", data-toggle="dropdown") Resources + a.dropdown-toggle(href="#", data-bs-toggle="dropdown") Resources span.caret ul.dropdown-menu(role="menu") li diff --git a/examples/layerEvents/index.pug b/examples/layerEvents/index.pug index b6e51fcce9..5a2b0e736d 100644 --- a/examples/layerEvents/index.pug +++ b/examples/layerEvents/index.pug @@ -1,4 +1,4 @@ extends ../common/index.pug block append mainContent - button.btn.btn-default.layer-toggle(type="button", data-toggle="button") + button.btn.btn-default.layer-toggle(type="button", data-bs-toggle="button") diff --git a/examples/measure/index.pug b/examples/measure/index.pug index 32f66bd4fe..82deede5b3 100644 --- a/examples/measure/index.pug +++ b/examples/measure/index.pug @@ -64,7 +64,7 @@ block append mainContent .modal-dialog form.modal-content .modal-header - button.close(type='button', data-dismiss='modal') × + button.close(type='button', data-bs-dismiss='modal') × h4.modal-title Edit Annotation .modal-body .row @@ -200,4 +200,4 @@ block append mainContent #edit-validation-error .modal-footer button.btn.btn-sm.btn-primary#edit-update(type='submit') Update - button.btn.btn-sm.btn-secondary(data-dismiss='modal') Cancel + button.btn.btn-sm.btn-secondary(data-bs-dismiss='modal') Cancel diff --git a/examples/measure/main.js b/examples/measure/main.js index 7f470be52b..11b3ab9037 100644 --- a/examples/measure/main.js +++ b/examples/measure/main.js @@ -1,4 +1,4 @@ -/* globals $, geo, utils */ +/* globals $, geo, utils, bootstrap */ // This is extensively based on the Annotation example. @@ -697,7 +697,7 @@ function show_edit_dialog(id) { dlg.one('shown.bs.modal', function () { $('[option="name"]', dlg).focus(); }); - dlg.modal(); + new bootstrap.Modal(dlg[0]).show(); } /** diff --git a/examples/transitions/main.js b/examples/transitions/main.js index cbefd15c75..7c337bd147 100644 --- a/examples/transitions/main.js +++ b/examples/transitions/main.js @@ -1,4 +1,4 @@ -/* globals $, d3, geo, utils */ +/* globals $, d3, geo, utils, bootstrap */ // Run after the DOM loads $(function () { @@ -101,7 +101,7 @@ $(function () { var modal = $( '