From 41229f50f7f04077ebca7ea52561f96fb51a69df Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Tue, 23 Apr 2013 15:58:19 -0700 Subject: [PATCH] Look for .json extension first --- src/app/atom-package.coffee | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/atom-package.coffee b/src/app/atom-package.coffee index 5aa89e281..3fee5ede3 100644 --- a/src/app/atom-package.coffee +++ b/src/app/atom-package.coffee @@ -56,7 +56,7 @@ class AtomPackage extends Package console.warn "Failed to activate package named '#{@name}'", e.stack loadMetadata: -> - if metadataPath = fsUtils.resolveExtension(fsUtils.join(@path, 'package'), ['cson', 'json']) + if metadataPath = fsUtils.resolveExtension(fsUtils.join(@path, 'package'), ['json', 'cson']) @metadata = CSON.readObject(metadataPath) @metadata ?= {} @@ -66,7 +66,7 @@ class AtomPackage extends Package getKeymapPaths: -> keymapsDirPath = fsUtils.join(@path, 'keymaps') if @metadata.keymaps - @metadata.keymaps.map (name) -> fsUtils.resolve(keymapsDirPath, name, ['cson', 'json', '']) + @metadata.keymaps.map (name) -> fsUtils.resolve(keymapsDirPath, name, ['json', 'cson', '']) else fsUtils.list(keymapsDirPath, ['cson', 'json']) ? []