haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-02 23:48:47 +00:00
Code Issues Releases Wiki Activity

Modify some naming conventions

Browse Source
This commit is contained in:
zxj96
2019-04-23 16:50:17 +08:00
parent 791713a746
commit 978288eb39
7 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
frontend/src/components/dir-view-mode/dir-column-view.js
View File

@@ -67,8 +67,8 @@ const propTypes = {
onItemsCopy: PropTypes.func.isRequired, onItemsCopy: PropTypes.func.isRequired,
onItemsDelete: PropTypes.func.isRequired, onItemsDelete: PropTypes.func.isRequired,
onFileTagChanged: PropTypes.func, onFileTagChanged: PropTypes.func,
scrollPage: PropTypes.func.isRequired, onPageScroll: PropTypes.func.isRequired,
isCurrentPage: PropTypes.bool.isRequired, itemShownLimit: PropTypes.bool.isRequired,
}; };
class DirColumnView extends React.Component { class DirColumnView extends React.Component {
@@ -226,8 +226,8 @@ class DirColumnView extends React.Component {
onItemsCopy={this.props.onItemsCopy} onItemsCopy={this.props.onItemsCopy}
onItemsDelete={this.props.onItemsDelete} onItemsDelete={this.props.onItemsDelete}
onFileTagChanged={this.props.onFileTagChanged} onFileTagChanged={this.props.onFileTagChanged}
isCurrentPage={this.props.isCurrentPage} itemShownLimit={this.props.itemShownLimit}
scrollPage={this.props.scrollPage} onPageScroll={this.props.onPageScroll}
/> />
)} )}
</div> </div>

8
frontend/src/components/dir-view-mode/dir-grid-view.js
View File

