Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump Boosted to v5.3.3 #158

Merged
merged 5 commits into from
Mar 20, 2024
Merged

Bump Boosted to v5.3.3 #158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ddc3f3a
Bump Boosted to v5.3.3
louismaximepiton Mar 12, 2024
97e4c9a
Fix Boosted 4 issue when jQuery loading is delayed
louismaximepiton Mar 12, 2024
eac2b57
Merge branch 'main' into main-lmp-bump-boosted
louismaximepiton Mar 20, 2024
3845e3c
Remove uneeded changes
louismaximepiton Mar 20, 2024
aa8c543
fix(review)
louismaximepiton Mar 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions docs/examples/bar-chart.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
<script type="module" src="./index.js"></script>
</head>
<body>
<header>
<header data-bs-theme="dark">
<nav
class="navbar navbar-dark bg-dark navbar-expand-lg"
class="navbar navbar-expand-lg"
aria-label="Global navigation - With one line title example"
>
<div class="container-xxl">
Expand Down
4 changes: 2 additions & 2 deletions docs/examples/bar-line-chart.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
<script type="module" src="./index.js"></script>
</head>
<body>
<header>
<header data-bs-theme="dark">
<nav
class="navbar navbar-dark bg-dark navbar-expand-lg"
class="navbar navbar-expand-lg"
aria-label="Global navigation - With one line title example"
>
<div class="container-xxl">
Expand Down
14 changes: 6 additions & 8 deletions docs/examples/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,10 @@
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<title>Examples - ODS Charts</title>
<link
href="https://cdn.jsdelivr.net/npm/boosted@5.2.3/dist/css/boosted.min.css"
rel="stylesheet"
integrity="sha384-zYFw+mxKy6r9zpAc1NoGiYBfQmxfvg7ONEMr81WeU+WLPPaLC9QTrNGFJTBi3EIn"
crossorigin="anonymous"
/>

<link href="https://cdn.jsdelivr.net/npm/boosted@5.3.3/dist/css/orange-helvetica.min.css" rel="stylesheet" integrity="sha384-A0Qk1uKfS1i83/YuU13i2nx5pk79PkIfNFOVzTcjCMPGKIDj9Lqx9lJmV7cdBVQZ" crossorigin="anonymous">
<link href="https://cdn.jsdelivr.net/npm/boosted@5.3.3/dist/css/boosted.min.css" rel="stylesheet" integrity="sha384-laZ3JUZ5Ln2YqhfBvadDpNyBo7w5qmWaRnnXuRwNhJeTEFuSdGbzl4ZGHAEnTozR" crossorigin="anonymous">

