Add event subscription methods to ThemeManager

spec/theme-manager-spec.coffee

@@ -131,8 +131,8 @@ describe "ThemeManager", ->
 
   describe "requireStylesheet(path)", ->
     it "synchronously loads css at the given path and installs a style tag for it in the head", ->
-      themeManager.on 'stylesheets-changed', stylesheetsChangedHandler = jasmine.createSpy("stylesheetsChangedHandler")
-      themeManager.on 'stylesheet-added', stylesheetAddedHandler = jasmine.createSpy("stylesheetAddedHandler")
+      themeManager.onDidChangeStylesheets stylesheetsChangedHandler = jasmine.createSpy("stylesheetsChangedHandler")
+      themeManager.onDidAddStylesheet stylesheetAddedHandler = jasmine.createSpy("stylesheetAddedHandler")
       cssPath = atom.project.resolve('css.css')
       lengthBefore = $('head style').length
 
@@ -193,8 +193,8 @@ describe "ThemeManager", ->
       themeManager.requireStylesheet(cssPath)
       expect($(document.body).css('font-weight')).toBe("bold")
 
-      themeManager.on 'stylesheet-removed', stylesheetRemovedHandler = jasmine.createSpy("stylesheetRemovedHandler")
-      themeManager.on 'stylesheets-changed', stylesheetsChangedHandler = jasmine.createSpy("stylesheetsChangedHandler")
+      themeManager.onDidRemoveStylesheet stylesheetRemovedHandler = jasmine.createSpy("stylesheetRemovedHandler")
+      themeManager.onDidChangeStylesheets stylesheetsChangedHandler = jasmine.createSpy("stylesheetsChangedHandler")
 
       themeManager.removeStylesheet(cssPath)
 
@@ -217,7 +217,7 @@ describe "ThemeManager", ->
         themeManager.activateThemes()
 
     it "loads the correct values from the theme's ui-variables file", ->
-      themeManager.on 'reloaded', reloadHandler = jasmine.createSpy()
+      themeManager.onDidReloadAll reloadHandler = jasmine.createSpy()
       atom.config.set('core.themes', ['theme-with-ui-variables'])
 
       waitsFor ->
@@ -234,7 +234,7 @@ describe "ThemeManager", ->
 
     describe "when there is a theme with incomplete variables", ->
       it "loads the correct values from the fallback ui-variables", ->
-        themeManager.on 'reloaded', reloadHandler = jasmine.createSpy()
+        themeManager.onDidReloadAll reloadHandler = jasmine.createSpy()
         atom.config.set('core.themes', ['theme-with-incomplete-ui-variables'])
 
         waitsFor ->
@@ -251,7 +251,7 @@ describe "ThemeManager", ->
       it 'adds theme-* classes to the workspace for each active theme', ->
         expect(atom.workspaceView).toHaveClass 'theme-atom-dark-ui'
 
-        themeManager.on 'reloaded', reloadHandler = jasmine.createSpy()
+        themeManager.onDidReloadAll reloadHandler = jasmine.createSpy()
         atom.config.set('core.themes', ['theme-with-ui-variables'])
 
         waitsFor ->
@@ -273,9 +273,9 @@ describe "ThemeManager", ->
         themeManager.activateThemes()
 
       runs ->
-        themeManager.on 'stylesheets-changed', stylesheetsChangedHandler = jasmine.createSpy("stylesheetsChangedHandler")
-        themeManager.on 'stylesheet-removed', stylesheetRemovedHandler = jasmine.createSpy("stylesheetRemovedHandler")
-        themeManager.on 'stylesheet-added', stylesheetAddedHandler = jasmine.createSpy("stylesheetAddedHandler")
+        themeManager.onDidChangeStylesheets stylesheetsChangedHandler = jasmine.createSpy("stylesheetsChangedHandler")
+        themeManager.onDidRemoveStylesheet stylesheetRemovedHandler = jasmine.createSpy("stylesheetRemovedHandler")
+        themeManager.onDidAddStylesheet stylesheetAddedHandler = jasmine.createSpy("stylesheetAddedHandler")
         spyOn(themeManager, 'loadUserStylesheet').andCallThrough()
 
         expect($(document.body).css('border-style')).toBe 'dotted'
@@ -316,7 +316,9 @@ describe "ThemeManager", ->
         themeManager.activateThemes()
 
       runs ->
-        themeManager.once 'reloaded', -> reloaded = true
+        disposable = themeManager.onDidReloadAll ->
+          disposable.dispose()
+          reloaded = true
         spyOn(console, 'warn')
         expect(-> atom.config.set('core.themes', ['atom-light-ui', 'theme-really-does-not-exist'])).not.toThrow()
 

src/theme-manager.coffee

@@ -55,10 +55,36 @@ class ThemeManager
   onDidReloadAll: (callback) ->
     @emitter.on 'did-reload-all', callback
 
+  # Essential: Invoke `callback` when a stylesheet has been added to the dom.
+  #
+  # * `callback` {Function}
+  #   * `stylesheet` {HTMLElement} the style node
+  onDidAddStylesheet: (callback) ->
+    @emitter.on 'did-add-stylesheet', callback
+
+  # Essential: Invoke `callback` when a stylesheet has been removed from the dom.
+  #
+  # * `callback` {Function}
+  #   * `stylesheet` {HTMLElement} the style node
+  onDidRemoveStylesheet: (callback) ->
+    @emitter.on 'did-remove-stylesheet', callback
+
+  # Essential: Invoke `callback` when any stylesheet has been updated, added, or removed.
+  #
+  # * `callback` {Function}
+  onDidChangeStylesheets: (callback) ->
+    @emitter.on 'did-change-stylesheets', callback
+
   on: (eventName) ->
     switch eventName
       when 'reloaded'
         deprecate 'Use ThemeManager::onDidReloadAll instead'
+      when 'stylesheet-added'
+        deprecate 'Use ThemeManager::onDidAddStylesheet instead'
+      when 'stylesheet-removed'
+        deprecate 'Use ThemeManager::onDidRemoveStylesheet instead'
+      when 'stylesheets-changed'
+        deprecate 'Use ThemeManager::onDidChangeStylesheets instead'
       else
         deprecate 'ThemeManager::on is deprecated. Use event subscription methods instead.'
     EmitterMixin::on.apply(this, arguments)
@@ -286,7 +312,9 @@ class ThemeManager
       {sheet} = element
       element.remove()
       @emit 'stylesheet-removed', sheet
+      @emitter.emit 'did-remove-stylesheet', sheet
       @emit 'stylesheets-changed'
+      @emitter.emit 'did-change-stylesheets'
 
   applyStylesheet: (path, text, type='bundled') ->
     styleId = @stringToId(path)
@@ -294,6 +322,7 @@ class ThemeManager
 
     if styleElement?
       @emit 'stylesheet-removed', styleElement.sheet
+      @emitter.emit 'did-remove-stylesheet', styleElement.sheet
       styleElement.textContent = text
     else
       styleElement = document.createElement('style')
@@ -308,4 +337,6 @@ class ThemeManager
         document.head.appendChild(styleElement)
 
     @emit 'stylesheet-added', styleElement.sheet
+    @emitter.emit 'did-add-stylesheet', styleElement.sheet
     @emit 'stylesheets-changed'
+    @emitter.emit 'did-change-stylesheets'