closes #533 - Material navbar not initialized properly

scriptPilot · May 16, 2017 · 19582c5 · 19582c5
1 parent 0f1fffd
commit 19582c5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,12 @@
 
 <br />
 
+## Next version
+
+### Bug-fixes
+
+- [x] [#533 - Material navbar not initialized properly](https://github.com/scriptPilot/app-framework/issues/533)
+
 ## Version 1.6.0
 
 Released on 2017-05-16

diff --git a/lib/app.js b/lib/app.js
@@ -1140,7 +1140,7 @@ function initF7VueApp () {
   // Load Framework7-Vue (with workaround for theme integration)
   let config = require(process.env.APP_ROOT_FROM_SCRIPTS + 'config.json')
   let theme = (/^(ios|material)$/.test(window.localStorage.theme) && config.theme.split('-').indexOf(window.localStorage.theme) >= 0)
-            ? window.localStorage.theme : config.theme
+            ? window.localStorage.theme : config.theme.split('-')[0]
   vue.use(require('../vendor/framework7-vue/framework7-vue.js'), {theme: theme})
   // Load app component
   let appComponent = require(process.env.APP_ROOT_FROM_SCRIPTS + 'app.vue')