Procházet zdrojové kódy

Hide more non-essential loading bars

master
Eugen Rochko před 7 roky
rodič
revize
8d0284f8d9
2 změnil soubory, kde provedl 25 přidání a 17 odebrání
  1. +6
    -3
      app/assets/javascripts/components/actions/accounts.jsx
  2. +19
    -14
      app/assets/javascripts/components/actions/timelines.jsx

+ 6
- 3
app/assets/javascripts/components/actions/accounts.jsx Zobrazit soubor

@@ -508,21 +508,24 @@ export function fetchRelationships(account_ids) {
export function fetchRelationshipsRequest(ids) { export function fetchRelationshipsRequest(ids) {
return { return {
type: RELATIONSHIPS_FETCH_REQUEST, type: RELATIONSHIPS_FETCH_REQUEST,
ids
ids,
skipLoading: true
}; };
}; };


export function fetchRelationshipsSuccess(relationships) { export function fetchRelationshipsSuccess(relationships) {
return { return {
type: RELATIONSHIPS_FETCH_SUCCESS, type: RELATIONSHIPS_FETCH_SUCCESS,
relationships
relationships,
skipLoading: true
}; };
}; };


export function fetchRelationshipsFail(error) { export function fetchRelationshipsFail(error) {
return { return {
type: RELATIONSHIPS_FETCH_FAIL, type: RELATIONSHIPS_FETCH_FAIL,
error
error,
skipLoading: true
}; };
}; };




+ 19
- 14
app/assets/javascripts/components/actions/timelines.jsx Zobrazit soubor

@@ -14,11 +14,12 @@ export const TIMELINE_EXPAND_FAIL = 'TIMELINE_EXPAND_FAIL';


export const TIMELINE_SCROLL_TOP = 'TIMELINE_SCROLL_TOP'; export const TIMELINE_SCROLL_TOP = 'TIMELINE_SCROLL_TOP';


export function refreshTimelineSuccess(timeline, statuses) {
export function refreshTimelineSuccess(timeline, statuses, skipLoading) {
return { return {
type: TIMELINE_REFRESH_SUCCESS, 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 { return {
type: TIMELINE_REFRESH_REQUEST, type: TIMELINE_REFRESH_REQUEST,
timeline, timeline,
id
id,
skipLoading
}; };
}; };


export function refreshTimeline(timeline, id = null) { export function refreshTimeline(timeline, id = null) {
return function (dispatch, getState) { return function (dispatch, getState) {
dispatch(refreshTimelineRequest(timeline, id));

const ids = getState().getIn(['timelines', timeline, 'items'], Immutable.List()); const ids = getState().getIn(['timelines', timeline, 'items'], Immutable.List());
const newestId = ids.size > 0 ? ids.first() : null; 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'])) { if (newestId !== null && getState().getIn(['timelines', timeline, 'loaded'])) {
params = `?since_id=${newestId}`;
params = `?since_id=${newestId}`;
skipLoading = true;
} }


if (id) { if (id) {
path = `${path}/${id}` path = `${path}/${id}`
} }


dispatch(refreshTimelineRequest(timeline, id, skipLoading));

api(getState).get(`/api/v1/timelines/${path}${params}`).then(function (response) { 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) { }).catch(function (error) {
dispatch(refreshTimelineFail(timeline, error));
dispatch(refreshTimelineFail(timeline, error, skipLoading));
}); });
}; };
}; };


export function refreshTimelineFail(timeline, error) {
export function refreshTimelineFail(timeline, error, skipLoading) {
return { return {
type: TIMELINE_REFRESH_FAIL, type: TIMELINE_REFRESH_FAIL,
timeline, timeline,
error
error,
skipLoading
}; };
}; };




Načítá se…
Zrušit
Uložit