Skip to content
This repository was archived by the owner on Dec 15, 2022. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions lib/general-panel.coffee
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
{$$, View} = require 'space-pen'
$ = require 'jquery'
_ = require 'underscore'
{_, $, $$, Editor, View} = require 'atom'
async = require 'async'
AtomPackage = require 'atom-package'
Editor = require 'editor'

###
# Internal #
Expand Down
5 changes: 2 additions & 3 deletions lib/index.coffee
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
_ = require 'underscore'
{_} = require 'atom'
telepath = require 'telepath'

Project = require 'project'
SettingsView = null

configUri = 'atom://config'
Expand All @@ -22,7 +21,7 @@ registerDeserializer(deserializer)

module.exports =
activate: ->
Project.registerOpener (filePath) ->
project.registerOpener (filePath) ->
createSettingsView({uri: configUri}) if filePath is configUri

rootView.command 'settings-view:toggle', -> rootView.open(configUri)
8 changes: 4 additions & 4 deletions lib/package-manager.coffee
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
BufferedNodeProcess = require 'buffered-node-process'
{BufferedNodeProcess} = require 'atom'
roaster = require 'roaster'
async = require 'async'

Expand All @@ -22,7 +22,7 @@ renderMarkdownInMetadata = (packages, callback) ->
queue.drain = callback

getAvailable = (callback) ->
command = require.resolve '.bin/apm'
command = require.resolve 'atom-package-manager/bin/apm'
args = ['available', '--json']
output = []
stdout = (lines) -> output.push(lines)
Expand All @@ -49,7 +49,7 @@ install = ({name, version}, callback) ->
atom.deactivatePackage(name) if atom.isPackageActive(name)
atom.unloadPackage(name) if atom.isPackageLoaded(name)

command = require.resolve '.bin/apm'
command = require.resolve 'atom-package-manager/bin/apm'
args = ['install', "#{name}@#{version}"]
outputLines = []
stdout = (lines) -> outputLines.push(lines)
Expand All @@ -71,7 +71,7 @@ install = ({name, version}, callback) ->
uninstall = ({name}, callback) ->
atom.deactivatePackage(name) if atom.isPackageActive(name)

command = require.resolve '.bin/apm'
command = require.resolve 'atom-package-manager/bin/apm'
args = ['uninstall', name]
outputLines = []
stdout = (lines) -> outputLines.push(lines)
Expand Down
7 changes: 1 addition & 6 deletions lib/package-panel.coffee
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
$ = require 'jquery'
_ = require 'underscore'
{View, $$} = require 'space-pen'
EventEmitter = require 'event-emitter'
Editor = require 'editor'
{_, $, $$, Editor, EventEmitter, stringscore, View} = require 'atom'
PackageView = require './package-view'
packageManager = require './package-manager'
stringScore = require 'stringscore'


### Internal ###
Expand Down
8 changes: 3 additions & 5 deletions lib/package-view.coffee
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
url = require 'url'
Package = require 'package'
semver = require 'semver'
packageManager = require './package-manager'
_ = require 'underscore'
{$$, View} = require 'space-pen'
requireWithGlobals 'bootstrap/js/dropdown', jQuery: require 'jquery'
{_, $, $$, View} = require 'atom'
requireWithGlobals 'bootstrap/js/dropdown', jQuery: $

### Internal ###
module.exports =
Expand Down Expand Up @@ -39,7 +37,7 @@ class PackageView extends View
updateAvailable: false

initialize: (pack, @packageEventEmitter) ->
if pack instanceof Package
if pack?.metadata?
@pack = pack
@metadata = @pack.metadata
else
Expand Down
6 changes: 1 addition & 5 deletions lib/settings-view.coffee
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
{$$} = require 'space-pen'
ScrollView = require 'scroll-view'
$ = require 'jquery'
_ = require 'underscore'
{_, $, $$, ScrollView} = require 'atom'
telepath = require 'telepath'

GeneralPanel = require './general-panel'
ThemePanel = require './theme-panel'
PackagePanel = require './package-panel'
Project = require 'project'

###
# Internal #
Expand Down
4 changes: 1 addition & 3 deletions lib/theme-panel.coffee
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
{View, $$} = require 'space-pen'
$ = require 'jquery'
_ = require 'underscore'
{_, $, $$, View} = require 'atom'

###
# Internal #
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
"description": "GUI pane for Atom settings",
"dependencies": {
"jqueryui-browser": "~1.10.2-1",
"roaster": "0.0.7"
"roaster": "0.0.7",
"async": "~0.2.9"
},
"repository": {
"type": "git",
Expand Down
1 change: 0 additions & 1 deletion spec/general-panel-spec.coffee
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
GeneralPanel = require '../lib/general-panel'
Editor = require 'editor'

describe "GeneralPanel", ->
panel = null
Expand Down
2 changes: 1 addition & 1 deletion spec/package-panel-spec.coffee
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
PackagePanel = require '../lib/package-panel'
packageManager = require '../lib/package-manager'
_ = require 'underscore'
{_} = require 'atom'

describe "PackagePanel", ->
[panel, configObserver] = []
Expand Down
2 changes: 1 addition & 1 deletion spec/settings-view-spec.coffee
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
SettingsView = require '../lib/settings-view'
{$$} = require 'space-pen'
{$$} = require 'atom'

describe "SettingsView", ->
settingsView = null
Expand Down
2 changes: 1 addition & 1 deletion spec/theme-panel-spec.coffee
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
$ = require 'jquery'
{$} = require 'atom'
ThemePanel = require '../lib/theme-panel'

describe "ThemePanel", ->
Expand Down