From 4f11974c85188f1e5c80a42d53fc35d2b22bc94a Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Mon, 23 Feb 2015 17:33:05 +0000 Subject: [PATCH] added null check when looking for deletedByExternalDataSource --- services/web/public/coffee/ide.coffee | 2 +- .../ide/file-tree/controllers/FileTreeFolderController.coffee | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/services/web/public/coffee/ide.coffee b/services/web/public/coffee/ide.coffee index 390406e5fd..c80cf86f3b 100644 --- a/services/web/public/coffee/ide.coffee +++ b/services/web/public/coffee/ide.coffee @@ -83,7 +83,7 @@ define [ $scope.$on "project:joined", () -> return if inited inited = true - if $scope.project.deletedByExternalDataSource + if $scope?.project?.deletedByExternalDataSource ide.showGenericMessageModal("Project Renamed or Deleted", """ This project has either been renamed or deleted by an external data source such as Dropbox. We don't want to delete your data on ShareLaTeX, so this project still contains your history and collaborators. diff --git a/services/web/public/coffee/ide/file-tree/controllers/FileTreeFolderController.coffee b/services/web/public/coffee/ide/file-tree/controllers/FileTreeFolderController.coffee index f4b7b1deca..d6bbcc733c 100644 --- a/services/web/public/coffee/ide/file-tree/controllers/FileTreeFolderController.coffee +++ b/services/web/public/coffee/ide/file-tree/controllers/FileTreeFolderController.coffee @@ -17,7 +17,7 @@ define [ # We need this here as well as in FileTreeController # since the file-entity diretive creates a new scope # that doesn't inherit from previous scopes. - return '0' if entity.type == "folder" + return '0' if entity?.type == "folder" return '1' $scope.openNewDocModal = () ->