Merge pull request #3349 from adobe/jasonsanjose/window-title

Use window.document.title instead of HTML toolbar when not inBrowser

Author: peterflynn

src/document/DocumentCommandHandlers.js

@@ -61,39 +61,54 @@ define(function (require, exports, module) {
     var _$titleWrapper = null;
     /** @type {string} Label shown above editor for current document: filename and potentially some of its path */
     var _currentTitlePath = null;
+    /** @type {string} String template for window title. Use emdash on mac only. */
+    var WINDOW_TITLE_STRING = (brackets.platform !== "mac") ? "{0} - {1}" : "{0} \u2014 {1}";
 
     /** @type {jQueryObject} Container for _$titleWrapper; if changing title changes this element's height, must kick editor to resize */
     var _$titleContainerToolbar = null;
     /** @type {Number} Last known height of _$titleContainerToolbar */
     var _lastToolbarHeight = null;
 
     function updateTitle() {
-        var currentDoc = DocumentManager.getCurrentDocument();
-        if (currentDoc) {
-            _$title.text(_currentTitlePath);
-            _$title.attr("title", currentDoc.file.fullPath);
-            // dirty dot is always in DOM so layout doesn't change, and visibility is toggled
-            _$dirtydot.css("visibility", (currentDoc.isDirty) ? "visible" : "hidden");
-        } else {
-            _$title.text("");
-            _$title.attr("title", "");
-            _$dirtydot.css("visibility", "hidden");
-        }
-        
-        // Set _$titleWrapper to a fixed width just large enough to accomodate _$title. This seems equivalent to what
-        // the browser would do automatically, but the CSS trick we use for layout requires _$titleWrapper to have a
-        // fixed width set on it (see the "#main-toolbar.toolbar" CSS rule for details).
-        _$titleWrapper.css("width", "");
-        var newWidth = _$title.width();
-        _$titleWrapper.css("width", newWidth);
+        var currentDoc = DocumentManager.getCurrentDocument(),
+            windowTitle = brackets.config.app_title;
+
+        if (brackets.inBrowser) {
+            if (currentDoc) {
+                _$title.text(_currentTitlePath);
+                _$title.attr("title", currentDoc.file.fullPath);
+                // dirty dot is always in DOM so layout doesn't change, and visibility is toggled
+                _$dirtydot.css("visibility", (currentDoc.isDirty) ? "visible" : "hidden");
+            } else {
+                _$title.text("");
+                _$title.attr("title", "");
+                _$dirtydot.css("visibility", "hidden");
+            }
 
-        // Changing the width of the title may cause the toolbar layout to change height, which needs to resize the
-        // editor beneath it (toolbar changing height due to window resize is already caught by EditorManager).
-        var newToolbarHeight = _$titleContainerToolbar.height();
-        if (_lastToolbarHeight !== newToolbarHeight) {
-            _lastToolbarHeight = newToolbarHeight;
-            EditorManager.resizeEditor();
+            // Set _$titleWrapper to a fixed width just large enough to accomodate _$title. This seems equivalent to what
+            // the browser would do automatically, but the CSS trick we use for layout requires _$titleWrapper to have a
+            // fixed width set on it (see the "#main-toolbar.toolbar" CSS rule for details).
+            _$titleWrapper.css("width", "");
+            var newWidth = _$title.width();
+            _$titleWrapper.css("width", newWidth);
+            
+            // Changing the width of the title may cause the toolbar layout to change height, which needs to resize the
+            // editor beneath it (toolbar changing height due to window resize is already caught by EditorManager).
+            var newToolbarHeight = _$titleContainerToolbar.height();
+            if (_lastToolbarHeight !== newToolbarHeight) {
+                _lastToolbarHeight = newToolbarHeight;
+                EditorManager.resizeEditor();
+            }
         }
+
+        // build shell/browser window title, e.g. "• file.html — Brackets"
+        if (currentDoc) {
+            windowTitle = StringUtils.format(WINDOW_TITLE_STRING, _currentTitlePath, windowTitle);
+            windowTitle = (currentDoc.isDirty) ? "• " + windowTitle : windowTitle;
+        }
+
+        // update shell/browser window title
+        window.document.title = windowTitle;
     }
 
     function updateDocumentTitle() {
@@ -722,7 +737,7 @@ define(function (require, exports, module) {
                 }
             });
     }
-	
+    
     /**
      * @private
      * Implementation for abortQuit callback to reset quit sequence settings

test/spec/DocumentCommandHandlers-test.js

@@ -77,7 +77,7 @@ define(function (require, exports, module) {
                     waitsForDone(promise, "FILE_CLOSE");
                 });
                 runs(function () {
-                    expect(testWindow.$("#main-toolbar .title").text()).toBe("");
+                    expect(testWindow.document.title).toBe(brackets.config.app_title);
                 });
             });
 
@@ -93,7 +93,7 @@ define(function (require, exports, module) {
                     waitsForDone(promise, "FILE_CLOSE");
                 });
                 runs(function () {
-                    expect(testWindow.$("#main-toolbar .title").text()).toBe("");
+                    expect(testWindow.document.title).toBe(brackets.config.app_title);
                 });
             });
         });
@@ -222,6 +222,8 @@ define(function (require, exports, module) {
 
             beforeEach(function () {
                 var promise;
+                
+                SpecRunnerUtils.loadProjectInTestWindow(testPath);
 
                 runs(function () {
                     promise = CommandManager.execute(Commands.FILE_OPEN, {fullPath: testPath + "/test.js"});
@@ -232,6 +234,9 @@ define(function (require, exports, module) {
             it("should report clean immediately after opening a file", function () {
                 runs(function () {
                     expect(DocumentManager.getCurrentDocument().isDirty).toBe(false);
+                    
+                    var expectedTitle = (brackets.platform === "mac" ? ("test.js — " + brackets.config.app_title) : ("test.js - " + brackets.config.app_title));
+                    expect(testWindow.document.title).toBe(expectedTitle);
                 });
             });
 
@@ -244,6 +249,8 @@ define(function (require, exports, module) {
 
                     // verify Document dirty status
                     expect(doc.isDirty).toBe(true);
+                    var expectedTitle = (brackets.platform === "mac" ? ("• test.js — " + brackets.config.app_title) : ("• test.js - " + brackets.config.app_title));
+                    expect(testWindow.document.title).toBe(expectedTitle);
                 });
             });