Incorporated most recent set of change requests from rwjblue

emberjs · Mar 3, 2018 · 4bbb29b · 4bbb29b
1 parent 3a188cb
commit 4bbb29b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 12 deletions.
diff --git a/packages/ember-glimmer/lib/helpers/log.ts b/packages/ember-glimmer/lib/helpers/log.ts
@@ -23,7 +23,7 @@ import { InternalHelperReference } from '../utils/references';
 */
 function log({ positional }: CapturedArguments) {
     /* eslint-disable no-console */
-    console.log.apply(console, positional.value());
+    console.log(...positional.value());
     /* eslint-enable no-console */
   }
 

diff --git a/packages/ember-routing/lib/system/router.js b/packages/ember-routing/lib/system/router.js
@@ -105,13 +105,7 @@ const EmberRouter = EmberObject.extend(Evented, {
 
     if (DEBUG) {
       if (get(this, 'namespace.LOG_TRANSITIONS_INTERNAL')) {
-        /* eslint-disable no-console */
-        if (console.debug) {
-          routerMicrolib.log = console.debug.bind(console);
-        } else {
-          routerMicrolib.log = console.log.bind(console);
-        }
-        /* eslint-enable no-console */
+        routerMicrolib.log = console.log.bind(console); // eslint-disable-line no-console
       }
     }
 
@@ -1188,7 +1182,7 @@ function logError(_error, initialMessage) {
     if (typeof error === 'string') { errorArgs.push(error); }
   }
 
-  console.error.apply(console, errorArgs); //eslint-disable-line no-console
+  console.error(...errorArgs); //eslint-disable-line no-console
 }
 
 /**

diff --git a/packages/ember/tests/routing/basic_test.js b/packages/ember/tests/routing/basic_test.js
@@ -30,7 +30,7 @@ import { Application, Engine } from 'ember-application';
 import { Transition } from 'router';
 import { getTextOf } from 'internal-test-helpers';
 
-let Router, App, router, registry, container, originalLoggerError, originalRenderSupport, rootElement;
+let Router, App, router, registry, container, originalConsoleError, originalRenderSupport, rootElement;
 
 function bootApplication() {
   router = container.lookup('router:main');
@@ -88,7 +88,7 @@ QUnit.module('Basic Routing', {
       setTemplate('homepage', compile('<h3 class="megatroll">Megatroll</h3><p>{{model.home}}</p>'));
       setTemplate('camelot', compile('<section><h3 class="silly">Is a silly place</h3></section>'));
 
-      originalLoggerError = console.error; // eslint-disable-line no-console
+      originalConsoleError = console.error; // eslint-disable-line no-console
       originalRenderSupport = ENV._ENABLE_RENDER_SUPPORT;
 
       ENV._ENABLE_RENDER_SUPPORT = true;
@@ -101,7 +101,7 @@ QUnit.module('Basic Routing', {
       App = null;
 
       setTemplates({});
-      console.error = originalLoggerError; // eslint-disable-line no-console
+      console.error = originalConsoleError; // eslint-disable-line no-console
       ENV._ENABLE_RENDER_SUPPORT = originalRenderSupport;
     });
   }