diff options
| author | kibigo! <marrus-sh@users.noreply.github.com> | 2017-11-21 18:17:38 -0800 |
|---|---|---|
| committer | kibigo! <marrus-sh@users.noreply.github.com> | 2017-11-21 18:17:38 -0800 |
| commit | 8812bab6875024f76c59ab43d1dd3717e5e6da68 (patch) | |
| tree | 772639d7386a689befd98cb454ad4247b9ec5737 | |
| parent | bdbbd06dad298dc3e1a5f568f4a3ff3635b48f22 (diff) | |
Minor fixes
| -rw-r--r-- | app/javascript/themes/win95/theme.yml | 5 | ||||
| -rw-r--r-- | app/views/layouts/embedded.html.haml | 3 | ||||
| -rw-r--r-- | config/webpack/configuration.js | 2 |
3 files changed, 2 insertions, 8 deletions
diff --git a/app/javascript/themes/win95/theme.yml b/app/javascript/themes/win95/theme.yml index 43af38198..c4ac8aa55 100644 --- a/app/javascript/themes/win95/theme.yml +++ b/app/javascript/themes/win95/theme.yml @@ -13,11 +13,6 @@ pack: stylesheet: true # All unspecified packs will inherit from glitch. -# By default, the glitch preloads will also be used here. You can -# disable them by setting `preload` to `null`. - -# preload: - # The `fallback` parameter tells us to use glitch files for everything # we haven't specified. fallback: glitch diff --git a/app/views/layouts/embedded.html.haml b/app/views/layouts/embedded.html.haml index 3960167bf..935670514 100644 --- a/app/views/layouts/embedded.html.haml +++ b/app/views/layouts/embedded.html.haml @@ -4,8 +4,7 @@ %meta{ charset: 'utf-8' }/ %meta{ name: 'robots', content: 'noindex' }/ - = javascript_pack_tag 'common', integrity: true, crossorigin: 'anonymous' - = javascript_pack_tag 'embed', integrity: true, crossorigin: 'anonymous' + = javascript_pack_tag "locales", integrity: true, crossorigin: 'anonymous' = javascript_pack_tag "locale_#{I18n.locale}", integrity: true, crossorigin: 'anonymous' = render partial: 'layouts/theme', object: @core = render partial: 'layouts/theme', object: @theme diff --git a/config/webpack/configuration.js b/config/webpack/configuration.js index 9514bc547..f8741c5d8 100644 --- a/config/webpack/configuration.js +++ b/config/webpack/configuration.js @@ -28,7 +28,7 @@ for (let i = 0; i < themeFiles.length; i++) { if (!data.pack_directory) { data.pack_directory = dirname(themeFile); } - if (data.pack) { + if (data.pack && typeof data.pack == 'object') { themes[data.name] = data; } } |