Skip to content

Fixed Issue #659 #964

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 21, 2019
Merged

Fixed Issue #659 #964

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
99d1c07
Fixed Issue #659
Mar 21, 2019
e57b61c
Undo changes in package.json and package-lock.json
Mar 21, 2019
070c44a
Resolved error
Mar 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions client/modules/IDE/components/FileNode.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,6 @@ export class FileNode extends React.Component {
ref={(element) => { this[`fileOptions-${this.props.id}`] = element; }}
tabIndex="0"
onClick={this.toggleFileOptions}
onBlur={() => setTimeout(this.hideFileOptions, 200)}
>
<InlineSVG src={downArrowUrl} />
</button>
Expand All @@ -168,7 +167,10 @@ export class FileNode extends React.Component {
<li>
<button
aria-label="add file"
onClick={this.props.newFile}
onClick={() => {
this.props.newFile();
setTimeout(() => this.hideFileOptions(), 0);
}}
className="sidebar__file-item-option"
>
Add File
Expand All @@ -183,7 +185,10 @@ export class FileNode extends React.Component {
<li>
<button
aria-label="add folder"
onClick={this.props.newFolder}
onClick={() => {
this.props.newFolder();
setTimeout(() => this.hideFileOptions(), 0);
}}
className="sidebar__file-item-option"
>
Add Folder
Expand All @@ -198,6 +203,7 @@ export class FileNode extends React.Component {
this.originalFileName = this.props.name;
this.showEditFileName();
setTimeout(() => this.fileNameInput.focus(), 0);
setTimeout(() => this.hideFileOptions(), 0);
}}
className="sidebar__file-item-option"
>
Expand All @@ -213,6 +219,9 @@ export class FileNode extends React.Component {
setTimeout(() => this.props.deleteFile(this.props.id, this.props.parentId), 100);
}
}}
onBlur={() => {
setTimeout(this.hideFileOptions, 200);
}}
className="sidebar__file-item-option"
>
Delete
Expand Down
18 changes: 15 additions & 3 deletions client/modules/IDE/components/Sidebar.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,18 +65,30 @@ class Sidebar extends React.Component {
tabIndex="0"
ref={(element) => { this.sidebarOptions = element; }}
onClick={this.toggleProjectOptions}
onBlur={() => setTimeout(this.props.closeProjectOptions, 200)}
>
<InlineSVG src={downArrowUrl} />
</button>
<ul className="sidebar__project-options">
<li>
<button aria-label="add folder" onClick={this.props.newFolder} >
<button
aria-label="add folder"
onClick={() => {
this.props.newFolder();
setTimeout(this.props.closeProjectOptions, 0);
}}
>
Add folder
</button>
</li>
<li>
<button aria-label="add file" onClick={this.props.newFile} >
<button
aria-label="add file"
onClick={() => {
this.props.newFile();
setTimeout(this.props.closeProjectOptions, 0);
}}
onBlur={() => { setTimeout(this.props.closeProjectOptions, 200); }}
>
Add file
</button>
</li>
Expand Down
4 changes: 3 additions & 1 deletion server/controllers/project.controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,9 @@ export function getProject(req, res) {
function deleteFilesFromS3(files) {
deleteObjectsFromS3(files.filter((file) => {
if (file.url) {
if (!process.env.S3_DATE || (process.env.S3_DATE && isBefore(new Date(process.env.S3_DATE), new Date(file.createdAt)))) {
if (!process.env.S3_DATE || (
process.env.S3_DATE &&
isBefore(new Date(process.env.S3_DATE), new Date(file.createdAt)))) {
return true;
}
}
Expand Down