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

Ensure that theme styles are applied after packages

Browse Source
This commit is contained in:
Matt Colyer
2013-09-11 17:36:08 -07:00
parent 708c760c6c
commit 1361ec6ec1
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/atom-package.coffee
View File

@@ -64,7 +64,8 @@ class AtomPackage extends Package
activateResources: ->
keymap.add(keymapPath, map) for [keymapPath, map] in @keymaps
applyStylesheet(stylesheetPath, content) for [stylesheetPath, content] in @stylesheets
type = if @metadata.theme then 'theme' else 'bundled'
applyStylesheet(stylesheetPath, content, type) for [stylesheetPath, content] in @stylesheets
syntax.addGrammar(grammar) for grammar in @grammars
for [scopedPropertiesPath, selector, properties] in @scopedProperties
syntax.addProperties(scopedPropertiesPath, selector, properties)
@@ -139,7 +140,8 @@ class AtomPackage extends Package
oldSheets = _.clone(@stylesheets)
@loadStylesheets()
removeStylesheet(stylesheetPath) for [stylesheetPath] in oldSheets
applyStylesheet(stylesheetPath, content) for [stylesheetPath, content] in @stylesheets
type = if @metadata.theme then 'theme' else 'bundled'
applyStylesheet(stylesheetPath, content, type) for [stylesheetPath, content] in @stylesheets
requireMainModule: ->
return @mainModule if @mainModule?