Updates for plugins (including Platform)

Author: rstoenescu

src/install.js

@@ -26,13 +26,16 @@ export default function (_Vue, opts = {}) {
   this.installed = true
 
   setVue(_Vue)
-  ready(addBodyClasses)
 
   const Quasar = {
     version,
     theme: __THEME__
   }
 
+  // required plugin
+  Platform.install({ Quasar })
+  ready(addBodyClasses)
+
   if (opts.directives) {
     Object.keys(opts.directives).forEach(key => {
       const d = opts.directives[key]
@@ -50,9 +53,6 @@ export default function (_Vue, opts = {}) {
     })
   }
   if (opts.plugins) {
-    // required plugin
-    Platform.install({ Quasar })
-
     Object.keys(opts.plugins).forEach(key => {
       const p = opts.plugins[key]
       if (typeof p.install === 'function') {

src/plugins.js

@@ -2,7 +2,6 @@ import AddressbarColor from './plugins/addressbar-color'
 import AppFullscreen from './plugins/app-fullscreen'
 import AppVisibility from './plugins/app-visibility'
 import Cookies from './plugins/cookies'
-import Cordova from './plugins/cordova'
 import Platform from './plugins/platform'
 import { LocalStorage, SessionStorage } from './plugins/web-storage'
 
@@ -11,7 +10,6 @@ export {
   AppFullscreen,
   AppVisibility,
   Cookies,
-  Cordova,
   Platform,
   LocalStorage,
   SessionStorage

src/plugins/cordova.js

@@ -164,19 +164,19 @@ function getPlatform () {
 }
 
 const Platform = {
-  is: getPlatform(),
-  has: {
-    touch: (() => !!('ontouchstart' in document.documentElement) || window.navigator.msMaxTouchPoints > 0)()
-  },
-  within: {
-    iframe: window.self !== window.top
-  },
-
   __installed: false,
   install ({ Quasar }) {
     if (this.__installed) { return }
     this.__installed = true
 
+    Platform.is = getPlatform()
+    Platform.has = {
+      touch: (() => !!('ontouchstart' in document.documentElement) || window.navigator.msMaxTouchPoints > 0)()
+    }
+    Platform.within = {
+      iframe: window.self !== window.top
+    }
+
     Quasar.platform = Platform
   }
 }

src/plugins/platform.js

@@ -2,24 +2,31 @@ import Platform from '../plugins/platform'
 
 let handlers = []
 
-if (Platform.is.desktop) {
-  window.addEventListener('keyup', evt => {
-    if (handlers.length === 0) {
-      return
-    }
+export default {
+  __installed: false,
+  __install () {
+    this.__installed = true
+    window.addEventListener('keyup', evt => {
+      if (handlers.length === 0) {
+        return
+      }
 
-    if (evt.which === 27 || evt.keyCode === 27) {
-      handlers[handlers.length - 1]()
-    }
-  })
-}
+      if (evt.which === 27 || evt.keyCode === 27) {
+        handlers[handlers.length - 1]()
+      }
+    })
+  },
 
-export default {
   register (handler) {
     if (Platform.is.desktop) {
+      if (!this.__installed) {
+        this.__install()
+      }
+
       handlers.push(handler)
     }
   },
+
   pop () {
     if (Platform.is.desktop) {
       handlers.pop()