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.

Sign up for GitHub

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

Update eslint #1765

Merged
merged 4 commits into from
Mar 16, 2022
Merged

Update eslint #1765

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
642152b
Update ESLint
ZakarFin Mar 16, 2022
af5442f
Make ESLint happy
ZakarFin Feb 28, 2022
e4aaed6
Trying to make tick formatter more readable since new version ESLint …
ZakarFin Feb 28, 2022
b0f44e1
Split d3 handling and formatting
ZakarFin Mar 1, 2022
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
4 changes: 4 additions & 0 deletions bundles/admin/admin-announcements/publisher/AnnouncementsTool.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,10 @@ Oskari.clazz.define('Oskari.admin.bundle.admin-announcements.publisher.Announcem
}

service.fetchAdminAnnouncements((err, data) => {
if (err) {
alert('Error loading announcements');
return;
}
me.announcements = data;
const toolPluginAnnouncementsConf = me._getToolPluginAnnouncementsConf();
if (toolPluginAnnouncementsConf !== null) {
Expand Down
4 changes: 4 additions & 0 deletions bundles/framework/announcements/plugin/AnnouncementsPlugin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,10 @@ Oskari.clazz.define('Oskari.framework.announcements.plugin.AnnouncementsPlugin',
);

service.fetchAnnouncements((err, data) => {
if (err) {
alert('Error loading announcements');
return;
}
me.allAnnouncements = data;
if (me._config.announcements !== undefined) {
me.addAnnouncements();
Expand Down
2 changes: 1 addition & 1 deletion bundles/framework/coordinatetool/plugin/CoordinateToolPlugin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -867,7 +867,7 @@ Oskari.clazz.define('Oskari.mapframework.bundle.coordinatetool.plugin.Coordinate
function (responseDataTo4326) {
me._updateEmergencyCallMessage(responseDataTo4326);
},
function (error) {
function () {
me._coordinateTransformationExtension._showMessage(me._locale('display.cannotTransformCoordinates.title'), me._locale('cannotTransformCoordinates.message'));
});
}
Expand Down
2 changes: 1 addition & 1 deletion bundles/framework/divmanazer/component/GridModel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ Oskari.clazz.define('Oskari.userinterface.component.GridModel',
*/
setFirstField: function (firstField) {
if (_.indexOf(this.fields, firstField) === 0 || _.indexOf(this.fields, firstField) === -1) {

// nothing to do
} else {
_.pull(this.fields, firstField);
this.fields.unshift(firstField);
Expand Down
8 changes: 6 additions & 2 deletions bundles/framework/divmanazer/component/Popover.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,10 +186,14 @@
return this.getTitle();
},
getPosition: function (inside) {
return $.extend({}, (inside ? {
let offset = {
top: 0,
left: 0
} : this.$element.offset()), {
};
if (!inside) {
offset = this.$element.offset();
}
return $.extend({}, offset, {
width: this.$element[0].offsetWidth,
height: this.$element[0].offsetHeight
});
Expand Down
1 change: 1 addition & 0 deletions bundles/framework/divmanazer/component/UIHelper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ Oskari.clazz.define('Oskari.userinterface.component.UIHelper',
}
},
success: function (resp) {
/* eslint-disable node/no-callback-literal */
if (resp && resp.articles[0] && resp.articles[0].content) {
callback(true, resp.articles[0].content);
} else {
Expand Down
31 changes: 18 additions & 13 deletions bundles/framework/divmanazer/instance.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,18 +337,16 @@ Oskari.clazz.define('Oskari.userinterface.bundle.ui.UserInterfaceBundleInstance'
* applies draggable handle to flyouts title bar
*/
_applyDraggableToFlyout: function (flyout, extensionInfo, cls) {
var me = this,
handle = flyout.children(cls).get()[0],
flyoutTarget = flyout.get()[0],
useHelper = false,
el;

extensionInfo.draggableHandle = handle;
extensionInfo.draggableTarget = flyoutTarget;

extensionInfo.draggable = jQuery(flyout).draggable({
handle: jQuery(handle),
helper: useHelper ? function () {
const me = this;
const handle = flyout.children(cls).get()[0];
const flyoutTarget = flyout.get()[0];
const useHelper = false;
let el;
let helperFn;
if (useHelper) {
// note! useHelper is always false
// not sure why this is here...
helperFn = function () {
el = jQuery('<div />');

el.css('width', flyout.css('width'));
Expand All @@ -357,7 +355,14 @@ Oskari.clazz.define('Oskari.userinterface.bundle.ui.UserInterfaceBundleInstance'
el.css('z-index', flyout.css('z-index'));

return el;
} : null,
};
}
extensionInfo.draggableHandle = handle;
extensionInfo.draggableTarget = flyoutTarget;

extensionInfo.draggable = jQuery(flyout).draggable({
handle: jQuery(handle),
helper: useHelper ? helperFn : null,
scroll: false,
stack: '.oskari-flyout',
create: function (event, ui) {},
Expand Down
1 change: 0 additions & 1 deletion bundles/framework/featuredata2/plugin/MapSelectionPlugin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ Oskari.clazz.define(
control = this.drawControls[key];
if (this.currentDrawMode === key) {
control();
} else {
}
}
}
Expand Down
1 change: 1 addition & 0 deletions bundles/framework/guidedtour/instance.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,6 +358,7 @@ Oskari.clazz.define(
}
},
success: function (resp) {
/* eslint-disable node/no-callback-literal */
if (resp && resp.articles[0] && resp.articles[0].content) {
callback(true, resp.articles[0].content);
} else {
Expand Down
4 changes: 2 additions & 2 deletions ...es/framework/layerlist/view/LayerViewTabs/LayerList/LayerCollapse/LayerCollapseHandler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,10 @@ const filterGroups = (groups = [], searchText) => {
group.groups = filterGroups(group.groups, searchText);
if (!group.getLayerCount()) {
// no layers and no subgroups with layers
return;
return null;
}
return group;
}).filter(group => typeof group !== 'undefined');
}).filter(group => !!group);
};

/* ------------- /Helpers ------ */
Expand Down
4 changes: 2 additions & 2 deletions bundles/framework/layerlist/view/LayerViewTabs/LayerList/LayerCollapse/util.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,10 @@ const filterOutEmptyGroups = (groups = []) => {
group.groups = filterOutEmptyGroups(group.groups);
if (!group.layers.length && !group.groups.length) {
// no layers and no subgroups with layers
return;
return null;
}
return group;
}).filter(group => typeof group !== 'undefined');
}).filter(group => !!group);
};
/**
* Function to construct layer groups based on information included in layers and given grouping method.
Expand Down
8 changes: 4 additions & 4 deletions bundles/framework/mapfull/instance.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,23 +524,23 @@ Oskari.clazz.define('Oskari.mapframework.bundle.mapfull.MapFullBundleInstance',
params.mapLayers = state.selectedLayers
.map(layer => {
if (layer.hidden) {
return;
return null;
}
if (optimized) {
if (layer.opacity === 0) {
// leave out layers that are not visible
return;
return null;
}
// also leave out layers that are not inside zoom-limits, are outside of extent
// or are otherwise not shown to user
if (!this.getMapModule().isLayerVisible(layer.id)) {
return;
return null;
}
}
return layer.id + '+' + layer.opacity + '+' + (layer.style || '');
})
// filter out hidden == undefined from map-function
.filter(layer => typeof layer !== 'undefined')
.filter(layer => !!layer)
// separate with comma
.join(',');

Expand Down
7 changes: 7 additions & 0 deletions bundles/framework/myplaces3/service/MyPlacesService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ Oskari.clazz.define('Oskari.mapframework.bundle.myplaces3.service.MyPlacesServic
var places = me.getPlacesInCategory(oldCategoryId);
if (places.length === 0) {
// no places to move -> callback right away
/* eslint-disable node/no-callback-literal */
callback(true);
return;
}
Expand All @@ -133,6 +134,7 @@ Oskari.clazz.define('Oskari.mapframework.bundle.myplaces3.service.MyPlacesServic
if (idList.length === 0) {
// no places to delete -> callback right away
this._removePlaces(categoryId);
/* eslint-disable node/no-callback-literal */
callback(true);
return;
}
Expand All @@ -159,6 +161,7 @@ Oskari.clazz.define('Oskari.mapframework.bundle.myplaces3.service.MyPlacesServic
},
error: function (jqXHR, textStatus) {
if (jqXHR.status !== 0) {
/* eslint-disable node/no-callback-literal */
callback(false);
}
}
Expand Down Expand Up @@ -267,6 +270,7 @@ Oskari.clazz.define('Oskari.mapframework.bundle.myplaces3.service.MyPlacesServic
},
error: function (jqXHR, textStatus) {
if (jqXHR.status !== 0) {
/* eslint-disable node/no-callback-literal */
callback(false);
}
}
Expand Down Expand Up @@ -311,6 +315,7 @@ Oskari.clazz.define('Oskari.mapframework.bundle.myplaces3.service.MyPlacesServic
const place = this.findMyPlace(placeId);
if (!place) {
this.log.error('Could not find requested place with id:', placeId);
/* eslint-disable node/no-callback-literal */
callback(false);
return;
}
Expand Down Expand Up @@ -379,6 +384,7 @@ Oskari.clazz.define('Oskari.mapframework.bundle.myplaces3.service.MyPlacesServic
},
error: function (jqXHR, textStatus) {
if (jqXHR.status !== 0) {
/* eslint-disable node/no-callback-literal */
callback(false);
}
}
Expand Down Expand Up @@ -449,6 +455,7 @@ Oskari.clazz.define('Oskari.mapframework.bundle.myplaces3.service.MyPlacesServic
},
error: jqXHR => {
if (jqXHR.status !== 0) {
/* eslint-disable node/no-callback-literal */
callback(false);
}
}
Expand Down
8 changes: 8 additions & 0 deletions bundles/framework/personaldata/service/ViewService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,11 @@ Oskari.clazz.define('Oskari.mapframework.bundle.personaldata.service.ViewService
}
},
success: function (response) {
/* eslint-disable node/no-callback-literal */
callback(true, response);
},
error: function () {
/* eslint-disable node/no-callback-literal */
callback(false);
}
});
Expand Down Expand Up @@ -96,9 +98,11 @@ Oskari.clazz.define('Oskari.mapframework.bundle.personaldata.service.ViewService
}
},
success: function (response) {
/* eslint-disable node/no-callback-literal */
callback(true);
},
error: function () {
/* eslint-disable node/no-callback-literal */
callback(false);
}
});
Expand Down Expand Up @@ -133,9 +137,11 @@ Oskari.clazz.define('Oskari.mapframework.bundle.personaldata.service.ViewService
}
},
success: function (response) {
/* eslint-disable node/no-callback-literal */
callback(true);
},
error: function () {
/* eslint-disable node/no-callback-literal */
callback(false);
}
});
Expand Down Expand Up @@ -172,9 +178,11 @@ Oskari.clazz.define('Oskari.mapframework.bundle.personaldata.service.ViewService
}
},
success: function (response) {
/* eslint-disable node/no-callback-literal */
callback(true);
},
error: function () {
/* eslint-disable node/no-callback-literal */
callback(false);
}
});
Expand Down
16 changes: 10 additions & 6 deletions bundles/framework/publisher2/view/FlyoutStartView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,13 +172,13 @@ Oskari.clazz.define('Oskari.mapframework.bundle.publisher2.view.FlyoutStartView'
* list of layers to render
* @return {jQuery} DOM element with layer listing
*/
_getRenderedLayerList: function (list) {
_getRenderedLayerList: function (list = []) {
var layerList = this.templateLayerList.clone();
var listElement = layerList.find('ul');
var listItemTemplate = this.templateListItem;
var map = this.instance.sandbox.getMap();

(list || []).forEach((layer) => {
list.forEach((layer) => {
var item = listItemTemplate.clone();
var txt = layer.getName();
var reasons = [];
Expand All @@ -190,10 +190,14 @@ Oskari.clazz.define('Oskari.mapframework.bundle.publisher2.view.FlyoutStartView'
reasons.push(this.loc.noRights);
}
if (!map.isLayerSupported(layer)) {
reasons = reasons.concat(map.getUnsupportedLayerReasons(layer).map(
cur => cur instanceof UnsupportedLayerSrs
? this.loc.unsupportedProjection : cur.getDescription().replace(/\./g, '')
));
reasons = reasons.concat(map.getUnsupportedLayerReasons(layer)
.map(cur => {
if (cur instanceof UnsupportedLayerSrs) {
return this.loc.unsupportedProjection;
}
return cur.getDescription().replace(/\./g, '');
})
);
}
if (reasons.length) {
txt += ' (' + reasons.join(', ') + ')';
Expand Down
21 changes: 9 additions & 12 deletions bundles/framework/publisher2/view/PanelMapPreview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,22 +456,19 @@ Oskari.clazz.define('Oskari.mapframework.bundle.publisher2.view.PanelMapPreview'
* @return {Object}
*/
getValues: function () {
var me = this,
values = {},
selected = me._getSelectedMapSize(),
size = isNaN(parseInt(selected.width)) || isNaN(parseInt(selected.height)) ? undefined : {
width: selected.width,
height: selected.height
};

values = {
const selected = this._getSelectedMapSize();
const values = {
metadata: {
preview: selected.option.id,
size: size

preview: selected.option.id
}
};

if (!isNaN(parseInt(selected.width)) && !isNaN(parseInt(selected.height))) {
values.metadata.size = {
width: selected.width,
height: selected.height
};
}
return values;
},
validate: function () {
Expand Down
8 changes: 6 additions & 2 deletions bundles/framework/publisher2/view/PanelToolLayout.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,12 @@ Oskari.clazz.define('Oskari.mapframework.bundle.publisher2.view.PanelToolLayout'

me.toolLayouts = ['lefthanded', 'righthanded', 'userlayout'];
me.data = me.instance.publisher.data;
me.activeToolLayout = me.instance.publisher.data && me.instance.publisher.data.metadata && me.instance.publisher.data.metadata.toolLayout
? me.instance.publisher.data.metadata.toolLayout : 'userlayout';
me.activeToolLayout = 'userlayout';
if (me.instance.publisher.data &&
me.instance.publisher.data.metadata &&
me.instance.publisher.data.metadata.toolLayout) {
me.activeToolLayout = me.instance.publisher.data.metadata.toolLayout;
}
me.toolLayoutEditMode = false;
me._addedDraggables = [];
}, {
Expand Down
1 change: 1 addition & 0 deletions bundles/framework/timeseries/WMSAnimator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@ Oskari.clazz.define('Oskari.mapframework.bundle.timeseries.WMSAnimator',
* @param {Function} callback is called when loading is ready or 5000 ms timeout reached
*/
_bufferImages: function (urls, nextTime, callback) {
/* eslint-disable node/no-callback-literal */
var imgCount = urls.length;
if (imgCount === 0) {
callback(true);
Expand Down
Loading