Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
V
vue
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
lib
unicaen
vue
Commits
474953b2
Commit
474953b2
authored
2 years ago
by
Laurent Lecluse
Browse files
Options
Downloads
Patches
Plain Diff
toasts affichés + longtemps, améliorations cosmétiques de l'aff des toasts
parent
5d3b294a
No related branches found
No related tags found
No related merge requests found
Pipeline
#19484
passed
2 years ago
Stage: publish
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
js/Client/flashMessenger.js
+3
-3
3 additions, 3 deletions
js/Client/flashMessenger.js
js/Client/unicaenVue.js
+19
-3
19 additions, 3 deletions
js/Client/unicaenVue.js
with
22 additions
and
6 deletions
js/Client/flashMessenger.js
+
3
−
3
View file @
474953b2
...
@@ -39,8 +39,8 @@ function toast(message, severity) {
...
@@ -39,8 +39,8 @@ function toast(message, severity) {
toast
.
setAttribute
(
'
aria-live
'
,
'
assertive
'
);
toast
.
setAttribute
(
'
aria-live
'
,
'
assertive
'
);
toast
.
setAttribute
(
'
aria-atomic
'
,
'
true
'
);
toast
.
setAttribute
(
'
aria-atomic
'
,
'
true
'
);
if
(
severity
===
'
error
'
){
if
(
severity
===
'
error
'
&&
message
.
length
>
500
){
toast
.
setAttribute
(
'
style
'
,
'
width:
1
00
%
'
);
toast
.
setAttribute
(
'
style
'
,
'
width:
7
00
px
'
);
}
}
const
toastContent
=
const
toastContent
=
...
@@ -57,7 +57,7 @@ function toast(message, severity) {
...
@@ -57,7 +57,7 @@ function toast(message, severity) {
if
(
severity
!==
'
error
'
)
{
if
(
severity
!==
'
error
'
)
{
setTimeout
(()
=>
{
setTimeout
(()
=>
{
toast
.
classList
.
remove
(
'
show
'
);
toast
.
classList
.
remove
(
'
show
'
);
},
3
000
);
},
5
000
);
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
js/Client/unicaenVue.js
+
19
−
3
View file @
474953b2
...
@@ -83,11 +83,27 @@ unicaenVue.axios.interceptors.response.use(response => {
...
@@ -83,11 +83,27 @@ unicaenVue.axios.interceptors.response.use(response => {
return
response
;
return
response
;
},
(
error
)
=>
{
},
(
error
)
=>
{
var
text
=
$
(
"
<div>
"
).
html
(
error
.
response
.
data
)
;
let
message
=
error
.
response
.
data
;
text
.
find
(
'
i.fas
'
).
hide
();
if
(
error
.
response
.
status
==
403
){
message
=
'
<h4>403 - Accès interdit</h4><br />Vous n
\'
êtes pas autorisé(e) à faire cette action.
'
;
}
else
if
(
error
.
response
.
status
==
500
)
{
const
text
=
document
.
createElement
(
"
div
"
);
text
.
innerHTML
=
error
.
response
.
data
;
flashMessenger
.
toast
(
text
.
find
(
'
.alert
'
).
html
(),
'
error
'
);
// on masque l'icône /!\ qui fait doublon si on en trouve
const
fasIcons
=
text
.
querySelectorAll
(
'
i.fas
'
);
fasIcons
.
forEach
(
icon
=>
icon
.
style
.
display
=
"
none
"
);
message
=
text
.
querySelector
(
'
.alert
'
).
innerHTML
;
if
(
message
===
undefined
){
message
=
error
.
response
.
data
;
}
}
else
{
message
=
error
.
response
.
data
;
}
flashMessenger
.
toast
(
message
,
'
error
'
);
});
});
unicaenVue
.
axios
.
defaults
.
headers
.
common
[
'
X-Requested-With
'
]
=
'
XMLHttpRequest
'
;
unicaenVue
.
axios
.
defaults
.
headers
.
common
[
'
X-Requested-With
'
]
=
'
XMLHttpRequest
'
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment