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

Always provide the EditSession and its index on EditSession events

Browse Source
This commit is contained in:
Nathan Sobo
2012-11-20 15:49:52 -07:00
parent ebe8143228
commit e508d73dd4
4 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spec/app/editor-spec.coffee
View File

@@ -203,7 +203,7 @@ describe "Editor", ->
expect(editor.editSessions.length).toBe originalEditSessionCount + 1
expect(editSessionAddedHandler).toHaveBeenCalled()
expect(editSessionAddedHandler.argsForCall[0][1]).toBe otherEditSession
expect(editSessionAddedHandler.argsForCall[0][1..2]).toEqual [otherEditSession, originalEditSessionCount]
describe "when the edit session was previously assigned to this editor", ->
it "restores the previous edit session associated with the editor", ->
@@ -289,11 +289,11 @@ describe "Editor", ->
editor.setActiveEditSessionIndex(2)
expect(activeEditSessionChangeHandler).toHaveBeenCalled()
expect(activeEditSessionChangeHandler.argsForCall[0][1]).toBe 2
expect(activeEditSessionChangeHandler.argsForCall[0][1..2]).toEqual [editor.activeEditSession, 2]
activeEditSessionChangeHandler.reset()
editor.setActiveEditSessionIndex(0)
expect(activeEditSessionChangeHandler.argsForCall[0][1]).toBe 0
expect(activeEditSessionChangeHandler.argsForCall[0][1..2]).toEqual [editor.activeEditSession, 0]
activeEditSessionChangeHandler.reset()
describe ".loadNextEditSession()", ->

4
src/app/editor.coffee
View File

@@ -388,7 +388,7 @@ class Editor extends View
if index == -1
index = @editSessions.length
@editSessions.push(editSession)
@trigger 'editor:edit-session-added', editSession
@trigger 'editor:edit-session-added', [editSession, index]
@setActiveEditSessionIndex(index)
@@ -431,7 +431,7 @@ class Editor extends View
@trigger 'editor-path-change'
@trigger 'editor-path-change'
@trigger 'editor:active-edit-session-changed', index
@trigger 'editor:active-edit-session-changed', [@activeEditSession, index]
@resetDisplay()
if @attached and @activeEditSession.buffer.isInConflict()

2
src/extensions/tabs/spec/tabs-spec.coffee
View File

@@ -3,7 +3,7 @@ _ = require 'underscore'
RootView = require 'root-view'
Tabs = require 'tabs'
describe "Tabs", ->
fdescribe "Tabs", ->
[rootView, editor, statusBar, buffer, tabs] = []
beforeEach ->

3
src/extensions/tabs/src/tabs.coffee
View File

@@ -23,8 +23,7 @@ class Tabs extends View
@addTabForEditSession(editSession)
@setActiveTab(@editor.getActiveEditSessionIndex())
@editor.on 'editor:active-edit-session-changed', (e, index) => @setActiveTab(index)
@editor.on 'editor:active-edit-session-changed', (e, editSession, index) => @setActiveTab(index)
@editor.on 'editor:edit-session-added', (e, editSession) => @addTabForEditSession(editSession)
addTabForEditSession: (editSession) ->