refactor: Utils and constants files

ktquez · Jun 7, 2020 · 736d677 · 736d677
1 parent c172e4d
commit 736d677
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 22 deletions.
diff --git a/src/VueDisqus.vue b/src/VueDisqus.vue
@@ -4,11 +4,11 @@
 
 <script>
 import {
-  callbacks,
-  getEmitName,
-  allowedSSOKeys,
-  allowedPageConfigKeys
-} from './utils'
+  SSO_KEYS,
+  CALLBACKS,
+  PAGE_CONFIG_KEYS
+} from './constants'
+import { getEmitName } from './utils'
 
 export default {
   name: 'VueDisqus',
@@ -21,12 +21,12 @@ export default {
     pageConfig: {
       type: Object,
       required: false,
-      validator: config => Object.keys(config).every(key => allowedPageConfigKeys.includes(key))
+      validator: config => Object.keys(config).every(key => PAGE_CONFIG_KEYS.includes(key))
     },
     ssoConfig: {
       type: Object,
       required: false,
-      validator: config => Object.keys(config).every(key => allowedSSOKeys.includes(key))
+      validator: config => Object.keys(config).every(key => SSO_KEYS.includes(key))
     },
     lang: {
       type: String
@@ -99,16 +99,14 @@ export default {
     },
 
     makeEmbedScript () {
-      setTimeout(() => {
-        const d = document
-        const s = d.createElement('script')
-        s.setAttribute('id', 'embed-disqus')
-        s.setAttribute('data-timestamp', +new Date())
-        s.type = 'text/javascript'
-        s.async = true
-        s.src = `//${this.shortname}.disqus.com/embed.js`
-        ;(d.head || d.body).appendChild(s)
-      }, 0)
+      const d = document
+      const s = d.createElement('script')
+      s.setAttribute('id', 'embed-disqus')
+      s.setAttribute('data-timestamp', +new Date())
+      s.type = 'text/javascript'
+      s.async = true
+      s.src = `//${this.shortname}.disqus.com/embed.js`
+      ;(d.head || d.body).appendChild(s)
     },
 
     setBaseConfig (disqusConfig) {
@@ -138,7 +136,7 @@ export default {
     },
 
     cbDisqus (disqusConfig) {
-      callbacks.forEach(cb => {
+      CALLBACKS.forEach(cb => {
         disqusConfig.callbacks[cb] = [e => {
           this.$emit(getEmitName(cb), e)
         }]

diff --git a/src/constants.js b/src/constants.js
@@ -0,0 +1,3 @@
+export const PAGE_CONFIG_KEYS = ['api_key', 'author_s3', 'category_id', 'identifier', 'integration', 'language', 'remote_auth_s3', 'slug', 'title', 'url']
+export const SSO_KEYS = ['name', 'button', 'icon', 'url', 'logout', 'width', 'height']
+export const CALLBACKS = ['afterRender', 'onInit', 'onIdentify', 'beforeComment', 'onNewComment', 'onPaginate', 'onReady', 'preData', 'preInit', 'preReset']
diff --git a/src/utils.js b/src/utils.js
@@ -1,5 +1 @@
-export const allowedPageConfigKeys = ['api_key', 'author_s3', 'category_id', 'identifier', 'integration', 'language', 'remote_auth_s3', 'slug', 'title', 'url']
-export const allowedSSOKeys = ['name', 'button', 'icon', 'url', 'logout', 'width', 'height']
-export const callbacks = ['afterRender', 'onInit', 'onIdentify', 'beforeComment', 'onNewComment', 'onPaginate', 'onReady', 'preData', 'preInit', 'preReset']
-
 export const getEmitName = str => str.replace(/([a-z0-9])([A-Z])/g, '$1-$2').toLowerCase().replace('on-', '')