Error with asset resolver

2026-07-17 11:33:39 +08:00 · 2017-01-24 17:27:05 -03:00
parent 33ec0798e9
commit 5750758cf1
1 changed files with 1 additions and 3 deletions
@@ -5,13 +5,11 @@ const Asset = {
  settings({settings = null}, _, {loaders}) {
    return loaders.Settings.load()
      .then((globalSettings) => {
-
        if (settings) {
-          settings = Object.assign({}, settings, globalSettings.toObject());
+          settings = Object.assign({}, globalSettings.toObject(), settings);
        } else {
          settings = globalSettings.toObject();
        }
-
        return settings;
      });
  }