From e5f8be7a7c0199b6fb2212b249f25c32a87cdb90 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 19 Sep 2013 14:05:17 -0700 Subject: [PATCH 1/2] Use atom-api for requires --- lib/image-edit-session.coffee | 9 +++------ lib/image-view.coffee | 4 +--- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/lib/image-edit-session.coffee b/lib/image-edit-session.coffee index a496a0f..2f11066 100644 --- a/lib/image-edit-session.coffee +++ b/lib/image-edit-session.coffee @@ -1,10 +1,8 @@ path = require 'path' -_ = require 'underscore' +{_, fs} = require 'atom-api' telepath = require 'telepath' -fsUtils = require 'fs-utils' - # Public: Manages the states between {Editor}s, images, and the project as a whole. # # Essentially, the graphical version of a {EditSession}. @@ -17,15 +15,14 @@ class ImageEditSession @activate: -> # Files with these extensions will be opened as images imageExtensions = ['.gif', '.jpeg', '.jpg', '.png'] - Project = require 'project' - Project.registerOpener (filePath) -> + project.registerOpener (filePath) -> if _.include(imageExtensions, path.extname(filePath)) new ImageEditSession(path: filePath) @deserialize: (state) -> relativePath = state.get('relativePath') resolvedPath = project.resolve(relativePath) if relativePath - if fsUtils.isFileSync(resolvedPath) + if fs.isFileSync(resolvedPath) new ImageEditSession(state) else console.warn "Could not build image edit session for path '#{relativePath}' because that file no longer exists" diff --git a/lib/image-view.coffee b/lib/image-view.coffee index 4655a86..ab92243 100644 --- a/lib/image-view.coffee +++ b/lib/image-view.coffee @@ -1,6 +1,4 @@ -ScrollView = require 'scroll-view' -_ = require 'underscore' -$ = require 'jquery' +{_, $, ScrollView} = require 'atom-api' # Public: Renders images in the {Editor}. module.exports = From 9b78933b87912398ba3fa41b5f5ab3ef74ab9257 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 19 Sep 2013 14:05:26 -0700 Subject: [PATCH 2/2] Rename require from atom-api to atom --- lib/image-edit-session.coffee | 2 +- lib/image-view.coffee | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/image-edit-session.coffee b/lib/image-edit-session.coffee index 2f11066..8833c49 100644 --- a/lib/image-edit-session.coffee +++ b/lib/image-edit-session.coffee @@ -1,6 +1,6 @@ path = require 'path' -{_, fs} = require 'atom-api' +{_, fs} = require 'atom' telepath = require 'telepath' # Public: Manages the states between {Editor}s, images, and the project as a whole. diff --git a/lib/image-view.coffee b/lib/image-view.coffee index ab92243..233daa1 100644 --- a/lib/image-view.coffee +++ b/lib/image-view.coffee @@ -1,4 +1,4 @@ -{_, $, ScrollView} = require 'atom-api' +{_, $, ScrollView} = require 'atom' # Public: Renders images in the {Editor}. module.exports =