Do not use <base> tag for none or hash.

ember-cli · Apr 29, 2014 · de7c6bc · de7c6bc
1 parent 449ac70
commit de7c6bc
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/blueprint/app/router.js b/blueprint/app/router.js
@@ -1,5 +1,5 @@
 var Router = Ember.Router.extend({
-  location: 'auto'
+  location: ENV.locationType
 });
 
 Router.map(function() {

diff --git a/blueprint/config/environment.js b/blueprint/config/environment.js
@@ -1,6 +1,7 @@
 module.exports = function(environment) {
   var ENV = {
     baseURL: '/',
+    locationType: 'auto',
     FEATURES: {
       // Here you can enable experimental features on an ember canary build
       // e.g. 'with-controller': true

diff --git a/lib/broccoli/ember-app.js b/lib/broccoli/ember-app.js
@@ -223,7 +223,13 @@ function injectENVJson(fn, env, tree, files) {
   };
 
   var baseTag = function(){
-    var baseURL = fn(env).baseURL;
+    var env          = fn(env);
+    var baseURL      = env.baseURL;
+    var locationType = env.locationType;
+
+    if (locationType === 'hash' || locationType === 'none') {
+      return '';
+    }
 
     if (baseURL && baseURL !== '') {
       return '<base href="' + baseURL + '" />';