mirror of
https://github.com/atom/atom.git
synced 2026-01-23 05:48:10 -05:00
Fix naming errors
This commit is contained in:
@@ -1,2 +1,2 @@
|
||||
'body':
|
||||
'meta-,': 'settings:toggle'
|
||||
'meta-,': 'settings-view:toggle'
|
||||
|
||||
@@ -10,9 +10,9 @@ Editor = require 'editor'
|
||||
###
|
||||
|
||||
module.exports =
|
||||
class SettingsPanel extends View
|
||||
class GeneralPanel extends View
|
||||
@content: ->
|
||||
@form id: 'settings-panel', class: 'form-horizontal', =>
|
||||
@form id: 'general-panel', class: 'form-horizontal', =>
|
||||
@div outlet: "loadingElement", class: 'alert alert-info loading-area', "Loading settings"
|
||||
|
||||
initialize: ->
|
||||
@@ -3,7 +3,7 @@ ScrollView = require 'scroll-view'
|
||||
$ = require 'jquery'
|
||||
_ = require 'underscore'
|
||||
Pane = require 'pane'
|
||||
SettingsPanel = require './settings-panel'
|
||||
GeneralPanel = require './general-panel'
|
||||
ThemePanel = require './theme-panel'
|
||||
PackagePanel = require './package-panel'
|
||||
Project = require 'project'
|
||||
@@ -40,14 +40,13 @@ class SettingsView extends ScrollView
|
||||
initialize: (activePanelName) ->
|
||||
super
|
||||
@panelsByName = {}
|
||||
document.title = "Atom Configuration"
|
||||
@on 'click', '#panels-menu li a', (e) =>
|
||||
@showPanel($(e.target).closest('li').attr('name'))
|
||||
|
||||
@on 'click', '#open-dot-atom', ->
|
||||
atom.open(config.configDirPath)
|
||||
|
||||
@addPanel('Settings', new SettingsPanel)
|
||||
@addPanel('General', new GeneralPanel)
|
||||
@addPanel('Themes', new ThemePanel)
|
||||
@addPanel('Packages', new PackagePanel)
|
||||
@showPanel(activePanelName) if activePanelName
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
'main': './lib/settings'
|
||||
'main': './lib/settings-view'
|
||||
'deferredDeserializers': ['SettingsView']
|
||||
'description': 'GUI pane for Atom settings'
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
SettingsPanel = require '../lib/settings-panel'
|
||||
GeneralPanel = require '../lib/general-panel'
|
||||
Editor = require 'editor'
|
||||
|
||||
describe "SettingsPanel", ->
|
||||
describe "GeneralPanel", ->
|
||||
panel = null
|
||||
|
||||
getValueForId = (id) ->
|
||||
@@ -27,7 +27,7 @@ describe "SettingsPanel", ->
|
||||
config.set('foo.boolean', true)
|
||||
config.set('foo.string', 'hey')
|
||||
|
||||
panel = new SettingsPanel()
|
||||
panel = new GeneralPanel()
|
||||
spyOn(panel, "showSettings").andCallThrough()
|
||||
window.advanceClock(10000)
|
||||
waitsFor ->
|
||||
|
||||
Reference in New Issue
Block a user