fix: Various fixes in Quasar plugins

angelomedeiros · Jul 15, 2018 · f8dfc94 · f8dfc94
1 parent 9654766
commit f8dfc94
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 65 deletions.
diff --git a/dev-umd/index.mat.umd.html b/dev-umd/index.mat.umd.html
@@ -67,13 +67,17 @@
     <script>
       // optional
       window.quasarConfig = {
+        brand: {
+          primary: '#ff0000'
+        }
       }
     </script>
     <script src="dist/umd/quasar.mat.umd.js"></script>
     <script src="dist/umd/i18n.es.umd.min.js"></script>
 
     <script>
       Quasar.i18n.set(Quasar.i18n.es)
+      Quasar.plugins.Notify.create('Startup notification')
 
       new Vue({
         el: '#q-app',

diff --git a/src/body.js b/src/body.js
@@ -1,4 +1,3 @@
-import { ready } from './utils/dom.js'
 import { setBrand } from './utils/colors.js'
 import { isSSR } from './plugins/platform.js'
 
@@ -70,11 +69,7 @@ export default {
       return
     }
 
-    const init = cfg.brand && document.body
-    init && setColors(cfg.brand)
-    ready(() => {
-      !init && setColors(cfg.brand)
-      bodyInit($q.platform, cfg)
-    })
+    cfg.brand && setColors(cfg.brand)
+    bodyInit($q.platform, cfg)
   }
 }
diff --git a/src/i18n.js b/src/i18n.js
@@ -1,6 +1,5 @@
 import langEn from '../i18n/en-us.js'
 import { isSSR } from './plugins/platform.js'
-import { ready } from './utils/dom.js'
 
 export default {
   install ($q, queues, Vue, lang) {
@@ -30,11 +29,9 @@ export default {
       lang.rtl = lang.rtl || false
 
       if (!isSSR) {
-        ready(() => {
-          const el = document.documentElement
-          el.setAttribute('dir', lang.rtl ? 'rtl' : 'ltr')
-          el.setAttribute('lang', lang.lang)
-        })
+        const el = document.documentElement
+        el.setAttribute('dir', lang.rtl ? 'rtl' : 'ltr')
+        el.setAttribute('lang', lang.lang)
       }
 
       if (isSSR || $q.i18n) {

diff --git a/src/plugins/addressbar-color.js b/src/plugins/addressbar-color.js
@@ -1,5 +1,4 @@
 import Platform, { isSSR } from './platform.js'
-import { ready } from '../utils/dom.js'
 import { getBrand } from '../utils/colors.js'
 
 let metaValue
@@ -41,31 +40,31 @@ function setColor (hexColor) {
   metaTag.setAttribute('content', hexColor)
 
   if (newTag) {
-    document.getElementsByTagName('HEAD')[0].appendChild(metaTag)
+    document.head.appendChild(metaTag)
   }
 }
 
 export default {
-  install ({ $q, Vue }) {
+  install ({ $q, Vue, cfg }) {
     this.set = !isSSR && Platform.is.mobile && (
       Platform.is.cordova ||
       Platform.is.winphone || Platform.is.safari ||
       Platform.is.webkit || Platform.is.vivaldi
     )
       ? hexColor => {
-        ready(() => {
-          const val = hexColor || getBrand('primary')
+        const val = hexColor || getBrand('primary')
 
-          if (Platform.is.cordova && window.StatusBar) {
-            window.StatusBar.backgroundColorByHexString(val)
-          }
-          else {
-            setColor(val)
-          }
-        })
+        if (Platform.is.cordova && window.StatusBar) {
+          window.StatusBar.backgroundColorByHexString(val)
+        }
+        else {
+          setColor(val)
+        }
       }
       : () => {}
 
     $q.addressbarColor = this
+
+    cfg.addressbarColor && this.set(cfg.addressbarColor)
   }
 }
diff --git a/src/plugins/meta.js b/src/plugins/meta.js
@@ -40,6 +40,14 @@ function changed (old, def) {
   }
 }
 
+function bodyFilter (name) {
+  return !['class', 'style'].includes(name)
+}
+
+function htmlFilter (name) {
+  return !['lang', 'dir'].includes(name)
+}
+
 function diff (meta, other) {
   let add = {}, remove = {}
 
@@ -89,10 +97,10 @@ function apply ({ add, remove }) {
     remove.link.forEach(name => {
       document.head.querySelector(`link[data-qmeta="${name}"]`).remove()
     })
-    remove.htmlAttr.forEach(name => {
+    remove.htmlAttr.filter(htmlFilter).forEach(name => {
       document.documentElement.removeAttribute(name)
     })
-    remove.bodyAttr.forEach(name => {
+    remove.bodyAttr.filter(bodyFilter).forEach(name => {
       document.body.removeAttribute(name)
     })
   }
@@ -109,27 +117,20 @@ function apply ({ add, remove }) {
       document.head.appendChild(tag)
     }
   })
-  Object.keys(add.htmlAttr).forEach(name => {
+  Object.keys(add.htmlAttr).filter(htmlFilter).forEach(name => {
     document.documentElement.setAttribute(name, add.htmlAttr[name] || '')
   })
-  Object.keys(add.bodyAttr).forEach(name => {
+  Object.keys(add.bodyAttr).filter(bodyFilter).forEach(name => {
     document.body.setAttribute(name, add.bodyAttr[name] || '')
   })
 }
 
-function merge (main, { title, titleTemplate, ...other }) {
-  title && (main.title = title)
-  titleTemplate && (main.titleTemplate = titleTemplate)
-
-  extend(true, main, other)
-}
-
 function parseMeta (component, meta) {
   if (component._inactive) { return }
 
   const hasMeta = component.$options.meta
   if (hasMeta) {
-    merge(meta, component.__qMeta)
+    extend(true, meta, component.__qMeta)
     if (hasMeta.stopPropagation) { return }
   }
 
@@ -200,12 +201,12 @@ function getServerMeta (app, html) {
 
   const tokens = {
     '%%Q_HTML_ATTRS%%': Object.keys(meta.htmlAttr)
-      .filter(name => !['lang', 'dir'].includes(name))
+      .filter(htmlFilter)
       .map(getAttr(meta.htmlAttr))
       .join(' '),
     '%%Q_HEAD_TAGS%%': getHead(meta),
     '%%Q_BODY_ATTRS%%': Object.keys(meta.bodyAttr)
-      .filter(name => name !== 'class')
+      .filter(bodyFilter)
       .map(getAttr(meta.bodyAttr))
       .join(' '),
     '%%Q_BODY_TAGS%%': Object.keys(meta.noscript)

diff --git a/src/plugins/notify.js b/src/plugins/notify.js
@@ -13,13 +13,6 @@ const positionList = [
 ]
 
 function init ({ Vue }) {
-  if (!document.body) {
-    ready(() => {
-      init.call(this, { Vue })
-    })
-    return
-  }
-
   const node = document.createElement('div')
   document.body.appendChild(node)
 
@@ -167,25 +160,6 @@ function init ({ Vue }) {
 export default {
   create (opts) {
     if (isSSR) { return () => {} }
-
-    if (!document.body) {
-      let
-        cancelled = false,
-        cancelFn = () => {},
-        cancelFnWrapper = () => {
-          cancelled = true
-          cancelFn()
-        }
-
-      ready(() => {
-        if (!cancelled) {
-          cancelFn = this.create(opts)
-        }
-      })
-
-      return cancelFnWrapper
-    }
-
     return this.__vm.add(opts)
   },
   setDefaults (opts) {