Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Syntax cleanup #4

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions addon/adapters/contributor.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ import OsfAdapter from './osf-adapter';
export default OsfAdapter.extend({
buildURL(modelName, id, snapshot, requestType) { // jshint ignore:line
if (requestType === 'createRecord' || requestType === 'findRecord') {
var nodeId;
var sendEmail = true;
var requestUrl;
let nodeId;
let sendEmail = true;
let requestUrl;

if (snapshot) {
nodeId = snapshot.record.get('nodeId');
Expand Down
2 changes: 1 addition & 1 deletion addon/adapters/preprint.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export default OsfAdapter.extend({
// Send patch request to preprint detail link
const serializer = store.serializerFor(type.modelName);
serializer.serializeIntoHash(data, type, snapshot, { includeId: true });
var id = snapshot.id;
const id = snapshot.id;
url = this.buildURL(type.modelName, id, snapshot, 'updateRecord');
}

Expand Down
2 changes: 1 addition & 1 deletion addon/components/file-renderer/component.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export default Ember.Component.extend({
version: null,
mfrUrl: Ember.computed('download', 'version', function() {
let download = this.get('download');
if (download.indexOf('?') !== -1) {
if (download.includes('?')) {
download = download + '&mode=render';
} else {
download = download + '?direct&mode=render';
Expand Down
18 changes: 9 additions & 9 deletions addon/mixins/contributor-mixin.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,20 @@ export default Ember.Mixin.create({
if (!userId) {
return new Ember.RSVP.Promise((resolve) => resolve(false));
}
var contribId = `${this.get('id')}-${userId}`;
const contribId = `${this.get('id')}-${userId}`;
return this.store.findRecord('contributor', contribId).then(() => true, () => false);
},

save() {
// Some duplicate logic from osf-model#save needed to support
// contributor edits being saved through the node
// Note: order is important here so _dirtyRelationships gets set by the _super call
var promise = this._super(...arguments);
const promise = this._super(...arguments);
if (!this.get('_dirtyRelationships.contributors')) {
this.set('_dirtyRelationships.contributors', {});
}

var contributors = this.hasMany('contributors').hasManyRelationship;
const contributors = this.hasMany('contributors').hasManyRelationship;
this.set(
'_dirtyRelationships.contributors.update',
contributors.members.list.filter(m => !m.getRecord().get('isNew') && Object.keys(m.getRecord().changedAttributes()).length > 0)
Expand All @@ -45,7 +45,7 @@ export default Ember.Mixin.create({
return promise;
},
addContributor(userId, permission, isBibliographic, sendEmail, fullName, email) {
let contrib = this.store.createRecord('contributor', {
const contrib = this.store.createRecord('contributor', {
permission: permission,
bibliographic: isBibliographic,
sendEmail: sendEmail,
Expand All @@ -59,18 +59,18 @@ export default Ember.Mixin.create({
},

addContributors(contributors, sendEmail) {
let payload = contributors.map(contrib => {
let contribData = {
const payload = contributors.map(contrib => {
const contribData = {
permission: contrib.permission,
bibliographic: contrib.bibliographic,
nodeId: this.get('id'),
userId: contrib.userId,
id: this.get('id') + '-' + contrib.userId,
};
if (contrib.unregisteredContributor) {
contribData['fullName'] = contrib.unregisteredContributor;
contribData.fullName = contrib.unregisteredContributor;
}
let c = this.store.createRecord('contributor', contribData);
const c = this.store.createRecord('contributor', contribData);

return c.serialize({
includeId: true,
Expand All @@ -93,7 +93,7 @@ export default Ember.Mixin.create({
isBulk: true
}).then(resp => {
this.store.pushPayload(resp);
var createdContribs = Ember.A();
const createdContribs = Ember.A();
resp.data.map((contrib) => {
createdContribs.push(this.store.peekRecord('contributor', contrib.id));
});
Expand Down
7 changes: 3 additions & 4 deletions tests/unit/mixins/contributor-mixin-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@ import { module, test } from 'qunit';

module('Unit | Mixin | contributor mixin');

// Replace this with your real tests.
test('it works', function(assert) {
let ContributorMixinObject = Ember.Object.extend(ContributorMixinMixin);
let subject = ContributorMixinObject.create();
assert.ok(subject);
const ContributorMixinObject = Ember.Object.extend(ContributorMixinMixin);
const subject = ContributorMixinObject.create();
assert.ok(subject);
});