fix: #285 close dialog doesnt work in electron

quasarframework · Dec 27, 2016 · 1781111 · 1781111
1 parent 493ffbd
commit 1781111
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/features/platform.js b/src/features/platform.js
@@ -156,7 +156,7 @@ function getPlatform () {
   return browser
 }
 
-export default {
+const Platform = {
   is: getPlatform(),
   has: {
     touch: (() => !!('ontouchstart' in document.documentElement) || window.navigator.msMaxTouchPoints > 0)()
@@ -165,3 +165,6 @@ export default {
     iframe: window.self !== window.top
   }
 }
+
+Platform.has.popstate = !Platform.within.iframe && !Platform.is.electron
+export default Platform
diff --git a/src/vue-components/modal/Modal.vue b/src/vue-components/modal/Modal.vue
@@ -68,7 +68,7 @@ export default {
 
       this.__popstate = () => {
         if (
-          !Platform.within.iframe &&
+          Platform.has.popstate &&
           window.history.state &&
           window.history.state.modalId &&
           window.history.state.modalId >= this.__modalId
@@ -79,7 +79,7 @@ export default {
         EscapeKey.pop()
         this.active = false
 
-        if (!Platform.within.iframe) {
+        if (Platform.has.popstate) {
           window.removeEventListener('popstate', this.__popstate)
         }
 
@@ -103,7 +103,7 @@ export default {
 
       this.active = true
       this.__modalId = ++openedModalNumber
-      if (!Platform.within.iframe) {
+      if (Platform.has.popstate) {
         window.history.pushState({modalId: this.__modalId}, '')
         window.addEventListener('popstate', this.__popstate)
       }
@@ -118,7 +118,7 @@ export default {
     close (onClose) {
       this.__onClose = onClose
 
-      if (Platform.within.iframe) {
+      if (!Platform.has.popstate) {
         this.__popstate()
       }
       else {