refactor: clean up unneded code

rigor789 · rigor789 · commit 0f39da64d516 · 2018-07-20T15:46:28.000+02:00
diff --git a/platform/nativescript/plugins/router-plugin.js b/platform/nativescript/plugins/router-plugin.js
@@ -1,16 +1,13 @@
-//import { before } from '../util/index'
-//import { Page } from 'tns-core-modules/ui/page'
 import { android } from 'tns-core-modules/application'
 import { isPlainObject } from 'shared/util'
 
 const properties = ['stack', 'index', 'current']
 
 class NativeScriptHistory {
-  constructor(router, history, VueInstance) {
+  constructor(router, history) {
     this.router = router
     this.history = history
     this.isGoingBack = false
-    this._Vue = VueInstance
 
     if (android) {
       android.on('activityBackPressed', function(args) {
@@ -48,14 +45,14 @@ class NativeScriptHistory {
   }
 
   push(...args) {
-    ({ args, entry: this.currentEntry } = this._buildEntry(args))
+    ;({ args, entry: this.currentEntry } = this._buildEntry(args))
 
     this.isGoingBack = false
     this.history.push.call(this.history, ...args)
   }
 
   replace(...args) {
-    ({ args, entry: this.currentEntry } = this._buildEntry(args))
+    ;({ args, entry: this.currentEntry } = this._buildEntry(args))
 
     this.isGoingBack = false
     this.history.replace.call(this.history, ...args)
@@ -102,14 +99,14 @@ class NativeScriptHistory {
   }
 }
 
-export function patchDefaultRouter(router, Vue) {
+export function patchDefaultRouter(router) {
   if (router.__patched_for_routing__) {
     return
   }
 
   router.__patched_for_routing__ = true
 
-  router.history = new NativeScriptHistory(router, router.history, Vue)
+  router.history = new NativeScriptHistory(router, router.history)
 
   router.push = function push(...args) {
     this.history.push(...args)
@@ -132,104 +129,6 @@ export function patchDefaultRouter(router, Vue) {
   }
 }
 
-//export function patchRouter(router, Vue) {
-//  if (router.__patched_for_page_routing__) {
-//    return
-//  }
-//  router.__patched_for_page_routing__ = true
-//
-//  // The problem: When using router.replace() to set the initial route
-//  // the history index stays -1, which then causes an issue when visiting a route,
-//  // going back, and then trying to visit again (the active route is not changed on nav back)
-//  // This fixes it, since it allows the router.go logic to run
-//  router.history.index = 0
-//
-//  // initial navigation states
-//  router.isBackNavigation = false
-//  router.shouldNavigate = true
-//  router.pageStack = []
-//  router.pageTransition = null
-//
-//  router.setPageTransition = (transition, duration, curve) => {
-//    if (typeof transition === 'string') {
-//      return (router.pageTransition = {
-//        name: transition,
-//        duration,
-//        curve
-//      })
-//    }
-//
-//    router.pageTransition = transition
-//  }
-//
-//  router._beginBackNavigation = (shouldNavigate = true) => {
-//    if (router.isBackNavigation) {
-//      throw new Error(
-//        'router._beginBackNavigation was called while already navigating back.'
-//      )
-//    }
-//
-//    router.isBackNavigation = true
-//    router.shouldNavigate = shouldNavigate
-//  }
-//
-//  router._finishBackNavigation = () => {
-//    if (!router.isBackNavigation) {
-//      throw new Error(
-//        'router._finishBackNavigation was called while there was no back navigation.'
-//      )
-//    }
-//
-//    router.isBackNavigation = false
-//  }
-//
-//  router.go = before(router.go, router, n => {
-//    if (n === -1 && !router.isBackNavigation) {
-//      router._beginBackNavigation()
-//    }
-//  })
-//
-//  router.afterEach(() => {
-//    if (router.isBackNavigation) {
-//      if (router.shouldNavigate) {
-//        Vue.navigateBack()
-//      }
-//      router.pageStack.pop()
-//      const page = router.pageStack[router.pageStack.length - 1]
-//
-//      const callback = ({ isBackNavigation }) => {
-//        if (isBackNavigation) {
-//          router._finishBackNavigation()
-//        }
-//        page.off(Page.navigatedToEvent, callback)
-//      }
-//
-//      page.on(Page.navigatedToEvent, callback)
-//
-//      return
-//    }
-//
-//    const component = router.getMatchedComponents()[0]
-//
-//    router.app
-//      .$navigateTo(component, {
-//        context: { router },
-//        transition: router.pageTransition
-//        // Todo: add transitionAndroid and transitionIOS
-//      })
-//      .then(page => {
-//        router.pageStack.push(page)
-//
-//        page.on(Page.navigatedFromEvent, ({ isBackNavigation }) => {
-//          if (isBackNavigation && !router.isBackNavigation) {
-//            router._beginBackNavigation(false)
-//            router.back()
-//          }
-//        })
-//      })
-//  })
-//}
-
 export default {
   install(Vue) {
     Vue.mixin({
@@ -239,41 +138,7 @@ export default {
           return
         }
 
-        const router = this.$options.router
-        //const isPageRouting = router.options.pageRouting
-        //const self = this
-
-        //if (isPageRouting) {
-        //  patchRouter(router, Vue)
-        //} else {
-        patchDefaultRouter(router, Vue)
-
-        //  return
-        //}
-        //
-        //// Overwrite the default $start function
-        //this.$start = () => {
-        //  this.__is_root__ = true
-        //  this.__started__ = true // skips the default start procedure
-        //  this.$options.render = () => {} // removes warning for no render / template
-        //
-        //  // Mount the root component
-        //  const placeholder = Vue.$document.createComment('placeholder')
-        //  self.$mount(placeholder)
-        //
-        //  const initial = router.getMatchedComponents()[0]
-        //
-        //  this.$navigateTo(
-        //    initial,
-        //    {
-        //      context: { router },
-        //      clearHistory: true
-        //    },
-        //    page => {
-        //      router.pageStack.push(page)
-        //    }
-        //  )
-        //}
+        patchDefaultRouter(this.$options.router)
       }
     })
   }
diff --git a/platform/nativescript/runtime/components/frame.js b/platform/nativescript/runtime/components/frame.js
@@ -1,12 +1,11 @@
 import { setFrame, getFrame, deleteFrame } from '../../util/frame'
-import { PAGE_REF } from './page'
 import { extend } from 'shared/util'
 import { ios } from 'tns-core-modules/application'
 
 let idCounter = 1
 
 const propMap = {
-  'transition': 'transition',
+  transition: 'transition',
   'ios:transition': 'transitioniOS',
   'android:transition': 'transitionAndroid'
 }
@@ -54,20 +53,13 @@ export default {
     deleteFrame(this.properties.id)
   },
   render(h) {
-    let vnode = this.$slots.default
-
-    if (this.hasRouterView && this.isBackNavigation) {
-      this.isBackNavigation = false
-      vnode = this.$el.nativeView.currentPage[PAGE_REF] || vnode
-    }
-
     return h(
       'NativeFrame',
       {
         attrs: this.properties,
         on: this.$listeners
       },
-      vnode
+      this.$slots.default
     )
   },
   methods: {
@@ -98,7 +90,7 @@ export default {
     notifyPageMounted(pageVm) {
       this.$nextTick(_ =>
         this.navigate({
-          create: _ => pageVm.$el.nativeView
+          create: () => pageVm.$el.nativeView
         })
       )
     },
@@ -109,11 +101,6 @@ export default {
     },
 
     navigate(entry, back = this.isGoingBack) {
-      if (this.isBackNavigation) {
-        console.log('skipping navigate()')
-        return
-      }
-
       const frame = this._getFrame()
 
       if (back || (ios && this.isGoingBack === undefined)) {
diff --git a/platform/nativescript/runtime/components/page.js b/platform/nativescript/runtime/components/page.js
@@ -13,7 +13,9 @@ export default {
     )
   },
   created() {
-    this.$vnode.parent.data.keepAlive = true
+    if (this.$router) {
+      this.$vnode.parent.data.keepAlive = true
+    }
   },
   mounted() {
     this.$el.nativeView[PAGE_REF] = this
@@ -28,6 +30,10 @@ export default {
       if (e.isBackNavigation) {
         this.$el.nativeView.off('navigatedFrom', handler)
 
+        if (!this.$router) {
+          return this.$parent.$destroy()
+        }
+
         if (ios) {
           this._findParentFrame().isGoingBack = undefined
           const history = this.$router.history.history
