wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Reduce JSHint errors/warnings

Browse source 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
This commit is contained in:
Morris Jobke 2017-11-06 09:57:59 +01:00
parent 576d31d48d
commit d790c27a19
No known key found for this signature in database
GPG key ID: FE03C3A163FEDE68
9 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.jshintrc
View file

@ -28,7 +28,10 @@
"_": true,
"OC": true,
"OCA": true,
"OCP": true,
"t": true,
"n": true
"n": true,
"escapeHTML": true,
"Promise": true
}
}

2
core/js/js.js
View file

@ -1512,7 +1512,7 @@ function initCore() {
var resizeMenu = function() {
var appList = $('#appmenu li');
var headerWidth = $('.header-left').width() - $('#nextcloud').width()
var headerWidth = $('.header-left').width() - $('#nextcloud').width();
var usePercentualAppMenuLimit = 0.33;
var minAppsDesktop = 8;
var availableWidth = headerWidth - $(appList).width();

4
core/js/tests/specs/coreSpec.js
View file

@ -256,10 +256,10 @@ describe('Core base tests', function() {
describe('filePath', function() {
beforeEach(function() {
OC.webroot = 'http://localhost';
OC.appswebroots['files'] = OC.webroot + '/apps3/files';
OC.appswebroots.files = OC.webroot + '/apps3/files';
});
afterEach(function() {
delete OC.appswebroots['files'];
delete OC.appswebroots.files;
});
it('Uses a direct link for css and images,' , function() {

2
core/js/tests/specs/files/clientSpec.js
View file

@ -448,7 +448,7 @@ describe('OC.Files.Client tests', function() {
expect(info.id).toEqual(11);
// file entry
var info = response[1];
info = response[1];
expect(info instanceof OC.Files.FileInfo).toEqual(true);
expect(info.id).toEqual(51);

4
core/js/tests/specs/jquery.avatarSpec.js
View file

@ -11,7 +11,7 @@
describe('jquery.avatar tests', function() {
var $div;
var devicePixelRatio
var devicePixelRatio;
beforeEach(function() {
$('#testArea').append($('<div id="avatardiv">'));
@ -24,7 +24,7 @@ describe('jquery.avatar tests', function() {
afterEach(function() {
$div.remove();
window.devicePixelRatio = devicePixelRatio
window.devicePixelRatio = devicePixelRatio;
});
describe('size', function() {

10
core/js/tests/specs/mimeTypeSpec.js
View file

@ -26,17 +26,17 @@ describe('MimeType tests', function() {
beforeEach(function() {
_files = OC.MimeTypeList.files;
_aliases = OC.MimeTypeList.aliases;
_theme = OC.MimeTypeList.themes['abc'];
_theme = OC.MimeTypeList.themes.abc;
OC.MimeTypeList.files = ['folder', 'folder-shared', 'folder-external', 'foo-bar', 'foo', 'file'];
OC.MimeTypeList.aliases = {'app/foobar': 'foo/bar'};
OC.MimeTypeList.themes['abc'] = ['folder'];
OC.MimeTypeList.themes.abc = ['folder'];
});
afterEach(function() {
OC.MimeTypeList.files = _files;
OC.MimeTypeList.aliases = _aliases;
OC.MimeTypeList.themes['abc'] = _theme;
OC.MimeTypeList.themes.abc = _theme;
});
describe('_getFile', function() {
@ -109,9 +109,9 @@ describe('MimeType tests', function() {
var res = OC.MimeType.getIconUrl('dir');
expect(Object.keys(OC.MimeType._mimeTypeIcons).length).toEqual(1);
expect(OC.MimeType._mimeTypeIcons['dir']).toEqual(res);
expect(OC.MimeType._mimeTypeIcons.dir).toEqual(res);
var res = OC.MimeType.getIconUrl('dir-shared');
res = OC.MimeType.getIconUrl('dir-shared');
expect(Object.keys(OC.MimeType._mimeTypeIcons).length).toEqual(2);
expect(OC.MimeType._mimeTypeIcons['dir-shared']).toEqual(res);
});

1
core/js/tests/specs/sharedialoglinkshareview.js
View file

@ -48,7 +48,6 @@ describe('OC.Share.ShareDialogLinkShareView', function () {
configModel = new OC.Share.ShareConfigModel({
enforcePasswordForPublicLink: false,
isResharingAllowed: true,
enforcePasswordForPublicLink: false,
isDefaultExpireDateEnabled: false,
isDefaultExpireDateEnforced: false,
defaultExpireDate: 7

1
core/js/tests/specs/sharedialogshareelistview.js
View file

@ -59,7 +59,6 @@ describe('OC.Share.ShareDialogShareeListView', function () {
configModel = new OC.Share.ShareConfigModel({
enforcePasswordForPublicLink: false,
isResharingAllowed: true,
enforcePasswordForPublicLink: false,
isDefaultExpireDateEnabled: false,
isDefaultExpireDateEnforced: false,
defaultExpireDate: 7

1
core/js/tests/specs/sharedialogviewSpec.js
View file

@ -67,7 +67,6 @@ describe('OC.Share.ShareDialogView', function() {
configModel = new OC.Share.ShareConfigModel({
enforcePasswordForPublicLink: false,
isResharingAllowed: true,
enforcePasswordForPublicLink: false,
isDefaultExpireDateEnabled: false,
isDefaultExpireDateEnforced: false,
defaultExpireDate: 7