Do not error when logging long module names.

Fixes ember-cli#35.
rwjblue · Mar 24, 2014 · d461e7c · d461e7c
1 parent e2acb29
commit d461e7c
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 10 deletions.
diff --git a/dist/ember-resolver-spade.js b/dist/ember-resolver-spade.js
diff --git a/dist/ember-resolver.js b/dist/ember-resolver.js
@@ -101,12 +101,18 @@ define("ember/resolver",
 
   function logLookup(found, parsedName, moduleName) {
     if (Ember.ENV.LOG_MODULE_RESOLVER) {
-      var symbol;
+      var symbol, padding;
 
       if (found) { symbol = '[✓]'; }
       else       { symbol = '[ ]'; }
 
-      Ember.Logger.info(symbol, parsedName.fullName, new Array(40 - parsedName.fullName.length).join('.'), moduleName);
+      if (parsedName.fullName.length > 60) {
+        padding = '.';
+      } else {
+        padding = new Array(60 - parsedName.fullName.length).join('.');
+      }
+
+      Ember.Logger.info(symbol, parsedName.fullName, padding, moduleName);
     }
   }
 

diff --git a/dist/ember-resolver.min.js b/dist/ember-resolver.min.js
diff --git a/dist/ember-resolver.prod.js b/dist/ember-resolver.prod.js
@@ -101,12 +101,18 @@ define("ember/resolver",
 
   function logLookup(found, parsedName, moduleName) {
     if (Ember.ENV.LOG_MODULE_RESOLVER) {
-      var symbol;
+      var symbol, padding;
 
       if (found) { symbol = '[✓]'; }
       else       { symbol = '[ ]'; }
 
-      Ember.Logger.info(symbol, parsedName.fullName, new Array(40 - parsedName.fullName.length).join('.'), moduleName);
+      if (parsedName.fullName.length > 60) {
+        padding = '.';
+      } else {
+        padding = new Array(60 - parsedName.fullName.length).join('.');
+      }
+
+      Ember.Logger.info(symbol, parsedName.fullName, padding, moduleName);
     }
   }
 

diff --git a/dist/modules/ember-resolver.js b/dist/modules/ember-resolver.js
@@ -91,12 +91,18 @@ define("ember/resolver",
 
   function logLookup(found, parsedName, moduleName) {
     if (Ember.ENV.LOG_MODULE_RESOLVER) {
-      var symbol;
+      var symbol, padding;
 
       if (found) { symbol = '[✓]'; }
       else       { symbol = '[ ]'; }
 
-      Ember.Logger.info(symbol, parsedName.fullName, new Array(40 - parsedName.fullName.length).join('.'), moduleName);
+      if (parsedName.fullName.length > 60) {
+        padding = '.';
+      } else {
+        padding = new Array(60 - parsedName.fullName.length).join('.');
+      }
+
+      Ember.Logger.info(symbol, parsedName.fullName, padding, moduleName);
     }
   }
 

diff --git a/packages/ember-resolver/lib/core.js b/packages/ember-resolver/lib/core.js
@@ -90,12 +90,18 @@ define("ember/resolver",
 
   function logLookup(found, parsedName, moduleName) {
     if (Ember.ENV.LOG_MODULE_RESOLVER) {
-      var symbol;
+      var symbol, padding;
 
       if (found) { symbol = '[✓]'; }
       else       { symbol = '[ ]'; }
 
-      Ember.Logger.info(symbol, parsedName.fullName, new Array(40 - parsedName.fullName.length).join('.'), moduleName);
+      if (parsedName.fullName.length > 60) {
+        padding = '.';
+      } else {
+        padding = new Array(60 - parsedName.fullName.length).join('.');
+      }
+
+      Ember.Logger.info(symbol, parsedName.fullName, padding, moduleName);
     }
   }