From 46e85fac87ff7b87411b387d80868f7c02448bd9 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Tue, 19 Nov 2013 16:03:33 -0800 Subject: [PATCH] Remove window.syntax shim --- package.json | 10 +++++----- src/tokenized-buffer.coffee | 2 +- src/window.coffee | 1 - 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index e3ffcc800..78a152b56 100644 --- a/package.json +++ b/package.json @@ -71,7 +71,7 @@ "base16-tomorrow-dark-theme": "0.6.0", "solarized-dark-syntax": "0.4.0", "archive-view": "0.13.0", - "autocomplete": "0.12.0", + "autocomplete": "0.13.0", "autoflow": "0.5.0", "autosave": "0.6.0", "bookmarks": "0.10.0", @@ -87,7 +87,7 @@ "git-diff": "0.13.0", "github-sign-in": "0.9.0", "go-to-line": "0.8.0", - "grammar-selector": "0.8.0", + "grammar-selector": "0.9.0", "image-view": "0.8.0", "keybinding-resolver": "0.3.0", "link": "0.7.0", @@ -96,7 +96,7 @@ "package-generator": "0.19.0", "release-notes": "0.11.0", "settings-view": "0.42.0", - "snippets": "0.13.0", + "snippets": "0.14.0", "spell-check": "0.13.0", "status-bar": "0.16.0", "styleguide": "0.10.0", @@ -113,7 +113,7 @@ "language-clojure": "0.1.0", "language-coffee-script": "0.3.0", "language-css": "0.2.0", - "language-gfm": "0.8.0", + "language-gfm": "0.9.0", "language-git": "0.3.0", "language-go": "0.2.0", "language-html": "0.2.0", @@ -139,7 +139,7 @@ "language-sql": "0.2.0", "language-text": "0.2.0", "language-todo": "0.2.0", - "language-toml": "0.6.0", + "language-toml": "0.7.0", "language-xml": "0.2.0", "language-yaml": "0.1.0" }, diff --git a/src/tokenized-buffer.coffee b/src/tokenized-buffer.coffee index 7b1ca378d..af5c95409 100644 --- a/src/tokenized-buffer.coffee +++ b/src/tokenized-buffer.coffee @@ -39,7 +39,7 @@ class TokenizedBuffer bufferPath: @buffer.getPath() tabLength: tabLength ? atom.config.get('editor.tabLength') ? 2 - @subscribe syntax, 'grammar-added grammar-updated', (grammar) => + @subscribe atom.syntax, 'grammar-added grammar-updated', (grammar) => if grammar.injectionSelector? @resetTokenizedLines() if @hasTokenForSelector(grammar.injectionSelector) else diff --git a/src/window.coffee b/src/window.coffee index 5668e62eb..6b9bdd546 100644 --- a/src/window.coffee +++ b/src/window.coffee @@ -24,7 +24,6 @@ window.setUpEnvironment = (windowMode) -> atom.initialize() #TODO remove once all packages use the atom global window.config = atom.config - window.syntax = atom.syntax # Set up the default event handlers and menus for a non-editor windows. #