<link rel="apple-touch-icon" href="../images/favicons/apple-touch-icon.png" sizes="180x180">
<link rel="icon" href="../images/favicons/favicon-32x32.png" sizes="32x32" type="image/png">
<link rel="icon" href="../images/favicons/favicon-16x16.png" sizes="16x16" type="image/png">
Expand All @@ -25,9 +23,9 @@
</script>
</head>
<body>
<header>
<header data-bs-theme="dark">
<nav
class="navbar navbar-dark bg-dark navbar-expand-lg"
class="navbar navbar-expand-lg"
aria-label="Global navigation - With one line title example"
>
<div class="container-xxl">
Expand Down
30 changes: 16 additions & 14 deletions docs/examples/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,17 @@ import 'https://cdnjs.cloudflare.com/ajax/libs/lodash.js/4.17.21/lodash.min.js';
var themeElements = {
BOOSTED5: {
css: [
'https://cdn.jsdelivr.net/npm/boosted@5.3.2/dist/css/boosted.min.css',
'https://cdn.jsdelivr.net/npm/boosted@5.3.3/dist/css/orange-helvetica.min.css',
'https://cdn.jsdelivr.net/npm/boosted@5.3.3/dist/css/boosted.min.css',
],
script: [
'https://cdn.jsdelivr.net/npm/@popperjs/core@2.11.8/dist/umd/popper.min.js',
'https://cdn.jsdelivr.net/npm/boosted@5.3.2/dist/js/boosted.min.js',
'https://cdn.jsdelivr.net/npm/boosted@5.3.3/dist/js/boosted.min.js',
],
},
BOOSTED4: {
css: [
'https://cdn.jsdelivr.net/npm/boosted@5.3.3/dist/css/orange-helvetica.min.css',
'https://cdn.jsdelivr.net/npm/boosted@4.6.2/dist/css/boosted.min.css',
],
script: [
Expand Down Expand Up @@ -88,7 +90,7 @@ function generateConfigurator(id, cssThemeName) {
end: (id) => `</div>`,
},
item: {
begin: (id, itemId) => `<div class="card multi">`,
begin: (id, itemId) => `<div class="card">`,
end: (id, itemId) => `</div>`,
},
header: {
Expand All @@ -97,7 +99,7 @@ function generateConfigurator(id, cssThemeName) {
itemId
) => `<div class="card-header" role="tab" id="${itemId}">
<h5 class="mb-0">
<a class="collapsed" data-toggle="collapse" data-parent="#${id}" href="#collapse_${itemId}" role="button"
<a class="collapsed" data-toggle="collapse" href="#collapse_${itemId}" role="button"
aria-expanded="false" aria-controls="collapse_${itemId}">
`,
end: (id, itemId) => `</a>
Expand All @@ -108,7 +110,7 @@ function generateConfigurator(id, cssThemeName) {
begin: (
id,
itemId
) => `<div id="collapse_${itemId}" class="collapse" role="tabpanel" aria-labelledby="${itemId}">
) => `<div id="collapse_${itemId}" class="collapse" role="tabpanel" data-parent="#${id}" aria-labelledby="${itemId}">
<div class="card-body" id="body_${itemId}">`,
end: (id, itemId) => `</div>
</div>`,
Expand Down Expand Up @@ -151,14 +153,14 @@ function generateConfigurator(id, cssThemeName) {
<form class="row g-3">
<div class="col-md-4">
<label for="darkModeInput" class="form-label">Dark mode</label>
<select class="form-select" aria-label="Dark mode" id="darkModeInput" onchange="changeTheme('${id}')">
<select class="form-select custom-select" aria-label="Dark mode" id="darkModeInput" onchange="changeTheme('${id}')">
<option value="light" >White mode</option>
<option value="dark">Dark mode</option>
</select>
</div>
<div class="col-md-4">
<label for="colorSetInput" class="form-label">Categorical Color</label>
<select class="form-select" aria-label="Color set" id="colorSetInput" onchange="changeTheme('${id}')">
<select class="form-select custom-select" aria-label="Color set" id="colorSetInput" onchange="changeTheme('${id}')">
<option value="${
ODSCharts.ODSChartsCategoricalColorsSet
.DEFAULT_SUPPORTING_COLORS
Expand All @@ -183,7 +185,7 @@ function generateConfigurator(id, cssThemeName) {

<div class="col-md-4">
<label for="visualMapColorInput" class="form-label">visual Map Color</label>
<select class="form-select" aria-label="visual Map Color" id="visualMapColorInput" onchange="changeTheme('${id}')">
<select class="form-select custom-select" aria-label="visual Map Color" id="visualMapColorInput" onchange="changeTheme('${id}')">
<option value="blue" >Blue</option>
<option value="green" >Green</option>
<option value="purple" >Purple</option>
Expand All @@ -193,7 +195,7 @@ function generateConfigurator(id, cssThemeName) {

<div class="col-md-4">
<label for="lineStyleInput" class="form-label">Line style</label>
<select class="form-select" aria-label="Line style" id="lineStyleInput" onchange="changeTheme('${id}')">
<select class="form-select custom-select" aria-label="Line style" id="lineStyleInput" onchange="changeTheme('${id}')">
<option value="smooth" >Smooth</option>
<option value="broken" >Broken</option>
<option value="withPoints" >Broken with points</option>
Expand All @@ -210,7 +212,7 @@ function generateConfigurator(id, cssThemeName) {

<div class="col-md-4">
<label for="popoverInput" class="form-label">Popover or Tooltip</label>
<select class="form-select" aria-label="Line style" id="popoverInput" onchange="changeTheme('${id}')">
<select class="form-select custom-select" aria-label="Line style" id="popoverInput" onchange="changeTheme('${id}')">
<option value="none" >None</option>
<option value="popover" >Popover</option>
<option value="tooltip" >Tooltip</option>
Expand All @@ -219,15 +221,15 @@ function generateConfigurator(id, cssThemeName) {

<div class="col-md-4 popover-config">
<label for="popoverSharedInput" class="form-label">Tooltip/Popover content</label>
<select class="form-select" aria-label="Line style" id="popoverSharedInput" onchange="changeTheme('${id}')">
<select class="form-select custom-select" aria-label="Line style" id="popoverSharedInput" onchange="changeTheme('${id}')">
<option value="none" >Not shared</option>
<option value="shared" >Shared</option>
</select>
</div>

<div class="col-md-4 popover-config">
<label for="popoverAxisInput" class="form-label">Tooltip/Popover axis pointer</label>
<select class="form-select" aria-label="Line style" id="popoverAxisInput" onchange="changeTheme('${id}')">
<select class="form-select custom-select" aria-label="Line style" id="popoverAxisInput" onchange="changeTheme('${id}')">
<option value="none" >None</option>
<option value="shadow" >Shadow</option>
<option value="line" >Line</option>
Expand All @@ -237,7 +239,7 @@ function generateConfigurator(id, cssThemeName) {

<div class="col-md-4 popover-renderer">
<label for="popoverTemplateInput" class="form-label">Popover renderer</label>
<select class="form-select" aria-label="Line style" id="popoverTemplateInput" onchange="changeTheme('${id}')">
<select class="form-select custom-select" aria-label="Line style" id="popoverTemplateInput" onchange="changeTheme('${id}')">
<option value="internal" >Chartjs renderer</option>
<option value="external" >Boosted renderer</option>
</select>
Expand All @@ -248,7 +250,7 @@ function generateConfigurator(id, cssThemeName) {
</div>
<div class="col-md-4">
<label for="cssTheme" class="form-label">Used CSS</label>
<select class="form-select" aria-label="Line style" id="cssTheme" onchange="changeCssTheme(this.value)">
<select class="form-select custom-select" aria-label="Line style" id="cssTheme" onchange="changeCssTheme(this.value)">
<option value="NONE" >NONE</option>
<option value="BOOSTED4" >Boosted 4</option>
<option value="BOOSTED5" >Boosted 5</option>
Expand Down
4 changes: 2 additions & 2 deletions docs/examples/multiple-line-chart.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
<script type="module" src="./index.js"></script>
</head>
<body>
<header>
<header data-bs-theme="dark">
<nav
class="navbar navbar-dark bg-dark navbar-expand-lg"
class="navbar navbar-expand-lg"
aria-label="Global navigation - With one line title example"
>
<div class="container-xxl">
Expand Down
4 changes: 2 additions & 2 deletions docs/examples/single-line-chart.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
<script type="module" src="./index.js"></script>
</head>
<body>
<header>
<header data-bs-theme="dark">
<nav
class="navbar navbar-dark bg-dark navbar-expand-lg"
class="navbar navbar-expand-lg"
aria-label="Global navigation - With one line title example"
>
<div class="container-xxl">
Expand Down
4 changes: 2 additions & 2 deletions docs/examples/stacked-bar-chart.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
<script type="module" src="./index.js"></script>
</head>
<body>
<header>
<header data-bs-theme="dark">
<nav
class="navbar navbar-dark bg-dark navbar-expand-lg"
class="navbar navbar-expand-lg"
aria-label="Global navigation - With one line title example"
>
<div class="container-xxl">
Expand Down
14 changes: 6 additions & 8 deletions docs/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,10 @@
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<title>ODS Charts</title>
<link
href="https://cdn.jsdelivr.net/npm/boosted@5.2.3/dist/css/boosted.min.css"
rel="stylesheet"
integrity="sha384-zYFw+mxKy6r9zpAc1NoGiYBfQmxfvg7ONEMr81WeU+WLPPaLC9QTrNGFJTBi3EIn"
crossorigin="anonymous"
/>

<link href="https://cdn.jsdelivr.net/npm/boosted@5.3.3/dist/css/orange-helvetica.min.css" rel="stylesheet" integrity="sha384-A0Qk1uKfS1i83/YuU13i2nx5pk79PkIfNFOVzTcjCMPGKIDj9Lqx9lJmV7cdBVQZ" crossorigin="anonymous">
<link href="https://cdn.jsdelivr.net/npm/boosted@5.3.3/dist/css/boosted.min.css" rel="stylesheet" integrity="sha384-laZ3JUZ5Ln2YqhfBvadDpNyBo7w5qmWaRnnXuRwNhJeTEFuSdGbzl4ZGHAEnTozR" crossorigin="anonymous">

<link
rel="apple-touch-icon"
href="images/favicons/apple-touch-icon.png"
Expand Down Expand Up @@ -46,9 +44,9 @@
</script>
</head>
<body>
<header>
<header data-bs-theme="dark">
<nav
class="navbar navbar-dark bg-dark navbar-expand-lg"
class="navbar navbar-expand-lg"
aria-label="Global navigation - With one line title example"
>
<div class="container-xxl">
Expand Down
4 changes: 2 additions & 2 deletions docs/use_cases/confine-tooltip.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@
<script type="text/javascript" src="./index.js"></script>
</head>
<body>
<header>
<header data-bs-theme="dark">
<nav
class="navbar navbar-dark bg-dark navbar-expand-lg"
class="navbar navbar-expand-lg"
aria-label="Global navigation - With one line title example"
>
<div class="container-xxl">
Expand Down
4 changes: 2 additions & 2 deletions docs/use_cases/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@
</script>
</head>
<body>
<header>
<header data-bs-theme="dark">
<nav
class="navbar navbar-dark bg-dark navbar-expand-lg"
class="navbar navbar-expand-lg"
aria-label="Specific use cases illustrations"
>
<div class="container-xxl">
Expand Down
1 change: 0 additions & 1 deletion src/theme/popover/ods-chart-popover-definitions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,6 @@ class BOOSTED4_Definition extends ODSChartsPopoverDefinition {
container: 'body',
title: title,
content: htmlContent,
customClass: 'pe-none',
});
elt.chart = popover;

Expand Down