Skip to content
This repository has been archived by the owner on Aug 6, 2021. It is now read-only.

Commit

Permalink
Remove Angular file tree modal code (#4198)
Browse files Browse the repository at this point in the history
GitOrigin-RevId: feeae54575cce8b315b4e6bb0df3e17405025855
  • Loading branch information
aeaton-overleaf authored and Copybot committed Jun 16, 2021
1 parent d1d4582 commit bf9b629
Show file tree
Hide file tree
Showing 9 changed files with 11 additions and 1,055 deletions.
86 changes: 1 addition & 85 deletions app/views/project/editor/file-tree-history.pug
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,9 @@ aside.editor-sidebar.full-size(
.file-tree
.file-tree-inner(
ng-if="rootFolder",
ng-controller="FileTreeRootFolderController",
ng-class="no-toolbar"
)
ul.list-unstyled.file-tree-list(
accept=".entity-name"
on-drop-callback="onDrop"
)
ul.list-unstyled.file-tree-list

file-entity(
entity="entity",
Expand Down Expand Up @@ -46,7 +42,6 @@ script(type='text/ng-template', id='entityListItemTemplate')
.entity(ng-if="entity.type != 'folder'")
.entity-name(
ng-click="select($event)"
draggable-helper="draggableHelper"
context-menu
data-target="context-menu-{{ entity.id }}"
context-menu-container="body"
Expand All @@ -66,9 +61,6 @@ script(type='text/ng-template', id='entityListItemTemplate')
.entity(ng-if="entity.type == 'folder'", ng-controller="FileTreeFolderController")
.entity-name(
ng-click="select($event)"
draggable-helper="draggableHelper"
accept=".entity-name"
on-drop-callback="onDrop"
)
div(
context-menu
Expand Down Expand Up @@ -98,8 +90,6 @@ script(type='text/ng-template', id='entityListItemTemplate')
ul.list-unstyled(
ng-if="entity.type == 'folder' && (depth == null || depth < MAX_DEPTH)"
ng-show="expanded"
accept=".entity-name"
on-drop-callback="onDrop"
)
file-entity(
entity="child",
Expand All @@ -122,77 +112,3 @@ script(type='text/ng-template', id='entityListItemTemplate')
)
span.sr-only
| Your project has hit Overleaf's maximum file depth limit. Files within this folder won't be visible.

script(type='text/ng-template', id='newFolderModalTemplate')
.modal-header
h3 #{translate("new_folder")}
.modal-body
form(novalidate, name="newFolderForm")
input.form-control(
type="text",
placeholder="Folder Name",
required,
ng-model="inputs.name",
on-enter="create()",
select-name-on="open",
valid-file,
name="name"
)
div.alert.alert-danger.row-spaced-small(ng-show="newFolderForm.name.$error.validFile")
| #{translate('files_cannot_include_invalid_characters')}
div.alert.alert-danger.row-spaced-small(ng-if="error")
div(ng-switch="error")
span(ng-switch-when="already exists") #{translate("file_already_exists")}
span(ng-switch-default) {{error}}
.modal-footer
button.btn.btn-default(
ng-disabled="state.inflight"
ng-click="cancel()"
) #{translate("cancel")}
button.btn.btn-primary(
ng-disabled="newFolderForm.$invalid || state.inflight"
ng-click="create()"
)
span(ng-hide="state.inflight") #{translate("create")}
span(ng-show="state.inflight") #{translate("creating")}

script(type='text/ng-template', id='duplicateFileModalTemplate')
.modal-header
h3 #{translate("duplicate_file")}
.modal-body
p #{translate("file_already_exists_in_this_location", { fileName: "'{{ fileName }}'" })}
.modal-footer
button.btn.btn-default(
ng-click="cancel()"
) #{translate("dismiss")}

include ./new-file-modal

script(type='text/ng-template', id='deleteEntityModalTemplate')
.modal-header
h3 #{translate("delete")} {{ entity.name }}
.modal-body
p !{translate("sure_you_want_to_delete")}
ul
li(ng-repeat="entity in entities") {{entity.name}}
.modal-footer
button.btn.btn-default(
ng-disabled="state.inflight"
ng-click="cancel()"
) #{translate("cancel")}
button.btn.btn-danger(
ng-disabled="state.inflight"
ng-click="delete()"
)
span(ng-hide="state.inflight") #{translate("delete")}
span(ng-show="state.inflight") #{translate("deleting")}

script(type='text/ng-template', id='invalidFileNameModalTemplate')
.modal-header
h3 #{translate('invalid_file_name')}
.modal-body
p #{translate('files_cannot_include_invalid_characters')}
.modal-footer
button.btn.btn-default(
ng-click="$close()"
) #{translate('ok')}
3 changes: 0 additions & 3 deletions app/views/project/editor/file-tree-react.pug
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,6 @@ aside.editor-sidebar.full-size(
set-started-free-trial="setStartedFreeTrial"
)

div(ng-controller="FileTreeController")
include ./new-file-modal

.outline-container(
vertical-resizable-bottom
ng-controller="OutlineController"
Expand Down
21 changes: 0 additions & 21 deletions frontend/js/ide/file-tree/FileTreeManager.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,9 @@
* Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
*/
import './directives/fileEntity'
import './directives/draggable'
import './directives/droppable'
import './controllers/FileTreeController'
import './controllers/FileTreeEntityController'
import './controllers/FileTreeFolderController'
import './controllers/FileTreeRootFolderController'
import '../../features/file-tree/controllers/file-tree-controller'
let FileTreeManager

Expand Down Expand Up @@ -482,24 +479,6 @@ export default FileTreeManager = class FileTreeManager {
})
}

getEntityPath(entity) {
return this._getEntityPathInFolder(this.$scope.rootFolder, entity)
}

_getEntityPathInFolder(folder, entity) {
for (const child of Array.from(folder.children || [])) {
if (child === entity) {
return entity.name
} else if (child.type === 'folder') {
const path = this._getEntityPathInFolder(child, entity)
if (path != null) {
return child.name + '/' + path
}
}
}
return null
}

getCurrentFolder() {
// Return the root folder if nothing is selected
return (
Expand Down
Loading

0 comments on commit bf9b629

Please sign in to comment.