Skip to content

Commit

Permalink
JSCS fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
mike-north committed Jun 7, 2016
1 parent 308a29d commit de665d7
Show file tree
Hide file tree
Showing 9 changed files with 24 additions and 24 deletions.
10 changes: 5 additions & 5 deletions addon/core/render-data.js
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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();
Expand Down
4 changes: 2 additions & 2 deletions addon/ext/router.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
},
Expand Down
8 changes: 4 additions & 4 deletions addon/instance-initializers/ember-perf.js
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
14 changes: 7 additions & 7 deletions addon/services/ember-perf.js
Original file line number Diff line number Diff line change
Expand Up @@ -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]);
});
},
Expand Down Expand Up @@ -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);
});
Expand All @@ -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);
Expand Down Expand Up @@ -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`);
}
}
Expand All @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion tests/dummy/app/controllers/company/building.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export default Ember.Controller.extend({

actions: {
edit() {
const emberPerf = this.get('emberPerf');
let emberPerf = this.get('emberPerf');

emberPerf.measureRender();

Expand Down
2 changes: 1 addition & 1 deletion tests/dummy/app/routes/company/building.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion tests/dummy/app/routes/company/buildings.js
Original file line number Diff line number Diff line change
Expand Up @@ -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));
});
Expand Down
2 changes: 1 addition & 1 deletion tests/dummy/app/utils/random-wait.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
});
}
4 changes: 2 additions & 2 deletions tests/helpers/module-for-acceptance.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit de665d7

Please sign in to comment.