From 2582430e0fe53405c44f9ca45aebab12a78019eb Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Wed, 18 Sep 2013 15:31:07 -0700 Subject: [PATCH 1/3] Remove direct dependency on EditSession class Instead duck type for the source.gfm grammar --- lib/markdown-preview.coffee | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/markdown-preview.coffee b/lib/markdown-preview.coffee index 90bb96f..671a6a5 100644 --- a/lib/markdown-preview.coffee +++ b/lib/markdown-preview.coffee @@ -1,4 +1,3 @@ -EditSession = require 'edit-session' MarkdownPreviewView = require './markdown-preview-view' module.exports = @@ -9,9 +8,8 @@ module.exports = activePane = rootView.getActivePane() editSession = activePane.activeItem - isEditSession = editSession instanceof EditSession - hasMarkdownGrammar = editSession.getGrammar().scopeName == "source.gfm" - if not isEditSession or not hasMarkdownGrammar + isMarkdownEditor = editSession.getGrammar?()?.scopeName is "source.gfm" + unless isMarkdownEditor console.warn("Can not render markdown for '#{editSession.getUri() ? 'untitled'}'") return From 2189548d471bdabddec0791780355aa7739fd8d8 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Wed, 18 Sep 2013 15:31:28 -0700 Subject: [PATCH 2/3] Use atom-api for requires --- lib/markdown-preview-view.coffee | 6 +----- spec/markdown-preview-spec.coffee | 5 ++--- spec/markdown-preview-view-spec.coffee | 5 ++--- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/lib/markdown-preview-view.coffee b/lib/markdown-preview-view.coffee index 0d5e2e5..ae2adda 100644 --- a/lib/markdown-preview-view.coffee +++ b/lib/markdown-preview-view.coffee @@ -1,9 +1,5 @@ -$ = require 'jquery' -_ = require 'underscore' -ScrollView = require 'scroll-view' -{$$$} = require 'space-pen' +{_, $, $$$, Editor, ScrollView} = require 'atom-api' roaster = require 'roaster' -Editor = require 'editor' fenceNameToExtension = 'bash': 'sh' diff --git a/spec/markdown-preview-spec.coffee b/spec/markdown-preview-spec.coffee index fd40bc0..283e973 100644 --- a/spec/markdown-preview-spec.coffee +++ b/spec/markdown-preview-spec.coffee @@ -1,6 +1,5 @@ -RootView = require 'root-view' -MarkdownPreviewView = require 'markdown-preview/lib/markdown-preview-view' -{$$} = require 'space-pen' +{$$, RootView} = require 'atom-api' +MarkdownPreviewView = require '../lib/markdown-preview-view' describe "Markdown preview package", -> beforeEach -> diff --git a/spec/markdown-preview-view-spec.coffee b/spec/markdown-preview-view-spec.coffee index 1927df6..2c7f9b6 100644 --- a/spec/markdown-preview-view-spec.coffee +++ b/spec/markdown-preview-view-spec.coffee @@ -1,6 +1,5 @@ -MarkdownPreviewView = require 'markdown-preview/lib/markdown-preview-view' -$ = require 'jquery' -{$$$} = require 'space-pen' +MarkdownPreviewView = require '../lib/markdown-preview-view' +{$, $$$} = require 'atom-api' describe "MarkdownPreviewView", -> [buffer, preview] = [] From 53585857119085c087e02233231cdc0eccbe6947 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 19 Sep 2013 13:28:57 -0700 Subject: [PATCH 3/3] Rename require from atom-api to atom --- lib/markdown-preview-view.coffee | 2 +- spec/markdown-preview-spec.coffee | 2 +- spec/markdown-preview-view-spec.coffee | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/markdown-preview-view.coffee b/lib/markdown-preview-view.coffee index ae2adda..9aecb47 100644 --- a/lib/markdown-preview-view.coffee +++ b/lib/markdown-preview-view.coffee @@ -1,4 +1,4 @@ -{_, $, $$$, Editor, ScrollView} = require 'atom-api' +{_, $, $$$, Editor, ScrollView} = require 'atom' roaster = require 'roaster' fenceNameToExtension = diff --git a/spec/markdown-preview-spec.coffee b/spec/markdown-preview-spec.coffee index 283e973..572e382 100644 --- a/spec/markdown-preview-spec.coffee +++ b/spec/markdown-preview-spec.coffee @@ -1,4 +1,4 @@ -{$$, RootView} = require 'atom-api' +{$$, RootView} = require 'atom' MarkdownPreviewView = require '../lib/markdown-preview-view' describe "Markdown preview package", -> diff --git a/spec/markdown-preview-view-spec.coffee b/spec/markdown-preview-view-spec.coffee index 2c7f9b6..3da1e13 100644 --- a/spec/markdown-preview-view-spec.coffee +++ b/spec/markdown-preview-view-spec.coffee @@ -1,5 +1,5 @@ MarkdownPreviewView = require '../lib/markdown-preview-view' -{$, $$$} = require 'atom-api' +{$, $$$} = require 'atom' describe "MarkdownPreviewView", -> [buffer, preview] = []