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
8d0284f8
Commit
8d0284f8
authored
8 years ago
by
Eugen Rochko
Browse files
Options
Downloads
Patches
Plain Diff
Hide more non-essential loading bars
parent
98560b23
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
app/assets/javascripts/components/actions/accounts.jsx
+6
-3
6 additions, 3 deletions
app/assets/javascripts/components/actions/accounts.jsx
app/assets/javascripts/components/actions/timelines.jsx
+19
-14
19 additions, 14 deletions
app/assets/javascripts/components/actions/timelines.jsx
with
25 additions
and
17 deletions
app/assets/javascripts/components/actions/accounts.jsx
+
6
−
3
View file @
8d0284f8
...
...
@@ -508,21 +508,24 @@ export function fetchRelationships(account_ids) {
export
function
fetchRelationshipsRequest
(
ids
)
{
return
{
type
:
RELATIONSHIPS_FETCH_REQUEST
,
ids
ids
,
skipLoading
:
true
};
};
export
function
fetchRelationshipsSuccess
(
relationships
)
{
return
{
type
:
RELATIONSHIPS_FETCH_SUCCESS
,
relationships
relationships
,
skipLoading
:
true
};
};
export
function
fetchRelationshipsFail
(
error
)
{
return
{
type
:
RELATIONSHIPS_FETCH_FAIL
,
error
error
,
skipLoading
:
true
};
};
...
...
This diff is collapsed.
Click to expand it.
app/assets/javascripts/components/actions/timelines.jsx
+
19
−
14
View file @
8d0284f8
...
...
@@ -14,11 +14,12 @@ export const TIMELINE_EXPAND_FAIL = 'TIMELINE_EXPAND_FAIL';
export
const
TIMELINE_SCROLL_TOP
=
'
TIMELINE_SCROLL_TOP
'
;
export
function
refreshTimelineSuccess
(
timeline
,
statuses
)
{
export
function
refreshTimelineSuccess
(
timeline
,
statuses
,
skipLoading
)
{
return
{
type
:
TIMELINE_REFRESH_SUCCESS
,
timeline
:
timeline
,
statuses
:
statuses
timeline
,
statuses
,
skipLoading
};
};
...
...
@@ -51,45 +52,49 @@ export function deleteFromTimelines(id) {
};
};
export
function
refreshTimelineRequest
(
timeline
,
id
)
{
export
function
refreshTimelineRequest
(
timeline
,
id
,
skipLoading
)
{
return
{
type
:
TIMELINE_REFRESH_REQUEST
,
timeline
,
id
id
,
skipLoading
};
};
export
function
refreshTimeline
(
timeline
,
id
=
null
)
{
return
function
(
dispatch
,
getState
)
{
dispatch
(
refreshTimelineRequest
(
timeline
,
id
));
const
ids
=
getState
().
getIn
([
'
timelines
'
,
timeline
,
'
items
'
],
Immutable
.
List
());
const
newestId
=
ids
.
size
>
0
?
ids
.
first
()
:
null
;
let
params
=
''
;
let
path
=
timeline
;
let
params
=
''
;
let
path
=
timeline
;
let
skipLoading
=
false
;
if
(
newestId
!==
null
&&
getState
().
getIn
([
'
timelines
'
,
timeline
,
'
loaded
'
]))
{
params
=
`?since_id=
${
newestId
}
`
;
params
=
`?since_id=
${
newestId
}
`
;
skipLoading
=
true
;
}
if
(
id
)
{
path
=
`
${
path
}
/
${
id
}
`
}
dispatch
(
refreshTimelineRequest
(
timeline
,
id
,
skipLoading
));
api
(
getState
).
get
(
`/api/v1/timelines/
${
path
}${
params
}
`
).
then
(
function
(
response
)
{
dispatch
(
refreshTimelineSuccess
(
timeline
,
response
.
data
));
dispatch
(
refreshTimelineSuccess
(
timeline
,
response
.
data
,
skipLoading
));
}).
catch
(
function
(
error
)
{
dispatch
(
refreshTimelineFail
(
timeline
,
error
));
dispatch
(
refreshTimelineFail
(
timeline
,
error
,
skipLoading
));
});
};
};
export
function
refreshTimelineFail
(
timeline
,
error
)
{
export
function
refreshTimelineFail
(
timeline
,
error
,
skipLoading
)
{
return
{
type
:
TIMELINE_REFRESH_FAIL
,
timeline
,
error
error
,
skipLoading
};
};
...
...
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