From 2799f62be8a337ce052d4a773ecb8ad3422d1624 Mon Sep 17 00:00:00 2001 From: Tobias Klika Date: Sat, 11 Apr 2020 17:45:39 +0200 Subject: [PATCH] move basic stuff into ZeroVue config which is loaded by vue on startup --- zero.Web/App/Components/tree.vue | 4 +- zero.Web/App/Services/localization.js | 16 +-- zero.Web/App/navigation.vue | 72 +++-------- zero.Web/Startup.cs | 3 +- zero.Web/Views/Index.cshtml | 13 +- zero.Web/ZeroVue.cs | 170 ++++++++++++++++++++++++++ zero.Web/zero.Web.csproj | 4 + 7 files changed, 203 insertions(+), 79 deletions(-) create mode 100644 zero.Web/ZeroVue.cs diff --git a/zero.Web/App/Components/tree.vue b/zero.Web/App/Components/tree.vue index 0aa48949..094b316f 100644 --- a/zero.Web/App/Components/tree.vue +++ b/zero.Web/App/Components/tree.vue @@ -117,7 +117,7 @@ font-size: var(--font-size); padding: 0 var(--padding); height: 50px; - color: var(--color-fg-reverse-mid); + color: var(--color-fg); position: relative; transition: color 0.2s ease; @@ -147,7 +147,7 @@ height: 100%; align-items: center; position: relative; - color: var(--color-fg-mid); + color: var(--color-fg); &:hover { diff --git a/zero.Web/App/Services/localization.js b/zero.Web/App/Services/localization.js index 9a64b608..5a8cc9f4 100644 --- a/zero.Web/App/Services/localization.js +++ b/zero.Web/App/Services/localization.js @@ -2,8 +2,6 @@ import { extend as _extend, each as _each } from 'underscore'; export default { - cache: zero.translations, - localize(key, options) { let params = _extend({ @@ -24,19 +22,9 @@ export default { } key = hasAtSign ? key.slice(1) : key; - let value = this.cache; + const value = zero.translations[key]; - for (let part of key.split('.')) - { - if (!value[part]) - { - break; - } - - value = value[part]; - } - - if (!value || value === this.cache || typeof value !== 'string') + if (!value || typeof value !== 'string') { return '[' + key + ']'; } diff --git a/zero.Web/App/navigation.vue b/zero.Web/App/navigation.vue index c6b010eb..4a9f6f88 100644 --- a/zero.Web/App/navigation.vue +++ b/zero.Web/App/navigation.vue @@ -12,14 +12,14 @@