mirror of
https://github.com/atom/atom.git
synced 2026-02-08 21:55:05 -05:00
Eliminate Editor.open
This commit is contained in:
@@ -15,7 +15,7 @@ class Editor extends Template
|
||||
|
||||
initialize: () ->
|
||||
@buildAceEditor()
|
||||
@open()
|
||||
@setBuffer(new Buffer)
|
||||
|
||||
shutdown: ->
|
||||
@destroy()
|
||||
@@ -27,9 +27,6 @@ class Editor extends Template
|
||||
session = new EditSession(@buffer.aceDocument, @buffer.getMode())
|
||||
@aceEditor.setSession(session)
|
||||
|
||||
open: (url) ->
|
||||
@setBuffer(new Buffer(url))
|
||||
|
||||
buildAceEditor: ->
|
||||
@aceEditor = ace.edit this[0]
|
||||
@aceEditor.setTheme(require "ace/theme/twilight")
|
||||
|
||||
@@ -2,6 +2,7 @@ $ = require 'jquery'
|
||||
fs = require 'fs'
|
||||
|
||||
Template = require 'template'
|
||||
Buffer = require 'buffer'
|
||||
Editor = require 'editor'
|
||||
FileFinder = require 'file-finder'
|
||||
Project = require 'project'
|
||||
@@ -23,7 +24,7 @@ class RootView extends Template
|
||||
|
||||
if url
|
||||
@project = new Project(fs.directory(url))
|
||||
@editor.open(url) if fs.isFile(url)
|
||||
@editor.setBuffer(new Buffer(url)) if fs.isFile(url)
|
||||
|
||||
addPane: (view) ->
|
||||
pane = $('<div class="pane">')
|
||||
@@ -41,6 +42,8 @@ class RootView extends Template
|
||||
relativePaths = (path.replace(@project.url, "") for path in paths)
|
||||
@fileFinder = FileFinder.build
|
||||
urls: relativePaths
|
||||
selected: (relativePath) => @editor.open(@project.url + relativePath)
|
||||
selected: (relativePath) =>
|
||||
buffer = new Buffer(@project.url + relativePath)
|
||||
@editor.setBuffer buffer
|
||||
@addPane(@fileFinder)
|
||||
@fileFinder.input.focus()
|
||||
|
||||
Reference in New Issue
Block a user