Fix issues detected by 'JSHint' and 'JSCS'
Change-Id: Ic1437333fcf82473ac57f8bdea25ee8188ddbfee
diff --git a/polygerrit-ui/app/behaviors/rest-client-behavior.html b/polygerrit-ui/app/behaviors/rest-client-behavior.html
index 08b25db..ce0b2a5 100644
--- a/polygerrit-ui/app/behaviors/rest-client-behavior.html
+++ b/polygerrit-ui/app/behaviors/rest-client-behavior.html
@@ -18,7 +18,6 @@
(function(window) {
'use strict';
-
/** @polymerBehavior Gerrit.RESTClientBehavior */
var RESTClientBehavior = {
ChangeDiffType: {
diff --git a/polygerrit-ui/app/elements/change/gr-download-dialog/gr-download-dialog_test.html b/polygerrit-ui/app/elements/change/gr-download-dialog/gr-download-dialog_test.html
index 61fa802..70e934d 100644
--- a/polygerrit-ui/app/elements/change/gr-download-dialog/gr-download-dialog_test.html
+++ b/polygerrit-ui/app/elements/change/gr-download-dialog/gr-download-dialog_test.html
@@ -159,12 +159,13 @@
suite('gr-download-dialog tests', function() {
var element;
- var getPrefsStub;
setup(function() {
- stub('gr-rest-api-interface', { getPreferences: function() {
- return Promise.resolve({download_scheme: 'repo'});
- }});
+ stub('gr-rest-api-interface', {
+ getPreferences: function() {
+ return Promise.resolve({download_scheme: 'repo'});
+ },
+ });
element = fixture('loggedIn');
element.change = getChangeObject();
diff --git a/polygerrit-ui/app/elements/change/gr-related-changes-list/gr-related-changes-list.js b/polygerrit-ui/app/elements/change/gr-related-changes-list/gr-related-changes-list.js
index 6ec04da..f4ee53a 100644
--- a/polygerrit-ui/app/elements/change/gr-related-changes-list/gr-related-changes-list.js
+++ b/polygerrit-ui/app/elements/change/gr-related-changes-list/gr-related-changes-list.js
@@ -74,7 +74,7 @@
this._sameTopic = response;
}.bind(this));
} else {
- this._sameTopic = [];
+ this._sameTopic = [];
}
return this._sameTopic;
}.bind(this)).then(Promise.all(promises)).then(function() {
diff --git a/polygerrit-ui/app/elements/core/gr-router/gr-router.js b/polygerrit-ui/app/elements/core/gr-router/gr-router.js
index 9d8d409b..d11d438 100644
--- a/polygerrit-ui/app/elements/core/gr-router/gr-router.js
+++ b/polygerrit-ui/app/elements/core/gr-router/gr-router.js
@@ -81,6 +81,13 @@
page.redirect('/c/' + encodeURIComponent(ctx.params[0]));
});
+ function normalizePatchRangeParams(params) {
+ if (params.basePatchNum && !params.patchNum) {
+ params.patchNum = params.basePatchNum;
+ params.basePatchNum = null;
+ }
+ }
+
// Matches /c/<changeNum>/[<basePatchNum>..][<patchNum>].
page(/^\/c\/(\d+)\/?(((\d+)(\.\.(\d+))?))?$/, function(ctx) {
// Parameter order is based on the regex group number matched.
@@ -129,13 +136,6 @@
app.params = params;
});
- function normalizePatchRangeParams(params) {
- if (params.basePatchNum && !params.patchNum) {
- params.patchNum = params.basePatchNum;
- params.basePatchNum = null;
- }
- }
-
page(/^\/settings\/?/, function(data) {
restAPI.getLoggedIn().then(function(loggedIn) {
if (loggedIn) {
diff --git a/polygerrit-ui/app/elements/diff/gr-diff-builder/gr-diff-builder.html b/polygerrit-ui/app/elements/diff/gr-diff-builder/gr-diff-builder.html
index f9d8124..5f1fd90 100644
--- a/polygerrit-ui/app/elements/diff/gr-diff-builder/gr-diff-builder.html
+++ b/polygerrit-ui/app/elements/diff/gr-diff-builder/gr-diff-builder.html
@@ -178,8 +178,6 @@
},
getCommentThreadByLine: function(lineNumber, opt_side, opt_root) {
- var root = Polymer.dom(opt_root || this.diffElement);
- var sideSelector = !!opt_side ? ('.' + opt_side) : '';
var content = this.getContentByLine(lineNumber, opt_side, opt_root);
return this.getCommentThreadByContentEl(content);
},
diff --git a/polygerrit-ui/app/elements/diff/gr-diff-builder/gr-diff-builder_test.html b/polygerrit-ui/app/elements/diff/gr-diff-builder/gr-diff-builder_test.html
index cfdf7a9..727ae9b 100644
--- a/polygerrit-ui/app/elements/diff/gr-diff-builder/gr-diff-builder_test.html
+++ b/polygerrit-ui/app/elements/diff/gr-diff-builder/gr-diff-builder_test.html
@@ -42,6 +42,7 @@
<script>
suite('gr-diff-builder tests', function() {
+ var element;
var builder;
setup(function() {
@@ -445,7 +446,7 @@
};
return builder;
});
- element.render({ content: content }, {left: [], right: []}, prefs);
+ element.render({content: content}, {left: [], right: []}, prefs);
});
test('renderSection', function() {
diff --git a/polygerrit-ui/app/elements/diff/gr-diff-comment-thread/gr-diff-comment-thread_test.html b/polygerrit-ui/app/elements/diff/gr-diff-comment-thread/gr-diff-comment-thread_test.html
index cfbcb07..641dc0f 100644
--- a/polygerrit-ui/app/elements/diff/gr-diff-comment-thread/gr-diff-comment-thread_test.html
+++ b/polygerrit-ui/app/elements/diff/gr-diff-comment-thread/gr-diff-comment-thread_test.html
@@ -128,19 +128,21 @@
setup(function() {
stub('gr-rest-api-interface', {
getLoggedIn: function() { return Promise.resolve(false); },
- saveDiffDraft: function() { return Promise.resolve({
- ok: true,
- text: function() { return Promise.resolve(')]}\'\n' +
- JSON.stringify({
- id: '7afa4931_de3d65bd',
- path: '/path/to/file.txt',
- line: 5,
- in_reply_to: 'baf0414d_60047215',
- updated: '2015-12-21 02:01:10.850000000',
- message: 'Done'
- }));
- },
- })},
+ saveDiffDraft: function() {
+ return Promise.resolve({
+ ok: true,
+ text: function() { return Promise.resolve(')]}\'\n' +
+ JSON.stringify({
+ id: '7afa4931_de3d65bd',
+ path: '/path/to/file.txt',
+ line: 5,
+ in_reply_to: 'baf0414d_60047215',
+ updated: '2015-12-21 02:01:10.850000000',
+ message: 'Done'
+ }));
+ },
+ });
+ },
deleteDiffDraft: function() { return Promise.resolve({ok: true}); },
});
element = fixture('withComment');
diff --git a/polygerrit-ui/app/elements/diff/gr-diff-cursor/mock-diff-response_test.html b/polygerrit-ui/app/elements/diff/gr-diff-cursor/mock-diff-response_test.html
index e92247e..8141c8a 100644
--- a/polygerrit-ui/app/elements/diff/gr-diff-cursor/mock-diff-response_test.html
+++ b/polygerrit-ui/app/elements/diff/gr-diff-cursor/mock-diff-response_test.html
@@ -67,7 +67,8 @@
'Justo purus, semper eget et.',
],
},
- { 'a': [
+ {
+ 'a': [
'Est amet, vestibulum pellentesque.',
'Erat ligula.',
'Justo eros.',
diff --git a/polygerrit-ui/app/elements/diff/gr-diff-processor/gr-diff-processor.js b/polygerrit-ui/app/elements/diff/gr-diff-processor/gr-diff-processor.js
index 08cc4cc..e301d94 100644
--- a/polygerrit-ui/app/elements/diff/gr-diff-processor/gr-diff-processor.js
+++ b/polygerrit-ui/app/elements/diff/gr-diff-processor/gr-diff-processor.js
@@ -151,8 +151,7 @@
var sectionEnd = null;
if (state.sectionIndex === 0) {
sectionEnd = 'first';
- }
- else if (state.sectionIndex === content.length - 1) {
+ } else if (state.sectionIndex === content.length - 1) {
sectionEnd = 'last';
}
diff --git a/polygerrit-ui/app/elements/diff/gr-diff-processor/gr-diff-processor_test.html b/polygerrit-ui/app/elements/diff/gr-diff-processor/gr-diff-processor_test.html
index 120c980..4d890ea 100644
--- a/polygerrit-ui/app/elements/diff/gr-diff-processor/gr-diff-processor_test.html
+++ b/polygerrit-ui/app/elements/diff/gr-diff-processor/gr-diff-processor_test.html
@@ -209,7 +209,7 @@
});
test('insert context groups', function(done) {
- content = [
+ var content = [
{a: ['all work and no play make andybons a dull boy']},
{ab: []},
{b: ['elgoog elgoog elgoog']},
diff --git a/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view_test.html b/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view_test.html
index 6595f13..ede18f6 100644
--- a/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view_test.html
+++ b/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view_test.html
@@ -379,7 +379,7 @@
// Set the actual value of the select, and simulate the change event.
select.value = newMode;
- element.fire('change', {}, { node: select });
+ element.fire('change', {}, {node: select});
// Make sure the handler was called and the state is still coherent.
assert.equal(element._getDiffViewMode(), newMode);
diff --git a/polygerrit-ui/app/elements/diff/gr-diff/gr-diff.js b/polygerrit-ui/app/elements/diff/gr-diff/gr-diff.js
index 7fc4575..83ad58a 100644
--- a/polygerrit-ui/app/elements/diff/gr-diff/gr-diff.js
+++ b/polygerrit-ui/app/elements/diff/gr-diff/gr-diff.js
@@ -191,7 +191,6 @@
},
_addDraft: function(lineEl, opt_lineNum) {
- var line = opt_lineNum || lineEl.getAttribute('data-value');
var contentText = this.$.diffBuilder.getContentByLineEl(lineEl);
var contentEl = contentText.parentElement;
var patchNum = this._getPatchNumByLineAndContent(lineEl, contentEl);
diff --git a/polygerrit-ui/app/elements/diff/gr-diff/gr-diff_test.html b/polygerrit-ui/app/elements/diff/gr-diff/gr-diff_test.html
index 236cf35..b2481c7 100644
--- a/polygerrit-ui/app/elements/diff/gr-diff/gr-diff_test.html
+++ b/polygerrit-ui/app/elements/diff/gr-diff/gr-diff_test.html
@@ -293,6 +293,8 @@
element._handleTap(e);
assert.isTrue(selectStub.called);
assert.equal(selectStub.lastCall.args[0], lineEl);
+ selectStub.restore();
+ getLineStub.restore();
done();
});
content.click();
diff --git a/polygerrit-ui/app/elements/settings/gr-account-info/gr-account-info_test.html b/polygerrit-ui/app/elements/settings/gr-account-info/gr-account-info_test.html
index b3ec96c..9e1472d 100644
--- a/polygerrit-ui/app/elements/settings/gr-account-info/gr-account-info_test.html
+++ b/polygerrit-ui/app/elements/settings/gr-account-info/gr-account-info_test.html
@@ -56,7 +56,7 @@
username: 'user username',
registered: '2000-01-01 00:00:00.000000000',
};
- config = {auth: {editable_account_fields: []}},
+ config = {auth: {editable_account_fields: []}};
stub('gr-rest-api-interface', {
getAccount: function() { return Promise.resolve(account); },
diff --git a/polygerrit-ui/app/elements/settings/gr-email-editor/gr-email-editor_test.html b/polygerrit-ui/app/elements/settings/gr-email-editor/gr-email-editor_test.html
index fdb3ab4..030b81c 100644
--- a/polygerrit-ui/app/elements/settings/gr-email-editor/gr-email-editor_test.html
+++ b/polygerrit-ui/app/elements/settings/gr-email-editor/gr-email-editor_test.html
@@ -91,7 +91,6 @@
});
test('delete email', function() {
- var deleteSpy = sinon.spy(element, '_handleDeleteButton');
var buttons = element.$$('table').querySelectorAll('gr-button');
assert.isFalse(element.hasUnsavedChanges);
diff --git a/polygerrit-ui/app/elements/settings/gr-http-password/gr-http-password_test.html b/polygerrit-ui/app/elements/settings/gr-http-password/gr-http-password_test.html
index 44bffe5..36c9abf 100644
--- a/polygerrit-ui/app/elements/settings/gr-http-password/gr-http-password_test.html
+++ b/polygerrit-ui/app/elements/settings/gr-http-password/gr-http-password_test.html
@@ -48,7 +48,7 @@
});
element = fixture('basic');
- element.loadData().then(function() { flush(done) });
+ element.loadData().then(function() { flush(done); });
});
test('loads data', function() {
@@ -111,7 +111,6 @@
setup(function(done) {
account = {username: 'user name'};
- password = 'the password';
stub('gr-rest-api-interface', {
getAccount: function() { return Promise.resolve(account); },
@@ -122,7 +121,7 @@
});
element = fixture('basic');
- element.loadData().then(function() { flush(done) });
+ element.loadData().then(function() { flush(done); });
});
test('loads data', function() {
diff --git a/polygerrit-ui/app/elements/settings/gr-settings-view/gr-settings-view_test.html b/polygerrit-ui/app/elements/settings/gr-settings-view/gr-settings-view_test.html
index 1935838..4e98b43 100644
--- a/polygerrit-ui/app/elements/settings/gr-settings-view/gr-settings-view_test.html
+++ b/polygerrit-ui/app/elements/settings/gr-settings-view/gr-settings-view_test.html
@@ -66,7 +66,7 @@
function stubAddAccountEmail(statusCode) {
return sinon.stub(element.$.restAPI, 'addAccountEmail',
- function() { return Promise.resolve({ status: statusCode }); });
+ function() { return Promise.resolve({status: statusCode}); });
}
setup(function(done) {
@@ -103,8 +103,7 @@
theme: 'DEFAULT',
ignore_whitespace: 'IGNORE_NONE'
};
- config = {auth: {editable_account_fields: []}},
- watchedProjects = [];
+ config = {auth: {editable_account_fields: []}};
stub('gr-rest-api-interface', {
getLoggedIn: function() { return Promise.resolve(true); },
@@ -114,7 +113,7 @@
return Promise.resolve(diffPreferences);
},
getWatchedProjects: function() {
- return Promise.resolve(watchedProjects);
+ return Promise.resolve([]);
},
getAccountEmails: function() { return Promise.resolve(); },
getConfig: function() { return Promise.resolve(config); },
diff --git a/polygerrit-ui/app/elements/settings/gr-watched-projects-editor/gr-watched-projects-editor_test.html b/polygerrit-ui/app/elements/settings/gr-watched-projects-editor/gr-watched-projects-editor_test.html
index 6a3cbb0..66576a3 100644
--- a/polygerrit-ui/app/elements/settings/gr-watched-projects-editor/gr-watched-projects-editor_test.html
+++ b/polygerrit-ui/app/elements/settings/gr-watched-projects-editor/gr-watched-projects-editor_test.html
@@ -73,7 +73,7 @@
element = fixture('basic');
- element.loadData().then(function() { flush(done) });
+ element.loadData().then(function() { flush(done); });
});
test('renders', function() {
diff --git a/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-change-actions-js-api_test.html b/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-change-actions-js-api_test.html
index 3030870..4919a5a 100644
--- a/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-change-actions-js-api_test.html
+++ b/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-change-actions-js-api_test.html
@@ -39,6 +39,14 @@
var element;
var changeActions;
+ // Because deepEqual doesn’t behave in Safari.
+ function assertArraysEqual(actual, expected) {
+ assert.equal(actual.length, expected.length);
+ for (var i = 0; i < actual.length; i++) {
+ assert.equal(actual[i], expected[i]);
+ }
+ }
+
setup(function() {
element = fixture('basic');
var plugin;
@@ -61,14 +69,6 @@
});
});
- // Because deepEqual doesn’t behave in Safari.
- function assertArraysEqual(actual, expected) {
- assert.equal(actual.length, expected.length);
- for (var i = 0; i < actual.length; i++) {
- assert.equal(actual[i], expected[i]);
- }
- }
-
test('add/remove primary action keys', function() {
element.primaryActionKeys = [];
changeActions.addPrimaryActionKey('foo');
diff --git a/polygerrit-ui/app/elements/shared/gr-overlay/gr-overlay.js b/polygerrit-ui/app/elements/shared/gr-overlay/gr-overlay.js
index fa32039..da28e49 100644
--- a/polygerrit-ui/app/elements/shared/gr-overlay/gr-overlay.js
+++ b/polygerrit-ui/app/elements/shared/gr-overlay/gr-overlay.js
@@ -61,7 +61,7 @@
*/
_awaitOpen: function(fn) {
var iters = 0;
- function step() {
+ var step = function() {
this.async(function() {
if (this.style.display !== 'none') {
fn.call(this);
@@ -69,7 +69,7 @@
step.call(this);
}
}.bind(this), AWAIT_STEP);
- };
+ }.bind(this);
step.call(this);
},
});
diff --git a/polygerrit-ui/app/elements/shared/gr-rest-api-interface/gr-rest-api-interface.js b/polygerrit-ui/app/elements/shared/gr-rest-api-interface/gr-rest-api-interface.js
index 44976d3..fda3021 100644
--- a/polygerrit-ui/app/elements/shared/gr-rest-api-interface/gr-rest-api-interface.js
+++ b/polygerrit-ui/app/elements/shared/gr-rest-api-interface/gr-rest-api-interface.js
@@ -468,7 +468,7 @@
},
getSuggestedProjects: function(inputVal, opt_errFn, opt_ctx) {
- return this.fetchJSON('/projects/', opt_errFn, opt_ctx, { p: inputVal, });
+ return this.fetchJSON('/projects/', opt_errFn, opt_ctx, {p: inputVal});
},
addChangeReviewer: function(changeNum, reviewerID) {
diff --git a/polygerrit-ui/app/elements/shared/gr-rest-api-interface/gr-rest-api-interface_test.html b/polygerrit-ui/app/elements/shared/gr-rest-api-interface/gr-rest-api-interface_test.html
index e7f3e2a..8dda2ce 100644
--- a/polygerrit-ui/app/elements/shared/gr-rest-api-interface/gr-rest-api-interface_test.html
+++ b/polygerrit-ui/app/elements/shared/gr-rest-api-interface/gr-rest-api-interface_test.html
@@ -48,9 +48,12 @@
var testJSON = ')]}\'\n{"hello": "bonjour"}';
sandbox.stub(window, 'fetch', function() {
- return Promise.resolve({ok: true, text: function() {
- return Promise.resolve(testJSON);
- }});
+ return Promise.resolve({
+ ok: true,
+ text: function() {
+ return Promise.resolve(testJSON);
+ },
+ });
});
element.fetchJSON('/dummy/url').then(function(obj) {
assert.deepEqual(obj, {hello: 'bonjour'});
@@ -110,9 +113,11 @@
test('request callbacks can be canceled', function(done) {
var cancelCalled = false;
sandbox.stub(window, 'fetch', function() {
- return Promise.resolve({body: {
- cancel: function() { cancelCalled = true; }
- }});
+ return Promise.resolve({
+ body: {
+ cancel: function() { cancelCalled = true; }
+ },
+ });
});
element.fetchJSON('/dummy/url', null, function() { return true; }).then(
function(obj) {
diff --git a/polygerrit-ui/app/elements/shared/gr-storage/gr-storage_test.html b/polygerrit-ui/app/elements/shared/gr-storage/gr-storage_test.html
index d826577..54e5577 100644
--- a/polygerrit-ui/app/elements/shared/gr-storage/gr-storage_test.html
+++ b/polygerrit-ui/app/elements/shared/gr-storage/gr-storage_test.html
@@ -33,12 +33,6 @@
var element;
var storage;
- setup(function() {
- element = fixture('basic');
- storage = element._storage;
- cleanupStorage();
- });
-
function cleanupStorage() {
// Make sure there are no entries in storage.
for (var key in window.localStorage) {
@@ -46,6 +40,12 @@
}
}
+ setup(function() {
+ element = fixture('basic');
+ storage = element._storage;
+ cleanupStorage();
+ });
+
test('storing, retrieving and erasing drafts', function() {
var changeNum = 1234;
var patchNum = 5;
