Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
purescript-gargantext
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
152
Issues
152
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
gargantext
purescript-gargantext
Commits
25b6b225
Verified
Commit
25b6b225
authored
Dec 10, 2024
by
Przemyslaw Kaminski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[bootstrap] upgrade to 5.3.3
parent
4868dbf0
Pipeline
#7110
failed with stages
in 10 minutes and 57 seconds
Changes
6
Pipelines
1
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
40 additions
and
14 deletions
+40
-14
index.html
dist/index.html
+3
-1
bootstrap.bundle.min.js
dist/js/bootstrap@5.3.3/bootstrap.bundle.min.js
+7
-0
bootstrap-5.3.3.min.css
dist/styles/bootstrap-5.3.3.min.css
+6
-0
package.json
package.json
+1
-1
BaseModal.js
src/Gargantext/Components/Bootstrap/Floaty/BaseModal.js
+21
-11
BaseModal.purs
src/Gargantext/Components/Bootstrap/Floaty/BaseModal.purs
+2
-1
No files found.
dist/index.html
View file @
25b6b225
...
...
@@ -5,6 +5,7 @@
<title>
CNRS GarganText
</title>
<link
rel=
"stylesheet"
href=
"icons/forkawesome.css"
>
<!-- <link href="styles/bootstrap.min.css" rel="stylesheet"> -->
<link
id=
"bootstrap-css"
href=
"styles/bootstrap-5.3.3.min.css"
rel=
"stylesheet"
/>
<link
id=
"bootstrap-css"
href=
"styles/bootstrap-default.css"
rel=
"stylesheet"
/>
<link
rel=
"stylesheet"
type=
"text/css"
href=
"styles/highlightjs-solarized-light.css"
/>
<style>
*
{
margin
:
0
;
padding
:
0
;
list-style
:
none
;}
</style>
...
...
@@ -13,7 +14,8 @@
<div
id=
"app"
></div>
<div
id=
"portal"
></div>
<script
src=
"js/jquery.js"
></script>
<script
src=
"js/bootstrap@4.6.2/bootstrap.bundle.min.js"
></script>
<!-- <script src="js/bootstrap@4.6.2/bootstrap.bundle.min.js"></script> -->
<script
src=
"js/bootstrap@5.3.3/bootstrap.bundle.min.js"
></script>
<script
src=
"bundle.min.js"
></script>
</body>
</html>
dist/js/bootstrap@5.3.3/bootstrap.bundle.min.js
0 → 100644
View file @
25b6b225
This diff is collapsed.
Click to expand it.
dist/styles/bootstrap-5.3.3.min.css
0 → 100644
View file @
25b6b225
This source diff could not be displayed because it is too large. You can
view the blob
instead.
package.json
View file @
25b6b225
...
...
@@ -34,7 +34,7 @@
"
@urql/core
"
:
"
~2.3.3
"
,
"
aes-js
"
:
"
~3.1.1
"
,
"
base-x
"
:
"
~3.0.2
"
,
"
bootstrap
"
:
"
~
4.6.0
"
,
"
bootstrap
"
:
"
~
5.3.3
"
,
"
bootstrap-dark
"
:
"
~1.0.3
"
,
"
buffer
"
:
"
~6.0.3
"
,
"
concurrently
"
:
"
^9.1.0
"
,
...
...
src/Gargantext/Components/Bootstrap/Floaty/BaseModal.js
View file @
25b6b225
'use strict'
;
/**
* @function show
* @param {Window} window
...
...
@@ -7,15 +8,20 @@
* @unpure {Object} window.$
*/
export
function
_show
(
window
,
querySelector
,
events
)
{
let
$modal
=
window
.
$
(
querySelector
);
$modal
.
modal
(
'show'
);
console
.
log
(
'events'
,
events
);
//let $modal = window.$(querySelector);
// $modal.modal('show');
let
modal
=
bootstrap
.
Modal
.
getOrCreateInstance
(
'#'
+
querySelector
);
let
el
=
document
.
getElementById
(
querySelector
);
//console.log('events', events);
if
(
events
.
onHide
)
{
$modal
.
on
(
'hidden.bs.modal'
,
events
.
onHide
()
);
el
.
addEventListener
(
'hidden.bs.modal'
,
events
.
onHide
);
}
if
(
events
.
onShow
)
{
$modal
.
on
(
'shown.bs.modal'
,
events
.
onShow
()
);
el
.
addEventListener
(
'shown.bs.modal'
,
events
.
onShow
);
}
modal
.
show
();
}
/**
* @function hide
...
...
@@ -24,7 +30,11 @@ export function _show(window, querySelector, events) {
* @unpure {Object} window.$
*/
export
function
_hide
(
window
,
querySelector
)
{
window
.
$
(
querySelector
).
modal
(
'hide'
);
//window.$(querySelector).modal('hide');
let
$modal
=
bootstrap
.
Modal
.
getInstance
(
'#'
+
querySelector
);
if
(
$modal
)
{
$modal
.
hide
();
}
// @XXX Bootstrap not removing some modal elements on "hide" method
// @https://stackoverflow.com/questions/50168312/bootstrap-4-close-modal-backdrop-doesnt-disappear
window
.
$
(
'body'
).
removeClass
(
'modal-open'
);
...
...
src/Gargantext/Components/Bootstrap/Floaty/BaseModal.purs
View file @
25b6b225
...
...
@@ -131,7 +131,8 @@ component = R.memo' $ R.hooksComponent componentName cpt
id = componentName <> "-" <> uuid
selector = "#" <> id
-- selector = "#" <> id
selector = id
-- | Hooks
-- |
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment