Merge branch 'master' of github.com:nativescript-vue/nativescript-vue

rigor789 · rigor789 · commit db0f680fbe5e · 2018-03-12T21:00:58.000+01:00
diff --git a/platform/nativescript/plugins/modal-plugin.js b/platform/nativescript/plugins/modal-plugin.js
@@ -33,7 +33,7 @@ export default {
         this.$root.$el.nativeView.showModal(
           modalPage,
           null,
-          resolve,
+          vm.$modal.close,
           options.fullscreen
         )
       })
diff --git a/platform/nativescript/runtime/index.js b/platform/nativescript/runtime/index.js
@@ -59,7 +59,7 @@ const mount = function(el, hydrating) {
       }
     })
   } else {
-    mountComponent(this, el, hydrating)
+    return mountComponent(this, el, hydrating)
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ export default {`
`33`	`33`	`this.$root.$el.nativeView.showModal(`
`34`	`34`	`modalPage,`
`35`	`35`	`null,`
`36`		`- resolve,`
	`36`	`+ vm.$modal.close,`
`37`	`37`	`options.fullscreen`
`38`	`38`	`)`
`39`	`39`	`})`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ const mount = function(el, hydrating) {`
`59`	`59`	`}`
`60`	`60`	`})`
`61`	`61`	`} else {`
`62`		`- mountComponent(this, el, hydrating)`
	`62`	`+ return mountComponent(this, el, hydrating)`
`63`	`63`	`}`
`64`	`64`	`}`
`65`	`65`