From af99bac30ad4ea4ea258703a12993aa1fff7263c Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 17 Dec 2012 11:09:34 -0800 Subject: [PATCH] Support opening project outline view without open editor --- src/extensions/outline-view/src/keymap.coffee | 4 +++- src/extensions/outline-view/src/outline-view.coffee | 4 ++-- src/extensions/outline-view/src/tag-reader.coffee | 9 ++++----- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/extensions/outline-view/src/keymap.coffee b/src/extensions/outline-view/src/keymap.coffee index 50166ddd9..661633522 100644 --- a/src/extensions/outline-view/src/keymap.coffee +++ b/src/extensions/outline-view/src/keymap.coffee @@ -1,4 +1,6 @@ window.keymap.bindKeys '.editor' 'meta-j': 'outline-view:toggle-file-outline' - 'meta-J': 'outline-view:toggle-project-outline' 'meta-.': 'outline-view:jump-to-declaration' + +window.keymap.bindKeys 'body' + 'meta-J': 'outline-view:toggle-project-outline' diff --git a/src/extensions/outline-view/src/outline-view.coffee b/src/extensions/outline-view/src/outline-view.coffee index 7785a9266..4ec35e944 100644 --- a/src/extensions/outline-view/src/outline-view.coffee +++ b/src/extensions/outline-view/src/outline-view.coffee @@ -68,7 +68,7 @@ class OutlineView extends SelectList populateProjectOutline: -> @setLoading("Loading symbols...") - TagReader.getAllTags(@rootView.getActiveEditor()).done (tags) => + TagReader.getAllTags(@rootView.project).done (tags) => if tags.length > 0 @miniEditor.show() @maxItems = 10 @@ -85,7 +85,7 @@ class OutlineView extends SelectList openTag: (tag) -> position = tag.position position = @getTagLine(tag) unless position - @rootView.openInExistingEditor(tag.file, true, true) if tag.file + @rootView.open(tag.file, {changeFocus: true, allowActiveEditorChange:true}) if tag.file @moveToPosition(position) if position moveToPosition: (position) -> diff --git a/src/extensions/outline-view/src/tag-reader.coffee b/src/extensions/outline-view/src/tag-reader.coffee index 49e9aa042..520f0d415 100644 --- a/src/extensions/outline-view/src/tag-reader.coffee +++ b/src/extensions/outline-view/src/tag-reader.coffee @@ -3,8 +3,7 @@ $ = require 'jquery' module.exports = -getTagsFile: (editor) -> - project = editor.rootView().project +getTagsFile: (project) -> tagsFile = project.resolve("tags") or project.resolve("TAGS") return tagsFile if fs.isFile(tagsFile) @@ -12,14 +11,14 @@ find: (editor) -> word = editor.getTextInRange(editor.getCursor().getCurrentWordBufferRange()) return [] unless word.length > 0 - tagsFile = @getTagsFile(editor) + tagsFile = @getTagsFile(editor.rootView().project) return [] unless tagsFile $tags.find(tagsFile, word) or [] -getAllTags: (editor, callback) -> +getAllTags: (project, callback) -> deferred = $.Deferred() - tagsFile = @getTagsFile(editor) + tagsFile = @getTagsFile(project) if tagsFile $tags.getAllTagsAsync tagsFile, (tags) => deferred.resolve(tags)