Working on editor

Author: andrewbrg

src/css/main.css

@@ -138,14 +138,14 @@ aside.ui-resizable.ui-resizing {
 }
 
 .ace_gutter-cell {
-    font-size: 1.1rem !important;
+    font-size: 0.9rem !important;
 }
 
 .ace_tooltip.ace_doc-tooltip,
 .ace_editor.ace_autocomplete {
     background-color: rgb(52, 58, 64) !important;
     color: rgb(154, 157, 160) !important;
-    font-size: 1.1rem !important;
+    font-size: 1rem !important;
     -webkit-box-shadow: 3px 3px 20px rgba(0, 0, 0, 0.2) !important;
     -moz-box-shadow: 3px 3px 20px rgba(0, 0, 0, 0.2) !important;
     box-shadow: 3px 3px 20px rgba(0, 0, 0, 0.2) !important;

src/html/modals/file/confirm.close.tab.html

@@ -2,7 +2,7 @@
     <p class="text-center">This file has been modified, do you want to save your changes?</p>
     <div class="row">
         <div class="col-4">
-            <button class="action-save-tab btn btn-primary btn-sm btn-expanded" type="button">
+            <button class="action-save-tab btn btn-primary btn-sm btn-expanded" type="button" aria-label="Save">
                 <i class="fa fa-fw fa-check"></i>&nbsp;Save
             </button>
         </div>
@@ -13,7 +13,7 @@
             </button>
         </div>
         <div class="col-4">
-            <button class="action-close-tab btn btn-outline-danger btn-sm btn-expanded" type="button">
+            <button class="action-close-tab btn btn-outline-danger btn-sm btn-expanded" type="button" aria-label="Discard">
                 <i class="fa fa-fw fa-trash-o"></i>&nbsp;Discard
             </button>
         </div>

src/html/modals/file/rename.file.html

@@ -1,25 +1,17 @@
 <div class="container-fluid">
-    <div class="row">
-        <div class="col-12">
-            <div class="form-group">
-                <label for="oldFileName">Old filename</label>
-                <input id="oldFileName"
-                       name="file-old-filename"
-                       type="text"/>
-            </div>
-        </div>
-    </div>
     <div class="row">
         <div class="col-12">
             <div class="form-group">
                 <label for="newFileName">New filename</label>
                 <input id="newFileName"
                        name="file-new-filename"
-                       type="text"/>
+                       type="text"
+                       required/>
             </div>
         </div>
     </div>
     <div class="row">
+        <input name="file-old-filename" type="hidden"/>
         <input name="file-data-idx" type="hidden"/>
         <input name="file-data-nodeid" type="hidden"/>
         <div class="col-6">
@@ -28,7 +20,7 @@
             </button>
         </div>
         <div class="col-6">
-            <button class="action-rename-file btn btn-outline-success btn-sm btn-expanded" type="button">
+            <button class="action-rename-file btn btn-outline-success btn-sm btn-expanded" type="button" aria-label="Save">
                 <i class="fa fa-fw fa-check"></i>&nbsp;Save
             </button>
         </div>

src/js/app.js

@@ -140,6 +140,7 @@ if (typeof $ !== typeof undefined) {
                     $(document).find('input[name="file-data-idx"]').val($relTgt.attr('data-idx'));
                     $(document).find('input[name="file-data-nodeid"]').val($relTgt.attr('data-nodeid'));
                     $(document).find('input[name="file-old-filename"]').val($relTgt.attr('data-old-filename'));
+                    $(document).find('input[name="file-new-filename"]').val($relTgt.attr('data-old-filename'));
                 };
             }
 
@@ -208,6 +209,18 @@ if (typeof $ !== typeof undefined) {
             Editors.onOpenFile();
         });
 
+        // Rename file
+        $(document).on('click', '.action-rename-file', function () {
+            $.event.trigger({
+                type: "_file.rename",
+                time: new Date(),
+                idx: $(document).find('input[name="file-data-idx"]').first().val(),
+                nodeId: $(document).find('input[name="file-data-nodeid"]').first().val(),
+                oldFileName: $(document).find('input[name="file-old-filename"]').first().val(),
+                newFileName: $(document).find('input[name="file-new-filename"]').first().val()
+            });
+        });
+
         // Open project
         $(document).on('click', '.action-project-open', function () {
             Sidebar.onOpenProject();
@@ -220,7 +233,6 @@ if (typeof $ !== typeof undefined) {
 
         // Rename file
         $(document).on('_file.rename', function (e) {
-
             Files.fileRename(Editors.getEditorFileEntry(e.idx), e.oldFileName, e.newFileName).then(function (fileEntry) {
                 if (typeof fileEntry !== typeof undefined) {
                     Editors.onRenameFile(e.idx, fileEntry);

src/js/handlers/editors.js

@@ -999,6 +999,8 @@ var EditorsHandler = function () {
         this.setEditorTemplate(idx);
         this._setAceEditorMode(idx);
         this.setEditorFileEntry(idx, fileEntry);
+        this._setTabNavName(idx, fileEntry.name);
+        this._closeTabModals(idx);
     };
 
     //////////////////////////////////////////////////////////////////////////////////////////////////////////////////

src/js/handlers/sidebar.js

@@ -40,7 +40,8 @@ var SidebarHandler = function () {
                 'data-title': 'Rename file',
                 'data-idx': that.Editors.getTabNavIdx(e.data('nodeid')),
                 'data-nodeid': e.data('nodeid'),
-                'data-old-filename': $(e).text()
+                'data-old-filename': $(e).text(),
+                'data-new-filename': $(e).text()
             });
         };