Moving asgardcms related variables to the AsgardCMS namespace

AsgardCms · Sep 16, 2017 · 6d9d661 · 6d9d661
1 parent fcb29ed
commit 6d9d661
Show file tree

Hide file tree

Showing 5 changed files with 34,395 additions and 34,394 deletions.
diff --git a/Modules/Page/Assets/js/PageRoutes.js b/Modules/Page/Assets/js/PageRoutes.js
@@ -2,7 +2,7 @@ import PageTable from './components/PageTable.vue'
 import PageTableServerSide from './components/PageTableServerSide.vue'
 import PageForm from './components/PageForm.vue'
 
-const locales = window.locales;
+const locales = window.AsgardCMS.locales;
 
 export default [
     {

diff --git a/Themes/Adminlte/views/layouts/master.blade.php b/Themes/Adminlte/views/layouts/master.blade.php
@@ -75,11 +75,10 @@
 @endforeach
 <script>
     window.AsgardCMS = {
-        translations: {!! json_encode(['page' => array_dot(trans('page::pages')), 'core' => array_dot(trans('core::core'))]) !!}
+        translations: {!! json_encode(['page' => array_dot(trans('page::pages')), 'core' => array_dot(trans('core::core'))]) !!},
+        locales: {!! json_encode(LaravelLocalization::getSupportedLocales()) !!},
+        currentLocale: '{{ locale() }}',
     };
-
-    window.locales = {!! json_encode(LaravelLocalization::getSupportedLocales()) !!}
-    window.currentLocale = '{{ locale() }}';
 </script>
 
 <script src="{{ mix('js/app.js') }}"></script>