Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
mastodon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
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
Pierre Boudes
mastodon
Commits
59d943e1
Unverified
Commit
59d943e1
authored
4 years ago
by
Eugen Rochko
Committed by
GitHub
4 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Fix alert when failing to save timeline markers in web UI (#15285)
Fix #15267
parent
014733d1
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
app/javascript/mastodon/actions/markers.js
+8
-5
8 additions, 5 deletions
app/javascript/mastodon/actions/markers.js
with
8 additions
and
5 deletions
app/javascript/mastodon/actions/markers.js
+
8
−
5
View file @
59d943e1
import
api
from
'
../api
'
;
import
{
debounce
}
from
'
lodash
'
;
import
compareId
from
'
../compare_id
'
;
import
{
showAlertForError
}
from
'
./alerts
'
;
export
const
MARKERS_FETCH_REQUEST
=
'
MARKERS_FETCH_REQUEST
'
;
export
const
MARKERS_FETCH_SUCCESS
=
'
MARKERS_FETCH_SUCCESS
'
;
...
...
@@ -29,15 +28,19 @@ export const synchronouslySubmitMarkers = () => (dispatch, getState) => {
},
body
:
JSON
.
stringify
(
params
),
});
return
;
}
else
if
(
navigator
&&
navigator
.
sendBeacon
)
{
// Failing that, we can use sendBeacon, but we have to encode the data as
// FormData for DoorKeeper to recognize the token.
const
formData
=
new
FormData
();
formData
.
append
(
'
bearer_token
'
,
accessToken
);
for
(
const
[
id
,
value
]
of
Object
.
entries
(
params
))
{
formData
.
append
(
`
${
id
}
[last_read_id]`
,
value
.
last_read_id
);
}
if
(
navigator
.
sendBeacon
(
'
/api/v1/markers
'
,
formData
))
{
return
;
}
...
...
@@ -85,11 +88,9 @@ const debouncedSubmitMarkers = debounce((dispatch, getState) => {
return
;
}
api
().
post
(
'
/api/v1/markers
'
,
params
).
then
(()
=>
{
api
(
getState
).
post
(
'
/api/v1/markers
'
,
params
).
then
(()
=>
{
dispatch
(
submitMarkersSuccess
(
params
));
}).
catch
(
error
=>
{
dispatch
(
showAlertForError
(
error
));
});
}).
catch
(()
=>
{});
},
300000
,
{
leading
:
true
,
trailing
:
true
});
export
function
submitMarkersSuccess
({
home
,
notifications
})
{
...
...
@@ -102,9 +103,11 @@ export function submitMarkersSuccess({ home, notifications }) {
export
function
submitMarkers
(
params
=
{})
{
const
result
=
(
dispatch
,
getState
)
=>
debouncedSubmitMarkers
(
dispatch
,
getState
);
if
(
params
.
immediate
===
true
)
{
debouncedSubmitMarkers
.
flush
();
}
return
result
;
};
...
...
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