mirror of
https://github.com/atom/atom.git
synced 2026-01-23 05:48:10 -05:00
Rename window methods to distinguish editor window from config window
This commit is contained in:
committed by
Corey Johnson & Kevin Sawicki
parent
f62e81bca8
commit
9d2d3d5c00
@@ -8,7 +8,7 @@ describe "Window", ->
|
||||
beforeEach ->
|
||||
spyOn(atom, 'getPathToOpen').andReturn(project.getPath())
|
||||
window.handleWindowEvents()
|
||||
window.deserializeWindowState()
|
||||
window.deserializeEditorWindow()
|
||||
projectPath = project.getPath()
|
||||
|
||||
afterEach ->
|
||||
|
||||
@@ -35,7 +35,7 @@ window.setUpEnvironment = ->
|
||||
requireStylesheet(nativeStylesheetPath)
|
||||
|
||||
# This method is only called when opening a real application window
|
||||
window.startup = ->
|
||||
window.startEditorWindow = ->
|
||||
directory = _.find ['/opt/boxen', '/opt/github', '/usr/local'], (dir) -> fsUtils.isDirectory(dir)
|
||||
if directory
|
||||
installAtomCommand(fsUtils.join(directory, 'bin/atom'))
|
||||
@@ -48,7 +48,7 @@ window.startup = ->
|
||||
keymap.loadBundledKeymaps()
|
||||
atom.loadThemes()
|
||||
atom.loadPackages()
|
||||
deserializeWindowState()
|
||||
deserializeEditorWindow()
|
||||
atom.activatePackages()
|
||||
keymap.loadUserKeymaps()
|
||||
atom.requireUserInitScript()
|
||||
@@ -107,7 +107,7 @@ window.onDrop = (e) ->
|
||||
for file in e.originalEvent.dataTransfer.files
|
||||
atom.open(file.path)
|
||||
|
||||
window.deserializeWindowState = ->
|
||||
window.deserializeEditorWindow = ->
|
||||
RootView = require 'root-view'
|
||||
Project = require 'project'
|
||||
Git = require 'git'
|
||||
|
||||
@@ -4,6 +4,6 @@ require 'atom'
|
||||
require 'window'
|
||||
|
||||
window.setUpEnvironment()
|
||||
window.startup()
|
||||
window.startEditorWindow()
|
||||
setTimeout((-> atom.show()), 0)
|
||||
console.log "Load time: #{new Date().getTime() - date}"
|
||||
|
||||
Reference in New Issue
Block a user