Merge branch 'master' of github.com:mike-north/ember-perf

addon/core/render-data.js

@@ -29,14 +29,14 @@ RenderData.prototype = {
     switch (name) {
       case 'render.component':
       case 'render.view':
-        const id = payload.view.elementId;
-        const startTime = t();
-        const v = {
+        let id = payload.view.elementId;
+        let startTime = t();
+        let v = {
           startTime,
           id,
           containerKey: payload.view._debugContainerKey
         };
-        const viewIdx = this.viewData.length;
+        let viewIdx = this.viewData.length;
         this.viewData.push(v);
 
         if (payload.view.parentView) {
@@ -56,7 +56,7 @@ RenderData.prototype = {
     switch (name) {
       case 'render.component':
       case 'render.view':
-        const [viewData] = this.viewData.filter((v) => {
+        let [viewData] = this.viewData.filter((v) => {
           return payload.view.elementId === v.id;
         });
         viewData.endTime = t();

addon/ext/router.js

@@ -10,13 +10,13 @@ export default Mixin.create({
   }),
 
   _doURLTransition() {
-    const promise = this._super(...arguments);
+    let promise = this._super(...arguments);
     this.trigger('_emberPerfWillTransition', { promise });
     return promise;
   },
 
   _doTransition() {
-    const promise = this._super(...arguments);
+    let promise = this._super(...arguments);
     this.trigger('_emberPerfWillTransition', { promise });
     return promise;
   },

addon/instance-initializers/ember-perf.js

@@ -8,17 +8,17 @@ import Ember from 'ember';
 // but is not in widespread use yet.
 export function initialize(instance) {
   // in 2.1 the ApplicationInstance instance has a public `lookup` method
-  const container = instance.lookup ? instance : instance.container;
+  let container = instance.lookup ? instance : instance.container;
 
   // in 2.1 the ApplicationInstance uses `_lookupFactory` to avoid making lookupFactory public
   // along with `lookup`
-  const config = container._lookupFactory ? container._lookupFactory('config:environment') : container.lookupFactory('service:ember-perf');
-  const emberPerfConfig = config.emberPerfConfig || {};
+  let config = container._lookupFactory ? container._lookupFactory('config:environment') : container.lookupFactory('service:ember-perf');
+  let emberPerfConfig = config.emberPerfConfig || {};
 
   let shouldSubscribeToViewEvents = 'logViewEvents' in emberPerfConfig ? emberPerfConfig.logViewEvents : true;
 
   if (shouldSubscribeToViewEvents) {
-    const emberPerf = container.lookup('service:ember-perf');
+    let emberPerf = container.lookup('service:ember-perf');
 
     Ember.subscribe('render', {
       before(name, timestamp, payload) {

addon/services/ember-perf.js

@@ -25,10 +25,10 @@ export default Base.extend(Evented, {
   },
 
   _setDefaults() {
-    const defaults = Ember.getWithDefault(this, 'defaults', {});
+    let defaults = Ember.getWithDefault(this, 'defaults', {});
     keys(defaults).map((key) => {
-      const classifiedKey = classify(key);
-      const defaultKey = `default${classifiedKey}`;
+      let classifiedKey = classify(key);
+      let defaultKey = `default${classifiedKey}`;
       return Ember.set(this, defaultKey, defaults[key]);
     });
   },
@@ -61,7 +61,7 @@ export default Base.extend(Evented, {
     });
     transitionInfo.promise.then(() => {
       this.transitionData.finish();
-      const event = this.transitionData;
+      let event = this.transitionData;
       Ember.run.scheduleOnce('afterRender', () => {
         this.trigger('transitionComplete', event);
       });
@@ -82,7 +82,7 @@ export default Base.extend(Evented, {
     this.renderData = new RenderData();
 
     Ember.run.schedule('afterRender', () => {
-      const event = this.renderData;
+      let event = this.renderData;
       event.finish();
 
       this.trigger('renderComplete', event);
@@ -140,7 +140,7 @@ export default Base.extend(Evented, {
         console.group(`${data.routes[i].name} ${data.routes[i].elapsedTime}ms`);
         if (data.routes[i].views) {
           for (let j = 0; j < (data.routes[i].views || []).length; j++) {
-            const v = data.viewData[data.routes[i].views[j]];
+            let v = data.viewData[data.routes[i].views[j]];
             console.log(`${v.containerKey} (${v.id}): ${v.elapsedTime}ms`);
           }
         }
@@ -154,7 +154,7 @@ export default Base.extend(Evented, {
     if (this.get('debugMode')) {
       console.group(`Render Completed: ${data.elapsedTime}ms`);
       for (let i = 0; i < data.viewData.length; i++) {
-        const v = data.viewData[i];
+        let v = data.viewData[i];
         console.log(`${v.containerKey} (${v.id}): ${v.elapsedTime}ms`);
       }
       console.groupEnd();

package.json

@@ -20,16 +20,16 @@
   "license": "MIT",
   "devDependencies": {
     "broccoli-asset-rev": "^2.4.2",
-    "ember-ajax": "0.7.1",
+    "ember-ajax": "2.4.1",
     "ember-cli": "2.5.1",
     "ember-cli-app-version": "^1.0.0",
     "ember-cli-dependency-checker": "^1.0.1",
-    "ember-cli-github-pages": "0.0.6",
+    "ember-cli-github-pages": "0.0.8",
     "ember-cli-htmlbars": "^1.0.3",
     "ember-cli-htmlbars-inline-precompile": "^0.3.1",
     "ember-cli-inject-live-reload": "^1.4.0",
     "ember-cli-jshint": "^1.0.0",
-    "ember-cli-pretender": "0.3.2",
+    "ember-cli-pretender": "0.6.0",
     "ember-cli-qunit": "^2.0.2",
     "ember-cli-release": "1.0.0-beta.1",
     "ember-cli-uglify": "^1.2.0",
@@ -40,7 +40,7 @@
     "ember-getowner-polyfill": "1.0.1",
     "ember-load-initializers": "^0.5.1",
     "ember-resolver": "^2.0.3",
-    "ember-suave": "^1.0.0",
+    "ember-suave": "^2.0.1",
     "ember-try": "0.2.2",
     "loader.js": "^4.0.1",
     "rsvp": "^3.0.20"

tests/dummy/app/controllers/company/building.js

@@ -7,7 +7,7 @@ export default Ember.Controller.extend({
 
   actions: {
     edit() {
-      const emberPerf = this.get('emberPerf');
+      let emberPerf = this.get('emberPerf');
 
       emberPerf.measureRender();
 

tests/dummy/app/routes/company/building.js

@@ -4,7 +4,7 @@ import { BUILDINGS } from '../../utils/sample-data';
 
 export default Ember.Route.extend({
   model(params) {
-    const buildingIds = Ember.get(this.modelFor('company'), 'buildings');
+    let buildingIds = Ember.get(this.modelFor('company'), 'buildings');
     // jscs: disable
     if (buildingIds.indexOf(parseInt(params.building_id, 10)) < 0) {
       return null;

tests/dummy/app/routes/company/buildings.js

@@ -4,7 +4,7 @@ import { BUILDINGS } from '../../utils/sample-data';
 
 export default Ember.Route.extend({
   model() {
-    const buildingIds = Ember.get(this.modelFor('company'), 'buildings');
+    let buildingIds = Ember.get(this.modelFor('company'), 'buildings');
     return randomWait(Ember.testing ? 4 : 2400, Ember.testing ? 2 : 300).then(() => {
       return Ember.A(BUILDINGS.filter((b) => buildingIds.indexOf(b.id) >= 0));
     });

tests/dummy/app/utils/random-wait.js

@@ -2,7 +2,7 @@ import Ember from 'ember';
 
 export default function(maxWait=2000, minWait=0) {
   return new Ember.RSVP.Promise((resolve) => {
-    const wait = minWait + Math.random() * (maxWait - minWait);
+    let wait = minWait + Math.random() * (maxWait - minWait);
     setTimeout(resolve, wait);
   });
 }

tests/helpers/module-for-acceptance.js

@@ -8,13 +8,13 @@ export default function(name, options = {}) {
       this.application = startApp();
 
       if (options.beforeEach) {
-        options.beforeEach.apply(this, arguments);
+        options.beforeEach(...arguments);
       }
     },
 
     afterEach() {
       if (options.afterEach) {
-        options.afterEach.apply(this, arguments);
+        options.afterEach(...arguments);
       }
 
       destroyApp(this.application);