Merge pull request #445 from adobe/glenn/save-focused-editor

Make File > Save work on the currently focused editor

src/Editor.js

@@ -451,6 +451,12 @@ define(function (require, exports, module) {
         this._codeMirror.focus();
     };
 
+    /** Returns true if the editor has focus */
+    Editor.prototype.hasFocus = function () {
+        // The CodeMirror instance wrapper has a "CodeMirror-focused" class set when focused
+        return $(this._codeMirror.getWrapperElement()).hasClass("CodeMirror-focused");
+    };
+
     /**
      * Refreshes the editor control
      */

src/EditorManager.js

@@ -198,7 +198,7 @@ define(function (require, exports, module) {
      * @param {!FileEntry} sourceFile  The file from which the text was drawn. Ties the inline editor
      *      back to the full editor from which edits can be saved; also determines the editor's mode.
      *
-     * @returns {{content:DOMElement, height:Number, onAdded:function(inlineId:Number)}}
+     * @returns {{content:DOMElement, editor:Editor, source:FileEntry, height:Number, onAdded:function(inlineId:Number)}}
      */
     function createInlineEditorFromText(hostEditor, text, range, sourceFile) {
         // Container to hold editor & render its stylized frame
@@ -289,7 +289,7 @@ define(function (require, exports, module) {
             inlineEditor.focus();
         }
 
-        return { content: inlineContent, editor: inlineEditor, height: 0, onAdded: afterAdded };
+        return { content: inlineContent, editor: inlineEditor, source: sourceFile, height: 0, onAdded: afterAdded };
     }
 
 
@@ -451,6 +451,33 @@ define(function (require, exports, module) {
         _editorHolder = holder;
     }
 
+    /**
+     * Returns the currently focused editor instance.
+     * @returns {{editor:Editor, source:FileEntry}}
+     */
+    function getFocusedEditor() {
+        if (_currentEditor) {
+            var focusedInline;
+
+            // See if any inlines have focus
+            _currentEditor.getInlineWidgets().forEach(function (widget) {
+                if (widget.data.editor && widget.data.editor.hasFocus()) {
+                    focusedInline = { editor: widget.data.editor, source: widget.data.source };
+                }
+            });
+
+            if (focusedInline) {
+                return focusedInline;
+            }
+
+            if (_currentEditor.hasFocus()) {
+                return { editor: _currentEditor, source: _currentEditorsDocument.file };
+            }
+        }
+
+        return null;
+    }
+
     // Initialize: register listeners
     $(DocumentManager).on("currentDocumentChange", _onCurrentDocumentChange);
     $(DocumentManager).on("workingSetRemove", _onWorkingSetRemove);
@@ -463,6 +490,7 @@ define(function (require, exports, module) {
     exports.createFullEditorForDocument = createFullEditorForDocument;
     exports.createInlineEditorFromText = createInlineEditorFromText;
     exports.focusEditor = focusEditor;
+    exports.getFocusedEditor = getFocusedEditor;
     exports.resizeEditor = resizeEditor;
     exports.registerInlineEditProvider = registerInlineEditProvider;
 });

src/FileCommandHandlers.js

@@ -297,7 +297,14 @@ define(function (require, exports, module) {
             doc = commandData.doc;
         }
         if (!doc) {
-            doc = DocumentManager.getCurrentDocument();
+            var focusedEditor = EditorManager.getFocusedEditor();
+
+            if (focusedEditor) {
+                doc = DocumentManager.getDocumentForFile(focusedEditor.source);
+            }
+
+            // The doSave() method called below does a null check on doc and makes sure the
+            // document is dirty before saving.
         }
 
         return doSave(doc);

test/spec/Editor-test.js

@@ -59,5 +59,29 @@ define(function (require, exports, module) {
                 expect(mode).toEqual("");
             });
         });
+
+        describe("Focus", function () {
+            var myEditor;
+
+            beforeEach(function () {
+                // init Editor instance (containing a CodeMirror instance)
+                $("body").append("<div id='editor'/>");
+                myEditor = new Editor(content, "", $("#editor").get(0), {});
+            });
+
+            afterEach(function () {
+                $("#editor").remove();
+                myEditor = null;
+            });
+
+            it("should not have focus until explicitly set", function () {
+                expect(myEditor.hasFocus()).toBe(false);
+            });
+
+            it("should be able to detect when it has focus", function () {
+                myEditor.focus();
+                expect(myEditor.hasFocus()).toBe(true);
+            });
+        });
     });
 });