@@ -30,8 +30,8 @@ const propTypes = {
showDirentDetail: PropTypes.func.isRequired, showDirentDetail: PropTypes.func.isRequired,
onAddFolder: PropTypes.func.isRequired, onAddFolder: PropTypes.func.isRequired,
onFileTagChanged: PropTypes.func, onFileTagChanged: PropTypes.func,
scrollPage: PropTypes.func.isRequired, onPageScroll: PropTypes.func.isRequired,
isCurrentPage: PropTypes.bool.isRequired itemShownLimit: PropTypes.bool.isRequired
}; };
class DirGridView extends React.Component { class DirGridView extends React.Component {
@@ -80,8 +80,8 @@ class DirGridView extends React.Component {
isDirentDetailShow={this.props.isDirentDetailShow} isDirentDetailShow={this.props.isDirentDetailShow}
onItemRename={this.props.onItemRename} onItemRename={this.props.onItemRename}
onAddFolder={this.props.onAddFolder} onAddFolder={this.props.onAddFolder}
isCurrentPage={this.props.isCurrentPage} itemShownLimit={this.props.itemShownLimit}
scrollPage={this.props.scrollPage} onPageScroll={this.props.onPageScroll}
/> />
</Fragment> </Fragment>
); );

8
frontend/src/components/dir-view-mode/dir-list-view.js
View File

@@ -38,8 +38,8 @@ const propTypes = {
onItemsCopy: PropTypes.func.isRequired, onItemsCopy: PropTypes.func.isRequired,
onItemsDelete: PropTypes.func.isRequired, onItemsDelete: PropTypes.func.isRequired,
onFileTagChanged: PropTypes.func, onFileTagChanged: PropTypes.func,
scrollPage: PropTypes.func.isRequired, onPageScroll: PropTypes.func.isRequired,
isCurrentPage: PropTypes.bool.isRequired itemShownLimit: PropTypes.bool.isRequired
}; };
class DirListView extends React.Component { class DirListView extends React.Component {
@@ -99,8 +99,8 @@ class DirListView extends React.Component {
onAddFile={this.props.onAddFile} onAddFile={this.props.onAddFile}
onAddFolder={this.props.onAddFolder} onAddFolder={this.props.onAddFolder}
onFileTagChanged={this.props.onFileTagChanged} onFileTagChanged={this.props.onFileTagChanged}
isCurrentPage={this.props.isCurrentPage} itemShownLimit={this.props.itemShownLimit}
scrollPage={this.props.scrollPage} onPageScroll={this.props.onPageScroll}
/> />
</Fragment> </Fragment>
); );

10
frontend/src/components/dirent-grid-view/dirent-grid-view.js
View File

@@ -40,8 +40,8 @@ const propTypes = {
isDirentDetailShow: PropTypes.bool.isRequired, isDirentDetailShow: PropTypes.bool.isRequired,
onGridItemClick: PropTypes.func, onGridItemClick: PropTypes.func,
onAddFolder: PropTypes.func.isRequired, onAddFolder: PropTypes.func.isRequired,
scrollPage: PropTypes.func.isRequired, onPageScroll: PropTypes.func.isRequired,
isCurrentPage: PropTypes.bool.isRequired itemShownLimit: PropTypes.bool.isRequired
}; };
class DirentGridView extends React.Component{ class DirentGridView extends React.Component{
@@ -73,8 +73,8 @@ class DirentGridView extends React.Component{
} }
componentWillReceiveProps(nextProps) { componentWillReceiveProps(nextProps) {
if (!this.props.isCurrentPage) { if (this.props.itemShownLimit) {
this.setState({itemIdex: 100}) this.setState({itemIdex: 100});
} }
} }
@@ -101,7 +101,7 @@ class DirentGridView extends React.Component{
itemIdex += 100 itemIdex += 100
this.setState({itemIdex: itemIdex}) this.setState({itemIdex: itemIdex})
} }
this.props.scrollPage(); this.props.onPageScroll();
} }
onMoveToggle = () => { onMoveToggle = () => {

8
frontend/src/components/dirent-list-view/dirent-list-view.js
View File

@@ -45,8 +45,8 @@ const propTypes = {
onItemsCopy: PropTypes.func.isRequired, onItemsCopy: PropTypes.func.isRequired,
onItemsDelete: PropTypes.func.isRequired, onItemsDelete: PropTypes.func.isRequired,
onFileTagChanged: PropTypes.func, onFileTagChanged: PropTypes.func,
scrollPage: PropTypes.func.isRequired, onPageScroll: PropTypes.func.isRequired,
isCurrentPage: PropTypes.bool.isRequired, itemShownLimit: PropTypes.bool.isRequired,
}; };
class DirentListView extends React.Component { class DirentListView extends React.Component {
@@ -86,7 +86,7 @@ class DirentListView extends React.Component {
} }
componentWillReceiveProps(nextProps) { componentWillReceiveProps(nextProps) {
if (!this.props.isCurrentPage) { if (this.props.itemShownLimit) {
this.setState({itemIdex: 100}) this.setState({itemIdex: 100})
} }
} }
@@ -155,7 +155,7 @@ class DirentListView extends React.Component {
itemIdex += 100 itemIdex += 100
this.setState({itemIdex: itemIdex}) this.setState({itemIdex: itemIdex})
} }
this.props.scrollPage(); this.props.onPageScroll();
} }
// for image popup // for image popup

16
frontend/src/pages/lib-content-view/lib-content-container.js
View File

