Merge pull request #3495 from overleaf/ae-prettier-2
Upgrade Prettier to v2 GitOrigin-RevId: 85aa3fa1acb6332c4f58c46165a43d1a51471f33
This commit is contained in:
Alf Eaton
@@ -14,152 +14,148 @@
|
||||
*/
|
||||
import App from '../../../base'
|
||||
import iconTypeFromName from '../util/iconTypeFromName'
|
||||
App.controller('FileTreeEntityController', function(
|
||||
$scope,
|
||||
ide,
|
||||
$modal,
|
||||
$element
|
||||
) {
|
||||
$scope.MAX_DEPTH = 8
|
||||
App.controller(
|
||||
'FileTreeEntityController',
|
||||
function ($scope, ide, $modal, $element) {
|
||||
$scope.MAX_DEPTH = 8
|
||||
|
||||
$scope.select = function(e) {
|
||||
if (e.ctrlKey || e.metaKey) {
|
||||
e.stopPropagation()
|
||||
const initialMultiSelectCount = ide.fileTreeManager.multiSelectedCount()
|
||||
ide.fileTreeManager.toggleMultiSelectEntity($scope.entity) === 0
|
||||
if (initialMultiSelectCount === 0) {
|
||||
// On first multi selection, also include the current active/open file.
|
||||
return ide.fileTreeManager.multiSelectSelectedEntity()
|
||||
}
|
||||
} else {
|
||||
ide.fileTreeManager.selectEntity($scope.entity)
|
||||
return $scope.$emit('entity:selected', $scope.entity)
|
||||
}
|
||||
}
|
||||
|
||||
if ($scope.entity.type === 'doc') {
|
||||
$scope.$watch('entity.selected', function(isSelected) {
|
||||
if (isSelected) {
|
||||
$scope.$emit('entity-file:selected', $scope.entity)
|
||||
if (!_isEntryElVisible($element)) {
|
||||
$scope.$applyAsync(function() {
|
||||
$element[0].scrollIntoView()
|
||||
})
|
||||
$scope.select = function (e) {
|
||||
if (e.ctrlKey || e.metaKey) {
|
||||
e.stopPropagation()
|
||||
const initialMultiSelectCount = ide.fileTreeManager.multiSelectedCount()
|
||||
ide.fileTreeManager.toggleMultiSelectEntity($scope.entity) === 0
|
||||
if (initialMultiSelectCount === 0) {
|
||||
// On first multi selection, also include the current active/open file.
|
||||
return ide.fileTreeManager.multiSelectSelectedEntity()
|
||||
}
|
||||
} else {
|
||||
ide.fileTreeManager.selectEntity($scope.entity)
|
||||
return $scope.$emit('entity:selected', $scope.entity)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
function _isEntryElVisible($entryEl) {
|
||||
const viewportEl = $('.file-tree-list')
|
||||
const entryElTop = $entryEl.offset().top
|
||||
const entryElBottom = entryElTop + $entryEl.outerHeight()
|
||||
const entryListViewportElTop = viewportEl.offset().top
|
||||
const entryListViewportElBottom =
|
||||
entryListViewportElTop + viewportEl.height()
|
||||
if ($scope.entity.type === 'doc') {
|
||||
$scope.$watch('entity.selected', function (isSelected) {
|
||||
if (isSelected) {
|
||||
$scope.$emit('entity-file:selected', $scope.entity)
|
||||
if (!_isEntryElVisible($element)) {
|
||||
$scope.$applyAsync(function () {
|
||||
$element[0].scrollIntoView()
|
||||
})
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
return (
|
||||
entryElTop >= entryListViewportElTop &&
|
||||
entryElBottom <= entryListViewportElBottom
|
||||
)
|
||||
}
|
||||
function _isEntryElVisible($entryEl) {
|
||||
const viewportEl = $('.file-tree-list')
|
||||
const entryElTop = $entryEl.offset().top
|
||||
const entryElBottom = entryElTop + $entryEl.outerHeight()
|
||||
const entryListViewportElTop = viewportEl.offset().top
|
||||
const entryListViewportElBottom =
|
||||
entryListViewportElTop + viewportEl.height()
|
||||
|
||||
$scope.draggableHelper = function() {
|
||||
if (ide.fileTreeManager.multiSelectedCount() > 0) {
|
||||
return $(
|
||||
`<strong style='z-index:100'>${ide.fileTreeManager.multiSelectedCount()} Files</strong>`
|
||||
return (
|
||||
entryElTop >= entryListViewportElTop &&
|
||||
entryElBottom <= entryListViewportElBottom
|
||||
)
|
||||
} else {
|
||||
return $(`<strong style='z-index:100'>${$scope.entity.name}</strong>`)
|
||||
}
|
||||
}
|
||||
|
||||
$scope.inputs = { name: $scope.entity.name }
|
||||
|
||||
$scope.startRenaming = () => ($scope.entity.renaming = true)
|
||||
|
||||
let invalidModalShowing = false
|
||||
$scope.finishRenaming = function() {
|
||||
// avoid double events when blur and on-enter fire together
|
||||
if (!$scope.entity.renaming) {
|
||||
return
|
||||
}
|
||||
|
||||
const { name } = $scope.inputs
|
||||
$scope.draggableHelper = function () {
|
||||
if (ide.fileTreeManager.multiSelectedCount() > 0) {
|
||||
return $(
|
||||
`<strong style='z-index:100'>${ide.fileTreeManager.multiSelectedCount()} Files</strong>`
|
||||
)
|
||||
} else {
|
||||
return $(`<strong style='z-index:100'>${$scope.entity.name}</strong>`)
|
||||
}
|
||||
}
|
||||
|
||||
// validator will set name to undefined for invalid filenames
|
||||
if (name == null) {
|
||||
// Showing the modal blurs the rename box which calls us again
|
||||
// so track this with the invalidModalShowing flag
|
||||
if (invalidModalShowing) {
|
||||
$scope.inputs = { name: $scope.entity.name }
|
||||
|
||||
$scope.startRenaming = () => ($scope.entity.renaming = true)
|
||||
|
||||
let invalidModalShowing = false
|
||||
$scope.finishRenaming = function () {
|
||||
// avoid double events when blur and on-enter fire together
|
||||
if (!$scope.entity.renaming) {
|
||||
return
|
||||
}
|
||||
invalidModalShowing = true
|
||||
const modal = $modal.open({
|
||||
templateUrl: 'invalidFileNameModalTemplate'
|
||||
})
|
||||
modal.result.then(() => (invalidModalShowing = false))
|
||||
return
|
||||
}
|
||||
|
||||
delete $scope.entity.renaming
|
||||
if (name == null || name.length === 0) {
|
||||
$scope.inputs.name = $scope.entity.name
|
||||
return
|
||||
}
|
||||
return ide.fileTreeManager.renameEntity($scope.entity, name)
|
||||
}
|
||||
const { name } = $scope.inputs
|
||||
|
||||
$scope.$on('rename:selected', function() {
|
||||
if ($scope.entity.selected) {
|
||||
return $scope.startRenaming()
|
||||
}
|
||||
})
|
||||
|
||||
$scope.openDeleteModal = function() {
|
||||
let entities
|
||||
if (ide.fileTreeManager.multiSelectedCount() > 0) {
|
||||
entities = ide.fileTreeManager.getMultiSelectedEntityChildNodes()
|
||||
} else {
|
||||
entities = [$scope.entity]
|
||||
}
|
||||
return $modal.open({
|
||||
templateUrl: 'deleteEntityModalTemplate',
|
||||
controller: 'DeleteEntityModalController',
|
||||
resolve: {
|
||||
entities() {
|
||||
return entities
|
||||
// validator will set name to undefined for invalid filenames
|
||||
if (name == null) {
|
||||
// Showing the modal blurs the rename box which calls us again
|
||||
// so track this with the invalidModalShowing flag
|
||||
if (invalidModalShowing) {
|
||||
return
|
||||
}
|
||||
invalidModalShowing = true
|
||||
const modal = $modal.open({
|
||||
templateUrl: 'invalidFileNameModalTemplate'
|
||||
})
|
||||
modal.result.then(() => (invalidModalShowing = false))
|
||||
return
|
||||
}
|
||||
|
||||
delete $scope.entity.renaming
|
||||
if (name == null || name.length === 0) {
|
||||
$scope.inputs.name = $scope.entity.name
|
||||
return
|
||||
}
|
||||
return ide.fileTreeManager.renameEntity($scope.entity, name)
|
||||
}
|
||||
|
||||
$scope.$on('rename:selected', function () {
|
||||
if ($scope.entity.selected) {
|
||||
return $scope.startRenaming()
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
$scope.$on('delete:selected', function() {
|
||||
if ($scope.entity.selected) {
|
||||
return $scope.openDeleteModal()
|
||||
$scope.openDeleteModal = function () {
|
||||
let entities
|
||||
if (ide.fileTreeManager.multiSelectedCount() > 0) {
|
||||
entities = ide.fileTreeManager.getMultiSelectedEntityChildNodes()
|
||||
} else {
|
||||
entities = [$scope.entity]
|
||||
}
|
||||
return $modal.open({
|
||||
templateUrl: 'deleteEntityModalTemplate',
|
||||
controller: 'DeleteEntityModalController',
|
||||
resolve: {
|
||||
entities() {
|
||||
return entities
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
})
|
||||
|
||||
return ($scope.iconTypeFromName = iconTypeFromName)
|
||||
})
|
||||
$scope.$on('delete:selected', function () {
|
||||
if ($scope.entity.selected) {
|
||||
return $scope.openDeleteModal()
|
||||
}
|
||||
})
|
||||
|
||||
export default App.controller('DeleteEntityModalController', function(
|
||||
$scope,
|
||||
ide,
|
||||
$modalInstance,
|
||||
entities
|
||||
) {
|
||||
$scope.state = { inflight: false }
|
||||
|
||||
$scope.entities = entities
|
||||
|
||||
$scope.delete = function() {
|
||||
$scope.state.inflight = true
|
||||
for (let entity of Array.from($scope.entities)) {
|
||||
ide.fileTreeManager.deleteEntity(entity)
|
||||
}
|
||||
return $modalInstance.close()
|
||||
return ($scope.iconTypeFromName = iconTypeFromName)
|
||||
}
|
||||
)
|
||||
|
||||
return ($scope.cancel = () => $modalInstance.dismiss('cancel'))
|
||||
})
|
||||
export default App.controller(
|
||||
'DeleteEntityModalController',
|
||||
function ($scope, ide, $modalInstance, entities) {
|
||||
$scope.state = { inflight: false }
|
||||
|
||||
$scope.entities = entities
|
||||
|
||||
$scope.delete = function () {
|
||||
$scope.state.inflight = true
|
||||
for (let entity of Array.from($scope.entities)) {
|
||||
ide.fileTreeManager.deleteEntity(entity)
|
||||
}
|
||||
return $modalInstance.close()
|
||||
}
|
||||
|
||||
return ($scope.cancel = () => $modalInstance.dismiss('cancel'))
|
||||
}
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user