From 753a80ada5aec4bcad68b41fa8b893bb33eaaafe Mon Sep 17 00:00:00 2001 From: James Allen Date: Tue, 3 Feb 2015 13:51:56 +0000 Subject: [PATCH] Navigate away from deleted docs. Closes #141 --- services/web/public/coffee/ide/editor/EditorManager.coffee | 7 +++++++ .../web/public/coffee/ide/file-tree/FileTreeManager.coffee | 2 ++ 2 files changed, 9 insertions(+) diff --git a/services/web/public/coffee/ide/editor/EditorManager.coffee b/services/web/public/coffee/ide/editor/EditorManager.coffee index fa9ad69498..a4a3ef1a9b 100644 --- a/services/web/public/coffee/ide/editor/EditorManager.coffee +++ b/services/web/public/coffee/ide/editor/EditorManager.coffee @@ -15,6 +15,13 @@ define [ if (@$scope.ui.view != "track-changes" and entity.type == "doc") @openDoc(entity) + @$scope.$on "entity:deleted", (event, entity) => + if @$scope.editor.open_doc_id == entity.id + return if !@$scope.project.rootDoc_id + doc = @ide.fileTreeManager.findEntityById(@$scope.project.rootDoc_id) + return if !doc? + @openDoc(doc) + initialized = false @$scope.$on "file-tree:initialized", () => if !initialized diff --git a/services/web/public/coffee/ide/file-tree/FileTreeManager.coffee b/services/web/public/coffee/ide/file-tree/FileTreeManager.coffee index 75088c4078..13b0f8abf6 100644 --- a/services/web/public/coffee/ide/file-tree/FileTreeManager.coffee +++ b/services/web/public/coffee/ide/file-tree/FileTreeManager.coffee @@ -320,6 +320,8 @@ define [ entity.deleted = true @$scope.deletedDocs.push entity + @$scope.$emit "entity:deleted", entity + _moveEntityInScope: (entity, parent_folder) -> return if entity in parent_folder.children @_deleteEntityFromScope(entity, moveToDeleted: false)