{events.error_msg}
: ''} + {has_more ? : ''} + {error_msg ?{error_msg}
: ''} ); } @@ -167,7 +167,10 @@ class FilesActivities extends Component { this.state = { loading: true, error_msg: '', - events: {} + events: {}, + items: [], + page: 1, + has_more: false }; this.handleScroll = this.handleScroll.bind(this); @@ -175,7 +178,7 @@ class FilesActivities extends Component { componentDidMount() { const pageNum = 1 - this.props.seafileAPI.listActivities(pageNum) + seafileAPI.listActivities(pageNum) .then(res => { // not logged in if (res.status == 403) { @@ -187,41 +190,42 @@ class FilesActivities extends Component { // {"events":[...]} this.setState({ loading: false, - events: { - page: 1, - items: res.data.events, - has_more: res.data.events.length == per_page ? true : false - } + items: res.data.events, + has_more: res.data.events.length == '0' ? false : true }); } }); } getMore() { - const pageNum = this.state.events.page + 1; - this.props.seafileAPI.getActivities(pageNum) - .then(res => { - this.setState(function(prevState, props) { - let events = prevState.events; - if (res.status == 403) { // log out - events.error_msg = gettext("Permission denied"); - events.has_more = false; + const pageNum = this.state.page + 1; + this.setState({ + page: pageNum + }) + seafileAPI.listActivities(pageNum) + .then(res => { + if (res.status == 403) { + this.setState({ + loading: false, + error_msg: gettext("Permission denied") + }); + } else { + // {"events":[...]} + this.setState({ + loading: false, + items: [...this.state.items, ...res.data.events], + has_more: res.data.events.length == '0' ? false : true + }); } - if (res.ok) { - events.page += 1; - events.items = events.items.concat(res.data.events); - events.has_more = res.data.events.length == per_page ? true : false; - } - return {events: events}; }); - }); } - handleScroll(e) { - let $el = e.target; - if (this.state.events.has_more && - $el.scrollTop > 0 && - $el.clientHeight + $el.scrollTop == $el.scrollHeight) { // scroll to the bottom + handleScroll(event) { + const clientHeight = event.target.clientHeight; + const scrollHeight = event.target.scrollHeight; + const scrollTop = event.target.scrollTop; + const isBottom = (clientHeight + scrollTop + 1 >= scrollHeight); + if (this.state.has_more && isBottom) { // scroll to the bottom this.getMore(); } } diff --git a/frontend/src/components/history-list-view/history-list-item.js b/frontend/src/components/history-list-view/history-list-item.js index cc2bafb796..78c54f1273 100644 --- a/frontend/src/components/history-list-view/history-list-item.js +++ b/frontend/src/components/history-list-view/history-list-item.js @@ -49,7 +49,8 @@ class HistoryListItem extends React.Component { render() { let item = this.props.item; - let time = moment(item.ctime).format('MMMDo Ah:mm'); + let offset = moment.parseZone(item.ctime).utcOffset(); + let time = moment(item.ctime).add(offset,'m').format('MMMDo Ah:mm'); let isHigtlightItem = false; if (this.props.item && this.props.currentItem) { isHigtlightItem = this.props.item.commit_id === this.props.currentItem.commit_id; diff --git a/frontend/src/components/history-list-view/history-list-menu.js b/frontend/src/components/history-list-view/history-list-menu.js index 02bebc11d7..bf80a983b3 100644 --- a/frontend/src/components/history-list-view/history-list-menu.js +++ b/frontend/src/components/history-list-view/history-list-menu.js @@ -1,6 +1,6 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { gettext, filePath } from '../constance'; +import { gettext, filePath } from '../constants'; import URLDecorator from '../../utils/url-decorator'; const propTypes = { diff --git a/frontend/src/components/list-view/list-item.js b/frontend/src/components/list-view/list-item.js index 1b856d7598..40f22fd2c3 100644 --- a/frontend/src/components/list-view/list-item.js +++ b/frontend/src/components/list-view/list-item.js @@ -1,6 +1,6 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { siteRoot, lang } from '../constance'; +import { siteRoot, lang } from '../constants'; import NodeMenuControl from '../menu-component/node-menu-control'; import moment from 'moment'; diff --git a/frontend/src/components/list-view/list-menu.js b/frontend/src/components/list-view/list-menu.js index 093d0b85ac..1246f80468 100644 --- a/frontend/src/components/list-view/list-menu.js +++ b/frontend/src/components/list-view/list-menu.js @@ -1,6 +1,6 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { gettext } from '../constance'; +import { gettext } from '../constants'; const propTypes = { isMenuShow: PropTypes.bool.isRequired, diff --git a/frontend/src/components/list-view/list-view.js b/frontend/src/components/list-view/list-view.js index a4e177916a..24a242ed0f 100644 --- a/frontend/src/components/list-view/list-view.js +++ b/frontend/src/components/list-view/list-view.js @@ -1,6 +1,6 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { gettext } from '../constance'; +import { gettext } from '../constants'; import ListItem from './list-item'; const propTypes = { diff --git a/frontend/src/components/main-side-nav.js b/frontend/src/components/main-side-nav.js index 3a8844e4a7..06b4d36ac9 100644 --- a/frontend/src/components/main-side-nav.js +++ b/frontend/src/components/main-side-nav.js @@ -1,6 +1,6 @@ import React from 'react'; -const siteRoot = window.app.config.siteRoot; -const serverRoot = window.app.config.serverRoot; +import { siteRoot } from './constants'; +import { seafileAPI } from '../utils/seafile-api'; class MainSideNav extends React.Component { constructor(props) { @@ -32,7 +32,7 @@ class MainSideNav extends React.Component { loadGroups = () => { let _this = this; - this.props.seafileAPI.listGroups().then(res =>{ + seafileAPI.listGroups().then(res =>{ let data = res.data.groups; this.groupsHeight = (data.length + 1) * _this.listHeight; _this.setState({ @@ -94,9 +94,9 @@ class MainSideNav extends React.Component {