Skip to content

Commit d790c27

Browse files
committed
Reduce JSHint errors/warnings
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
1 parent 576d31d commit d790c27

File tree

9 files changed

+15
-15
lines changed

9 files changed

+15
-15
lines changed

.jshintrc

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,10 @@
2828
"_": true,
2929
"OC": true,
3030
"OCA": true,
31+
"OCP": true,
3132
"t": true,
32-
"n": true
33+
"n": true,
34+
"escapeHTML": true,
35+
"Promise": true
3336
}
3437
}

core/js/js.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1512,7 +1512,7 @@ function initCore() {
15121512

15131513
var resizeMenu = function() {
15141514
var appList = $('#appmenu li');
1515-
var headerWidth = $('.header-left').width() - $('#nextcloud').width()
1515+
var headerWidth = $('.header-left').width() - $('#nextcloud').width();
15161516
var usePercentualAppMenuLimit = 0.33;
15171517
var minAppsDesktop = 8;
15181518
var availableWidth = headerWidth - $(appList).width();

core/js/tests/specs/coreSpec.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -256,10 +256,10 @@ describe('Core base tests', function() {
256256
describe('filePath', function() {
257257
beforeEach(function() {
258258
OC.webroot = 'http://localhost';
259-
OC.appswebroots['files'] = OC.webroot + '/apps3/files';
259+
OC.appswebroots.files = OC.webroot + '/apps3/files';
260260
});
261261
afterEach(function() {
262-
delete OC.appswebroots['files'];
262+
delete OC.appswebroots.files;
263263
});
264264

265265
it('Uses a direct link for css and images,' , function() {

core/js/tests/specs/files/clientSpec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,7 @@ describe('OC.Files.Client tests', function() {
448448
expect(info.id).toEqual(11);
449449

450450
// file entry
451-
var info = response[1];
451+
info = response[1];
452452
expect(info instanceof OC.Files.FileInfo).toEqual(true);
453453
expect(info.id).toEqual(51);
454454

core/js/tests/specs/jquery.avatarSpec.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
describe('jquery.avatar tests', function() {
1212

1313
var $div;
14-
var devicePixelRatio
14+
var devicePixelRatio;
1515

1616
beforeEach(function() {
1717
$('#testArea').append($('<div id="avatardiv">'));
@@ -24,7 +24,7 @@ describe('jquery.avatar tests', function() {
2424
afterEach(function() {
2525
$div.remove();
2626

27-
window.devicePixelRatio = devicePixelRatio
27+
window.devicePixelRatio = devicePixelRatio;
2828
});
2929

3030
describe('size', function() {

core/js/tests/specs/mimeTypeSpec.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,17 @@ describe('MimeType tests', function() {
2626
beforeEach(function() {
2727
_files = OC.MimeTypeList.files;
2828
_aliases = OC.MimeTypeList.aliases;
29-
_theme = OC.MimeTypeList.themes['abc'];
29+
_theme = OC.MimeTypeList.themes.abc;
3030

3131
OC.MimeTypeList.files = ['folder', 'folder-shared', 'folder-external', 'foo-bar', 'foo', 'file'];
3232
OC.MimeTypeList.aliases = {'app/foobar': 'foo/bar'};
33-
OC.MimeTypeList.themes['abc'] = ['folder'];
33+
OC.MimeTypeList.themes.abc = ['folder'];
3434
});
3535

3636
afterEach(function() {
3737
OC.MimeTypeList.files = _files;
3838
OC.MimeTypeList.aliases = _aliases;
39-
OC.MimeTypeList.themes['abc'] = _theme;
39+
OC.MimeTypeList.themes.abc = _theme;
4040
});
4141

4242
describe('_getFile', function() {
@@ -109,9 +109,9 @@ describe('MimeType tests', function() {
109109

110110
var res = OC.MimeType.getIconUrl('dir');
111111
expect(Object.keys(OC.MimeType._mimeTypeIcons).length).toEqual(1);
112-
expect(OC.MimeType._mimeTypeIcons['dir']).toEqual(res);
112+
expect(OC.MimeType._mimeTypeIcons.dir).toEqual(res);
113113

114-
var res = OC.MimeType.getIconUrl('dir-shared');
114+
res = OC.MimeType.getIconUrl('dir-shared');
115115
expect(Object.keys(OC.MimeType._mimeTypeIcons).length).toEqual(2);
116116
expect(OC.MimeType._mimeTypeIcons['dir-shared']).toEqual(res);
117117
});

core/js/tests/specs/sharedialoglinkshareview.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ describe('OC.Share.ShareDialogLinkShareView', function () {
4848
configModel = new OC.Share.ShareConfigModel({
4949
enforcePasswordForPublicLink: false,
5050
isResharingAllowed: true,
51-
enforcePasswordForPublicLink: false,
5251
isDefaultExpireDateEnabled: false,
5352
isDefaultExpireDateEnforced: false,
5453
defaultExpireDate: 7

core/js/tests/specs/sharedialogshareelistview.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ describe('OC.Share.ShareDialogShareeListView', function () {
5959
configModel = new OC.Share.ShareConfigModel({
6060
enforcePasswordForPublicLink: false,
6161
isResharingAllowed: true,
62-
enforcePasswordForPublicLink: false,
6362
isDefaultExpireDateEnabled: false,
6463
isDefaultExpireDateEnforced: false,
6564
defaultExpireDate: 7

core/js/tests/specs/sharedialogviewSpec.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ describe('OC.Share.ShareDialogView', function() {
6767
configModel = new OC.Share.ShareConfigModel({
6868
enforcePasswordForPublicLink: false,
6969
isResharingAllowed: true,
70-
enforcePasswordForPublicLink: false,
7170
isDefaultExpireDateEnabled: false,
7271
isDefaultExpireDateEnforced: false,
7372
defaultExpireDate: 7

0 commit comments

Comments
 (0)