github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-04-28 03:01:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into ns-workspace-custom-elements

Browse Source 
Conflicts:
	package.json
	src/workspace.coffee
This commit is contained in:
Nathan Sobo
2014-09-26 14:49:28 -06:00
parent aa1eb94fa7 1f2fc4bf00
commit 0ebedeec3a
42 changed files with 370 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/pane.coffee
View File

@@ -4,7 +4,7 @@
Serializable = require 'serializable'
Grim = require 'grim'
PaneAxis = require './pane-axis'
Editor = require './editor'
TextEditor = require './text-editor'
PaneView = null
# Extended: A container for presenting content in the center of the workspace.
@@ -260,9 +260,9 @@ class Pane extends Model
@emitter.emit 'did-change-active-item', @activeItem
@activeItem
# Return an {Editor} if the pane item is an {Editor}, or null otherwise.
# Return an {TextEditor} if the pane item is an {TextEditor}, or null otherwise.
getActiveEditor: ->
@activeItem if @activeItem instanceof Editor
@activeItem if @activeItem instanceof TextEditor
# Public: Return the item at the given index.
#