@@ -85,8 +85,8 @@ const propTypes = {
showDirentDetail: PropTypes.func.isRequired, showDirentDetail: PropTypes.func.isRequired,
onDeleteRepoTag: PropTypes.func.isRequired, onDeleteRepoTag: PropTypes.func.isRequired,
updateDetail: PropTypes.bool.isRequired, updateDetail: PropTypes.bool.isRequired,
scrollPage: PropTypes.func.isRequired, onPageScroll: PropTypes.func.isRequired,
isCurrentPage: PropTypes.bool.isRequired itemShownLimit: PropTypes.bool.isRequired
}; };
class LibContentContainer extends React.Component { class LibContentContainer extends React.Component {
@@ -206,8 +206,8 @@ class LibContentContainer extends React.Component {
onItemsCopy={this.props.onItemsCopy} onItemsCopy={this.props.onItemsCopy}
onItemsDelete={this.props.onItemsDelete} onItemsDelete={this.props.onItemsDelete}
onFileTagChanged={this.props.onFileTagChanged} onFileTagChanged={this.props.onFileTagChanged}
isCurrentPage={this.props.isCurrentPage} itemShownLimit={this.props.itemShownLimit}
scrollPage={this.props.scrollPage} onPageScroll={this.props.onPageScroll}
/> />
)} )}
{this.props.currentMode === 'grid' && ( {this.props.currentMode === 'grid' && (
@@ -239,8 +239,8 @@ class LibContentContainer extends React.Component {
isDirentDetailShow={this.props.isDirentDetailShow} isDirentDetailShow={this.props.isDirentDetailShow}
onItemRename={this.props.onItemRename} onItemRename={this.props.onItemRename}
onFileTagChanged={this.props.onFileTagChanged} onFileTagChanged={this.props.onFileTagChanged}
isCurrentPage={this.props.isCurrentPage} itemShownLimit={this.props.itemShownLimit}
scrollPage={this.props.scrollPage} onPageScroll={this.props.onPageScroll}
/> />
)} )}
{this.props.currentMode === 'column' && ( {this.props.currentMode === 'column' && (
@@ -301,8 +301,8 @@ class LibContentContainer extends React.Component {
onItemsCopy={this.props.onItemsCopy} onItemsCopy={this.props.onItemsCopy}
onItemsDelete={this.props.onItemsDelete} onItemsDelete={this.props.onItemsDelete}
onFileTagChanged={this.props.onFileTagChanged} onFileTagChanged={this.props.onFileTagChanged}
isCurrentPage={this.props.isCurrentPage} itemShownLimit={this.props.itemShownLimit}
scrollPage={this.props.scrollPage} onPageScroll={this.props.onPageScroll}
/> />
)} )}
</Fragment> </Fragment>

16
frontend/src/pages/lib-content-view/lib-content-view.js
View File

@@ -71,7 +71,7 @@ class LibContentView extends React.Component {
errorMsg: '', errorMsg: '',
isDirentDetailShow: false, isDirentDetailShow: false,
updateDetail: false, updateDetail: false,
isCurrentPage: true, itemShownLimit: false,
}; };
window.onpopstate = this.onpopstate; window.onpopstate = this.onpopstate;
@@ -403,7 +403,7 @@ class LibContentView extends React.Component {
if (!this.state.repoEncrypted && direntList.length) { if (!this.state.repoEncrypted && direntList.length) {
this.getThumbnails(repoID, path, this.state.direntList); this.getThumbnails(repoID, path, this.state.direntList);
} }
this.switchPage(); this.onSwitchPage();
}).catch(() => { }).catch(() => {
this.setState({ this.setState({
isDirentListLoading: false, isDirentListLoading: false,
@@ -412,12 +412,12 @@ class LibContentView extends React.Component {
}); });
} }
scrollPage = () => { onPageScroll = () => {
this.setState({isCurrentPage: true}) this.setState({itemShownLimit: false})
} }
switchPage = () => { onSwitchPage = () => {
this.setState({isCurrentPage: false}) this.setState({itemShownLimit: true})
} }
getThumbnails = (repoID, path, direntList) => { getThumbnails = (repoID, path, direntList) => {
@@ -1461,8 +1461,8 @@ class LibContentView extends React.Component {
onDeleteRepoTag={this.onDeleteRepoTag} onDeleteRepoTag={this.onDeleteRepoTag}
onToolbarFileTagChanged={this.onToolbarFileTagChanged} onToolbarFileTagChanged={this.onToolbarFileTagChanged}
updateDetail={this.state.updateDetail} updateDetail={this.state.updateDetail}
isCurrentPage={this.state.isCurrentPage} itemShownLimit={this.state.itemShownLimit}
scrollPage={this.scrollPage} onPageScroll={this.onPageScroll}
/> />
{this.state.pathExist && !this.state.isViewFile && ( {this.state.pathExist && !this.state.isViewFile && (
<FileUploader <FileUploader