mirror of
https://github.com/atom/atom.git
synced 2026-01-24 22:38:20 -05:00
Trigger grammars-loaded event on syntax
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user