fix: change variables name when creating a file

newFile was a conflict var name Signed-off-by: Bruno Bottazzini <[email protected]>
solettaproject · Apr 15, 2016 · 37babfc · 37babfc
1 parent 793ea64
commit 37babfc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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>