3 files changed, 9 insertions, 9 deletions
diff --git a/after/syntax/javascript/graphql.vim b/after/syntax/javascript/graphql.vim
index 22557862..c0c73742 100644
--- a/after/syntax/javascript/graphql.vim
+++ b/after/syntax/javascript/graphql.vim
@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'graphql') == -1
+if !polyglot#util#IsEnabled('graphql', expand('<sfile>:p'))
+  finish
+endif
 
 " Copyright (c) 2016-2020 Jon Parise <jon@indelible.org>
 "
@@ -60,5 +62,3 @@ elseif graphql#has_syntax_group('javaScriptStringT')
   syn cluster javaScriptEmbededExpr add=graphqlTaggedTemplate
   syn cluster graphqlTaggedTemplate add=graphqlTemplateString
 endif
-
-endif
diff --git a/after/syntax/javascript/html5.vim b/after/syntax/javascript/html5.vim
index 42ab78ad..eaeaccb5 100644
--- a/after/syntax/javascript/html5.vim
+++ b/after/syntax/javascript/html5.vim
@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
+if !polyglot#util#IsEnabled('html5', expand('<sfile>:p'))
+  finish
+endif
 
 " Vim syntax file
 " Language:	    HTML5 New Stuff
@@ -49,5 +51,3 @@ syn keyword javascriptDomElemAttrs indeterminate
 
 " select https://w3c.github.io/selection-api/#extensions-to-globaleventhandlers
 syn keyword javascriptDomElemAttrs onselectstart onselectchange
-
-endif
diff --git a/after/syntax/javascript/sql.vim b/after/syntax/javascript/sql.vim
index 8b45203c..58e23b56 100644
--- a/after/syntax/javascript/sql.vim
+++ b/after/syntax/javascript/sql.vim
@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript-sql') == -1
+if !polyglot#util#IsEnabled('javascript-sql', expand('<sfile>:p'))
+  finish
+endif
 
 " Vim plugin
 " Language: JavaScript
@@ -22,5 +24,3 @@ hi def link sqlTaggedTemplate jsTaggedTemplate
 
 syn cluster jsExpression add=sqlTaggedTemplate
 syn cluster sqlTaggedTemplate add=sqlTemplateString
-
-endif