put public_folder config in parity with original ember version

2016-08-30 11:18:14 -03:00
parent a1c01323e0
commit c7544cc0a2
2 changed files with 9 additions and 8 deletions
--- a/src/actions/config.js
+++ b/src/actions/config.js
@ -70,12 +70,13 @@ function parseConfig(data) {
    }
  }

-  if ('media_folder' in config && typeof config.media_folder === 'string') {
-    // Parse source & public paths for media folder.
-    config.media_folder = {
-      path: config.media_folder,
-      public_path: config.media_folder
-    };
+  if (!('public_folder' in config)) {
+    // Make sure there is a public folder
+    config.public_folder = config.media_folder;
+  }
+
+  if (config.public_folder.charAt(0) !== '/') {
+    config.public_folder = '/' + config.public_folder;
  }

  return config;