@factor/app
Advanced tools
Comparing version 1.7.8 to 1.7.9
@@ -12,3 +12,3 @@ /* eslint-disable import/no-unresolved */ | ||
icon: (): string => require("__FIND__/static/icon.svg"), | ||
blankUser: "https://fiction-com.s3-us-west-1.amazonaws.com/user-blank-2.png", | ||
avatarDefault: "https://fiction-com.s3-us-west-1.amazonaws.com/user-blank-2.png", | ||
templatePath: "__FIND__/index.html", | ||
@@ -15,0 +15,0 @@ faviconPath: "__FIND__/static/favicon.png", |
{ | ||
"name": "@factor/app", | ||
"version": "1.7.8", | ||
"version": "1.7.9", | ||
"license": "GPL-2.0", | ||
@@ -15,3 +15,3 @@ "publishConfig": { | ||
}, | ||
"gitHead": "6d683fba432df91052bf221122d088a7811a773b" | ||
"gitHead": "2d8956306076602e17937d5430236bacd5660482" | ||
} |
@@ -6,8 +6,10 @@ import { applyFilters, runCallbacks, addFilter } from "@factor/api/hooks" | ||
import qs from "qs" | ||
import { uniq } from "@factor/api" | ||
import { uniq, getGlobalThis } from "@factor/api" | ||
let __initialPageLoad = true | ||
let __routerInstance: VueRouter | ||
const GLOBALS = getGlobalThis() as any | ||
GLOBALS.__routerInstance = "" | ||
declare module "vue/types/vue" { | ||
@@ -150,3 +152,3 @@ export interface VueConstructor { | ||
__routerInstance = router | ||
GLOBALS.__routerInstance = router | ||
@@ -157,3 +159,3 @@ return router | ||
export const getRouter = (): VueRouter => { | ||
return __routerInstance | ||
return GLOBALS.__routerInstance | ||
} | ||
@@ -165,3 +167,3 @@ | ||
export const setRouter = (r: VueRouter): void => { | ||
__routerInstance = r | ||
GLOBALS.__routerInstance = r | ||
} | ||
@@ -168,0 +170,0 @@ |
@@ -22,2 +22,5 @@ import { runCallbacks, applyFilters, stored } from "@factor/api" | ||
// In testing sometimes we don't want to bother with routes | ||
if (!route) return "factor-app" | ||
const { meta = {} } = route.matched.find((_: Route) => _.meta.ui) || {} | ||
@@ -24,0 +27,0 @@ |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
66063
853