v0.5.11 - show/hide close button option

dnbard · Feb 15, 2015 · 1174c7e · 1174c7e
1 parent d487e06
commit 1174c7e
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 14 deletions.
diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
     "title": "Documents Toolbar",
     "description": "Adds toolbar with tabs of open documents on the top of the editor. Now with split view support!",
     "homepage": "https://github.com/dnbard/brackets-documents-toolbar",
-    "version": "0.5.10",
+    "version": "0.5.11",
     "author": "Alex Bardanov",
     "license": "MIT",
     "engines": {

diff --git a/services/preferences.js b/services/preferences.js
@@ -11,7 +11,8 @@ define(function(require, exports){
             close_left: false,
             workingFiles: true,
             brackets_font: true,
-            grayscaleIcons: false
+            grayscaleIcons: false,
+            showCloseButton: true
         };
 
     exports.init = function(){

diff --git a/templates/holder.html b/templates/holder.html
@@ -8,7 +8,7 @@
         <span class="document-holder brFont" data-bind="foreach: documents">
             <span class="document" data-bind="style:{background: $parent.getDocumentBackground($data), color: $parent.getDocumentNameColor($data)}, css:{selected: $data._path === $parent.selectedPath(), changed: $parent.isChanged($data), modified: $parent.isModified($data)}, click: $parent.onDocumentClick, event:{mouseover: $parent.onDocumentMouseIn, mouseleave: $parent.onDocumentMouseLeave, contextmenu: $parent.onDocumentContextMenu, mousedown: $parent.onDocumentMouseDown}, attr:{title: $data._path}, drag: true">
                 <span data-bind="html: $parent.getDocumentView($data)"></span>
-                <span class="document-close" data-bind="click: $parent.onDocumentClose, style:{color: $parent.getDocumentNameColor($data)}, visible: !$parent.isCloseOnLeft()">
+                <span class="document-close" data-bind="click: $parent.onDocumentClose, style:{color: $parent.getDocumentNameColor($data)}, visible: $parent.isShowCloseButtonOnTabs">
                     <i class="fa fa-times-circle"></i>
                 </span>
             </span>

diff --git a/templates/modal.html b/templates/modal.html
@@ -12,17 +12,13 @@ <h1 class="dialog-title">Documents toolbar settings</h1>
                 <input type="checkbox" data-bind="checked: showWorkingFiles" />
                 <span>Show Working Files panel</span>
             </div>
-            <div style="display: none;">
-                <input type="checkbox" data-bind="checked: showIcons" />
-                <span>Show Icons</span>
-            </div>
-            <div style="display: none;">
-                <input type="checkbox" data-bind="checked: smallIcons" />
-                <span>Small Icons</span>
-            </div>
-            <div style="display: none;">
-                <input type="checkbox" data-bind="checked: grayscaleIcons" />
-                <span>Grayscale Icons</span>
+            <div>
+                <input type="checkbox" data-bind="checked: showCloseButton" />
+                <span>Show </span>
+                <span class="fa fa-times-circle"></span>
+                <span class="muted"> close button </span>
+                <span>on tab</span>
+                <span class="muted" data-bind="visible: !showCloseButton()">[use middle mouse button to close tabs]</span>
             </div>
             <div>
                 <input type="checkbox" data-bind="checked: useBracketsFont" />

diff --git a/viewmodels/documents.js b/viewmodels/documents.js
@@ -39,6 +39,8 @@ define(function(require, exports, module){
             self.fontEnabled(value);
         });
 
+        this.isShowCloseButtonOnTabs = ko.observable(!!prefs.get('showCloseButton'));
+
         this.onDocumentClick = function(model, event){
             CommandManager.execute('file.open', {
                 fullPath: model._path
@@ -134,6 +136,8 @@ define(function(require, exports, module){
 
         var hoveredDocument = null;
         this.onDocumentMouseIn = function(document, event){
+            self.isShowCloseButtonOnTabs(!!prefs.get('showCloseButton'));
+
             if (!prefs.get('tooltip')){
                 return;
             }

diff --git a/viewmodels/generalOptions.js b/viewmodels/generalOptions.js
@@ -58,11 +58,17 @@ define(function(require, exports, module){
             prefs.set('smallIcons', value);
         });
 
+        this.showCloseButton = ko.observable();
+        this.showCloseButton.subscribe(function(value){
+            prefs.set('showCloseButton', value);
+        });
+
         this.showWorkingFiles(prefs.get('workingFiles'));
         this.showIcons(prefs.get('icons'));
         this.useBracketsFont(prefs.get('brackets_font'));
         this.grayscaleIcons(prefs.get('grayscaleIcons'));
         this.smallIcons(prefs.get('smallIcons'));
+        this.showCloseButton(prefs.get('showCloseButton'));
     }
 
     module.exports = GeneralOptions;