From 37babfc9dbe52b538edbde8f624e374e0b4d0f16 Mon Sep 17 00:00:00 2001
From: Bruno Bottazzini <bruno.bottazzini@intel.com>
Date: Fri, 15 Apr 2016 13:42:17 -0300
Subject: [PATCH] fix: change variables name when creating a file

newFile was a conflict var name

Signed-off-by: Bruno Bottazzini <bruno.bottazzini@intel.com>
---
 client/js/controllers/editor.js | 4 ++--
 server/views/index.html         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/js/controllers/editor.js b/client/js/controllers/editor.js
index c6a09a1..731bc70 100644
--- a/client/js/controllers/editor.js
+++ b/client/js/controllers/editor.js
@@ -668,7 +668,7 @@
                     dialog.dialog("open");
                 };
 
-                $scope.newFile = function () {
+                $scope.createFile = function () {
                     var file = filePath;
                     if (file) {
                         if (isLeaf) {
@@ -819,7 +819,7 @@
                             $scope.newFolder();
                             break;
                         case "file.new":
-                            $scope.newFile();
+                            $scope.createFile();
                             break;
                         case "file.save":
                             $scope.saveFileManually();
diff --git a/server/views/index.html b/server/views/index.html
index c19afb2..b9e993a 100644
--- a/server/views/index.html
+++ b/server/views/index.html
@@ -280,7 +280,7 @@
                         <ul class="dropdown-menu" role="menu">
                             <li><a class="pointer" role="menuitem" tabindex="1" ng-click="createProject()">New project</a></li>
                             <li><a class="pointer" role="menuitem" tabindex="1" ng-click="newFolder()">Create folder</a></li>
-                            <li><a class="pointer" role="menuitem" tabindex="2"  ng-click="newFile()">Create file</a></li>
+                            <li><a class="pointer" role="menuitem" tabindex="2"  ng-click="createFile()">Create file</a></li>
                             <li><a class="pointer" role="menuitem" tabindex="3" ng-click="remove()">Remove</a></li>
                         </ul>
                     </div>