From de665d7b1dca7a308a7fca01d2556c6e265d07c0 Mon Sep 17 00:00:00 2001 From: Mike North Date: Tue, 7 Jun 2016 11:32:54 +0800 Subject: [PATCH] JSCS fixes --- addon/core/render-data.js | 10 +++++----- addon/ext/router.js | 4 ++-- addon/instance-initializers/ember-perf.js | 8 ++++---- addon/services/ember-perf.js | 14 +++++++------- tests/dummy/app/controllers/company/building.js | 2 +- tests/dummy/app/routes/company/building.js | 2 +- tests/dummy/app/routes/company/buildings.js | 2 +- tests/dummy/app/utils/random-wait.js | 2 +- tests/helpers/module-for-acceptance.js | 4 ++-- 9 files changed, 24 insertions(+), 24 deletions(-) diff --git a/addon/core/render-data.js b/addon/core/render-data.js index 23df476b..db280d90 100644 --- a/addon/core/render-data.js +++ b/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(); diff --git a/addon/ext/router.js b/addon/ext/router.js index 2c636923..4951632a 100644 --- a/addon/ext/router.js +++ b/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; }, diff --git a/addon/instance-initializers/ember-perf.js b/addon/instance-initializers/ember-perf.js index dd8075fe..e200f4a8 100644 --- a/addon/instance-initializers/ember-perf.js +++ b/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) { diff --git a/addon/services/ember-perf.js b/addon/services/ember-perf.js index 75d325da..9e86dcb6 100644 --- a/addon/services/ember-perf.js +++ b/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(); diff --git a/tests/dummy/app/controllers/company/building.js b/tests/dummy/app/controllers/company/building.js index 6fdf5179..86a8c456 100644 --- a/tests/dummy/app/controllers/company/building.js +++ b/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(); diff --git a/tests/dummy/app/routes/company/building.js b/tests/dummy/app/routes/company/building.js index 78673084..b63bab4e 100644 --- a/tests/dummy/app/routes/company/building.js +++ b/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; diff --git a/tests/dummy/app/routes/company/buildings.js b/tests/dummy/app/routes/company/buildings.js index ea7df88e..c61b6aeb 100644 --- a/tests/dummy/app/routes/company/buildings.js +++ b/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)); }); diff --git a/tests/dummy/app/utils/random-wait.js b/tests/dummy/app/utils/random-wait.js index 0e6915df..900888f0 100644 --- a/tests/dummy/app/utils/random-wait.js +++ b/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); }); } diff --git a/tests/helpers/module-for-acceptance.js b/tests/helpers/module-for-acceptance.js index 8c8b74ec..62e6b15c 100644 --- a/tests/helpers/module-for-acceptance.js +++ b/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);