From 5f2c4dad951b1e4ae3e45124c3103ecb2c2aa3f1 Mon Sep 17 00:00:00 2001 From: Corey Johnson Date: Mon, 25 Mar 2013 13:29:12 -0700 Subject: [PATCH] Only show markdown preview if the edit session's grammar is GFM --- .../markdown-preview/lib/markdown-preview.coffee | 2 ++ .../spec/markdown-preview-spec.coffee | 11 ++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/packages/markdown-preview/lib/markdown-preview.coffee b/src/packages/markdown-preview/lib/markdown-preview.coffee index 4f34f8929..2c0fe213e 100644 --- a/src/packages/markdown-preview/lib/markdown-preview.coffee +++ b/src/packages/markdown-preview/lib/markdown-preview.coffee @@ -15,6 +15,8 @@ module.exports = return editSession = item + return unless editSession.getGrammar().scopeName == "source.gfm" + if nextPane = activePane.getNextPane() if preview = nextPane.itemForUri("markdown-preview:#{editSession.getPath()}") nextPane.showItem(preview) diff --git a/src/packages/markdown-preview/spec/markdown-preview-spec.coffee b/src/packages/markdown-preview/spec/markdown-preview-spec.coffee index 133bc7ad5..478418f82 100644 --- a/src/packages/markdown-preview/spec/markdown-preview-spec.coffee +++ b/src/packages/markdown-preview/spec/markdown-preview-spec.coffee @@ -4,6 +4,7 @@ MarkdownPreviewView = require 'markdown-preview/lib/markdown-preview-view' describe "MarkdownPreview package", -> beforeEach -> + window.loadPackage('gfm') project.setPath(project.resolve('markdown')) window.rootView = new RootView atom.activatePackage("markdown-preview", immediate: true) @@ -17,6 +18,14 @@ describe "MarkdownPreview package", -> beforeEach -> rootView.attachToDom() + describe "when the edit session does not use the GFM grammar", -> + it "does not show a markdown preview", -> + rootView.open() + expect(rootView.getPanes()).toHaveLength(1) + rootView.getActiveView().trigger 'markdown-preview:show' + expect(rootView.getPanes()).toHaveLength(1) + + describe "when a preview item has not been created for the edit session's uri", -> describe "when there is more than one pane", -> it "shows a markdown preview for the current buffer on the next pane", -> @@ -76,4 +85,4 @@ describe "MarkdownPreview package", -> preview.fetchRenderedMarkdown.reset() pane1.saveActiveItem = () -> pane1.trigger("core:save") - expect(preview.fetchRenderedMarkdown).toHaveBeenCalled() \ No newline at end of file + expect(preview.fetchRenderedMarkdown).toHaveBeenCalled()