Trigger grammars-loaded event on syntax

This commit is contained in:
Kevin Sawicki
2013-01-28 14:34:45 -08:00
parent ad8dd767e5
commit e792265076
4 changed files with 6 additions and 7 deletions

View File

@@ -59,16 +59,12 @@ describe "the `atom` global", ->
describe ".loadPackages()", ->
beforeEach ->
window.rootView = new RootView
spyOn(syntax, 'addGrammar')
afterEach ->
delete window.rootView
it "terminates the worker when all packages have been loaded", ->
spyOn(Worker.prototype, 'terminate').andCallThrough()
eventHandler = jasmine.createSpy('eventHandler')
rootView.on 'grammars-loaded', eventHandler
syntax.on 'grammars-loaded', eventHandler
disabledPackages = config.get("core.disabledPackages")
disabledPackages.push('textmate-package.tmbundle')
config.set "core.disabledPackages", disabledPackages

View File

@@ -404,7 +404,7 @@ class Editor extends View
@gutter.widthChanged = (newWidth) =>
@scrollView.css('left', newWidth + 'px')
rootView?.on 'grammars-loaded', =>
syntax.on 'grammars-loaded', =>
@reloadGrammar()
for session in @editSessions
session.reloadGrammar() unless session is @activeEditSession

View File

@@ -12,7 +12,7 @@ class LoadTextMatePackagesTask extends Task
loadNextPackage: ->
unless @packages.length
@terminate()
rootView.trigger 'grammars-loaded'
syntax.trigger 'grammars-loaded'
return
@package = @packages.shift()

View File

@@ -3,6 +3,7 @@ jQuery = require 'jquery'
Specificity = require 'specificity'
{$$} = require 'space-pen'
fs = require 'fs'
EventEmitter = require 'event-emitter'
module.exports =
class Syntax
@@ -104,3 +105,5 @@ class Syntax
deepestChild[0]
else
element[0]
_.extend(Syntax.prototype, EventEmitter)