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.

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

feature(REPORT-399140): dependent-bot-issue-fix #37

Merged
merged 2 commits into from
Nov 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"argv": "0.0.2",
"babel-eslint": "10.0.1",
"babel-loader": "8.0.5",
"bootstrap": "4.6.0",
"bootstrap": "5.3.3",
"copy-webpack-plugin": "5.0.1",
"css-loader": "2.1.1",
"file-loader": "3.0.1",
Expand All @@ -28,8 +28,8 @@
"gulp-gzip": "1.4.2",
"gulp-s3-upload": "1.7.3",
"mini-css-extract-plugin": "0.5.0",
"@popperjs/core": "2.11.8",
"open": "6.0.0",
"popper.js": "1.16.1",
"require-dir": "1.2.0",
"gulp4-run-sequence": "1.0.1",
"shelljs": "^0.8.4",
Expand Down
2 changes: 1 addition & 1 deletion src/common/header/header.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<div class="ej-sb-platform-name">Bold Reports for JavaScript</div>
<div class="dropdown">
<button class="btn btn-secondary dropdown-toggle" type="button" id="dropdownMenuButton"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
</button>
<div class="dropdown-menu" aria-labelledby="dropdownMenuButton"></div>
</div>
Expand Down
1 change: 1 addition & 0 deletions src/common/main-content/main-content.css
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
align-items: center;
color:#2b3a5c;
border-bottom: 2px solid transparent;
text-decoration: none;
}

.ej-main-body-content .ej-nav-header .ej-nav-item a:hover {
Expand Down
12 changes: 6 additions & 6 deletions src/common/main-content/main-content.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@ <h1 class="ej-title"></h1>
<div id="parentTabContainer">
<ul class="nav ej-nav-header" id="parentTab" role="tablist">
<li class="ej-nav-item">
<a href="#demo" data-toggle="tab" role="tab" aria-selected="true">
<a href="#demo" data-ds-toggle="tab" role="tab" aria-selected="true">
<Span class="ej-sb-icons ej-demo-icon"></Span><Span>DEMO</Span>
</a>
</li>
<li class="ej-nav-item source-tab">
<a href="#source" data-toggle="tab" role="tab" aria-selected="false">
<a href="#source" data-ds-toggle="tab" role="tab" aria-selected="false">
<Span class="ej-sb-icons ej-source-icon"></Span><Span>SOURCE</Span>
</a>
</li>
<!-- <li class="ej-nav-item desc-tab">
<a href="#ej-description" data-toggle="tab" role="tab" aria-selected="false">
<a href="#ej-description" data-ds-toggle="tab" role="tab" aria-selected="false">
<Span class="ej-sb-icons ej-description-icon"></Span><Span>Description</Span>
</a>
</li> -->
Expand All @@ -39,10 +39,10 @@ <h1 class="ej-title"></h1>
</div>
<ul class="nav ej-nav-header" id="childtTab" role="tablist">
<li class="ej-nav-item">
<a href="#js" class="active js-header" data-toggle="tab" role="tab" aria-selected="true"></a>
<a href="#js" class="active js-header" data-ds-toggle="tab" role="tab" aria-selected="true"></a>
</li>
<li class="ej-nav-item">
<a class="html-header" href="#html" data-toggle="tab" role="tab" aria-selected="false"></a>
<a class="html-header" href="#html" data-ds-toggle="tab" role="tab" aria-selected="false"></a>
</li>
</ul>
</div>
Expand Down Expand Up @@ -99,4 +99,4 @@ <h1 class="ej-title"></h1>
</div>
<div class="ej-lp-footer-copyright">Copyright © 2001-2024 Syncfusion Inc.</div>
</div>
</div>
</div>
2 changes: 1 addition & 1 deletion src/common/main-content/main-content.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export class MainContent {
this.element.getElementsByClassName('ej-nav-new')[0].addEventListener('click', this.onTabBtnClick.bind(this));
this.element.getElementsByClassName('ej-nav-prev')[0].addEventListener('click', this.onTabPrev.bind(this));
this.element.getElementsByClassName('ej-nav-next')[0].addEventListener('click', this.onTabNext.bind(this));
$('a[data-toggle="tab"][href="#demo"]').on('shown.bs.tab', this.resizeReportViewer);
$('a[data-bs-toggle="tab"][href="#demo"]').on('shown.bs.tab', this.resizeReportViewer);
}

async fetchFile(path) {
Expand Down
Loading