From 2408f0b6337f80a615321baa08ea24393528a1d6 Mon Sep 17 00:00:00 2001
From: Shane Kilkelly <shane@kilkelly.me>
Date: Mon, 11 Jun 2018 10:29:40 +0100
Subject: [PATCH] Move the isOutputFilesMode flag onto the scope
---
app/views/project/editor/new-file-modal.pug | 4 ++--
.../ide/file-tree/controllers/FileTreeController.coffee | 9 +++++----
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/app/views/project/editor/new-file-modal.pug b/app/views/project/editor/new-file-modal.pug
index 48c8863e5..021f822ea 100644
--- a/app/views/project/editor/new-file-modal.pug
+++ b/app/views/project/editor/new-file-modal.pug
@@ -95,7 +95,7 @@ script(type='text/ng-template', id='newFileModalTemplate')
value="{{ project._id }}"
) {{ project.name }}
- .form-controls.row-spaced-small(ng-if="!isOutputFilesMode")
+ .form-controls.row-spaced-small(ng-if="!state.isOutputFilesMode")
label(for="project-entity-select") Select a File
span(ng-show="state.inFlight.entities")
|
@@ -111,7 +111,7 @@ script(type='text/ng-template', id='newFileModalTemplate')
value="{{ projectEntity.path }}"
) {{ projectEntity.path.slice(1) }}
- .form-controls.row-spaced-small(ng-if="isOutputFilesMode")
+ .form-controls.row-spaced-small(ng-if="state.isOutputFilesMode")
label(for="project-entity-select") Select an Output File
span(ng-show="state.inFlight.compile")
|
diff --git a/public/coffee/ide/file-tree/controllers/FileTreeController.coffee b/public/coffee/ide/file-tree/controllers/FileTreeController.coffee
index 6d92675b4..fd7b297de 100644
--- a/public/coffee/ide/file-tree/controllers/FileTreeController.coffee
+++ b/public/coffee/ide/file-tree/controllers/FileTreeController.coffee
@@ -223,12 +223,13 @@ define [
projects: false
entities: false
compile: false
+ $scope.state.isOutputFilesMode = false
$scope.state.error = false
$scope.$watch 'data.selectedProjectId', (newVal, oldVal) ->
return if !newVal
$scope.data.selectedProjectEntity = null
- if isOutputFilesMode
+ if $scope.state.isOutputFilesMode
$scope.compileProjectAndGetOutputFiles($scope.data.selectedProjectId)
else
$scope.getProjectEntities($scope.data.selectedProjectId)
@@ -279,12 +280,12 @@ define [
data.selectedProjectId &&
(
(
- !isOutputFilesMode &&
+ !$scope.state.isOutputFilesMode &&
data.projectEntities &&
data.selectedProjectEntity
) ||
(
- isOutputFilesMode &&
+ $scope.state.isOutputFilesMode &&
data.projectOutputFiles &&
data.selectedProjectOutputFile
)
@@ -344,7 +345,7 @@ define [
$scope.$on 'create', () ->
projectId = $scope.data.selectedProjectId
name = $scope.data.name
- if isOutputFilesMode
+ if $scope.state.isOutputFilesMode
provider = 'project_output_file'
payload = {
source_project_id: projectId,
--
GitLab