Skip to content

Commit 0713219

Browse files
jonataswalkerjonataswalker
committed
Make ESlint happy
1 parent 7e71ceb commit 0713219

File tree

8 files changed

+125
-116
lines changed

8 files changed

+125
-116
lines changed

‎src/js/base.js

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Internal } from './internal';
22
import { Html } from './html';
33
import utils from './utils';
4-
import * as constants from './constants';
4+
import { defaultItems as DEFAULT_ITEMS } from './constants';
55

66
/**
77
* @class Base
@@ -17,7 +17,7 @@ export default class Base extends ol.control.Control {
1717
'@param `opt_options` should be object type!'
1818
);
1919

20-
this.options = utils.mergeOptions(constants.defaultOptions, opt_options);
20+
this.options = utils.mergeOptions(DEFAULT_ITEMS, opt_options);
2121
this.disabled = false;
2222

2323
Base.Internal = new Internal(this);
@@ -63,7 +63,7 @@ export default class Base extends ol.control.Control {
6363
* @return {Array} Returns default items
6464
*/
6565
getDefaultItems() {
66-
return constants.defaultItems;
66+
return DEFAULT_ITEMS;
6767
}
6868

6969
/**
@@ -89,7 +89,8 @@ export default class Base extends ol.control.Control {
8989
* @param {Object|String} item Item.
9090
*/
9191
push(item) {
92-
utils.assert(utils.isDefAndNotNull(item), '@param `item` must be informed.');
92+
utils.assert(
93+
utils.isDefAndNotNull(item), '@param `item` must be informed.');
9394
Base.Html.addMenuEntry(item, Base.Internal.getNextItemIndex());
9495
}
9596

‎src/js/constants.js

+21-11
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import * as vars from '../../config/vars.json';
1+
import * as _VARS from '../../config/vars.json';
22

33
export const eventType = {
44
/**
@@ -19,6 +19,22 @@ export const eventType = {
1919
ADD_MENU_ENTRY: 'add-menu-entry'
2020
};
2121

22+
export const VARS = _VARS;
23+
24+
/**
25+
* DOM Elements classname
26+
*/
27+
export const CLASSNAME = {
28+
container : _VARS.namespace + _VARS.container_class,
29+
separator : _VARS.namespace + _VARS.separator_class,
30+
submenu : _VARS.namespace + _VARS.submenu_class,
31+
hidden : _VARS.namespace + _VARS.hidden_class,
32+
icon : _VARS.namespace + _VARS.icon_class,
33+
zoomIn : _VARS.namespace + _VARS.zoom_in_class,
34+
zoomOut : _VARS.namespace + _VARS.zoom_out_class,
35+
OL_unselectable : _VARS.ol_unselectable_class
36+
};
37+
2238
export const defaultOptions = {
2339
width: 150,
2440
default_items: true
@@ -27,12 +43,9 @@ export const defaultOptions = {
2743
export const defaultItems = [
2844
{
2945
text: 'Zoom In',
30-
classname: [
31-
vars.namespace + vars.zoom_in_class,
32-
vars.namespace + vars.icon_class
33-
].join(' '),
46+
classname: [CLASSNAME.zoomIn, CLASSNAME.icon].join(' '),
3447
callback: (obj, map) => {
35-
var view = map.getView(),
48+
const view = map.getView(),
3649
pan = ol.animation.pan({
3750
duration: 1000,
3851
source: view.getCenter()
@@ -49,12 +62,9 @@ export const defaultItems = [
4962
},
5063
{
5164
text: 'Zoom Out',
52-
classname: [
53-
vars.namespace + vars.zoom_out_class,
54-
vars.namespace + vars.icon_class
55-
].join(' '),
65+
classname: [CLASSNAME.zoomOut, CLASSNAME.icon].join(' '),
5666
callback: (obj, map) => {
57-
var view = map.getView(),
67+
const view = map.getView(),
5868
pan = ol.animation.pan({
5969
duration: 1000,
6070
source: view.getCenter()

‎src/js/html.js

+16-15
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
import * as vars from '../../config/vars.json';
2-
import * as constants from './constants';
1+
import { CLASSNAME, defaultItems as DEFAULT_ITEMS } from './constants';
32
import utils from './utils';
43

54

@@ -20,9 +19,9 @@ export class Html {
2019
createContainer() {
2120
let container = document.createElement('ul');
2221
container.className = [
23-
vars.namespace + vars.container_class,
24-
vars.namespace + vars.hidden_class,
25-
vars.ol_unselectable_class
22+
CLASSNAME.container,
23+
CLASSNAME.hidden,
24+
CLASSNAME.OL_unselectable
2625
].join(' ');
2726
container.style.width = parseInt(this.Base.options.width, 10) + 'px';
2827
return container;
@@ -33,9 +32,9 @@ export class Html {
3332

3433
if ('items' in options) {
3534
items = (options.default_items) ?
36-
options.items.concat(constants.defaultItems) : options.items;
35+
options.items.concat(DEFAULT_ITEMS) : options.items;
3736
} else if (options.default_items) {
38-
items = constants.defaultItems;
37+
items = DEFAULT_ITEMS;
3938
}
4039

4140
// no item
@@ -48,7 +47,7 @@ export class Html {
4847
addMenuEntry(item) {
4948
const $internal = this.Base.constructor.Internal;
5049
let index = $internal.getNextItemIndex();
51-
const submenu_class = vars.namespace + vars.submenu_class;
50+
const submenu_class = CLASSNAME.submenu;
5251

5352
if (item.items && Array.isArray(item.items)) {
5453
// submenu - only a second level
@@ -61,13 +60,14 @@ export class Html {
6160
let li = this.generateHtmlAndPublish(this.container, item, index);
6261
let ul = document.createElement('ul');
6362

64-
ul.className = vars.namespace + vars.container_class;
63+
ul.className = CLASSNAME.container;
6564
ul.style.left = $internal.submenu.last_left || $internal.submenu.left;
6665
ul.style.width = this.Base.options.width + 'px';
6766
li.appendChild(ul);
6867

6968
item.items.forEach(each => {
70-
this.generateHtmlAndPublish(ul, each, $internal.getNextItemIndex(), true);
69+
this.generateHtmlAndPublish(
70+
ul, each, $internal.getNextItemIndex(), true);
7171
});
7272
} else {
7373
this.generateHtmlAndPublish(this.container, item, index);
@@ -82,7 +82,7 @@ export class Html {
8282
if (typeof item === 'string' && item.trim() === '-') {
8383
html = [
8484
'<li id="index', index,
85-
'" class="', vars.namespace, vars.separator_class,
85+
'" class="', CLASSNAME.separator,
8686
'"><hr></li>'
8787
].join('');
8888
frag = utils.createFragment(html);
@@ -99,11 +99,12 @@ export class Html {
9999

100100
if (item.icon) {
101101
if (item.classname === '') {
102-
item.classname = vars.namespace + vars.icon_class;
103-
} else if (item.classname.indexOf(vars.namespace + vars.icon_class) === -1) {
104-
item.classname += ' ' + vars.namespace + vars.icon_class;
102+
item.classname = CLASSNAME.icon;
103+
} else if (item.classname.indexOf(CLASSNAME.icon) === -1) {
104+
item.classname += ' ' + CLASSNAME.icon;
105105
}
106-
element.setAttribute('style', 'background-image:url(' + item.icon + ')');
106+
element.setAttribute(
107+
'style', 'background-image:url(' + item.icon + ')');
107108
}
108109

109110
element.id = 'index' + index;

‎src/js/internal.js

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
import * as vars from '../../config/vars.json';
2-
import * as constants from './constants';
1+
import { CLASSNAME, eventType as EVENT_TYPE } from './constants';
32
import utils from './utils';
43

54

@@ -102,7 +101,7 @@ export class Internal {
102101
h: Math.round(this.lineHeight * this.getItemsLength())
103102
},
104103
// submenus <ul>
105-
uls = utils.find('li.' + vars.namespace + vars.submenu_class + '>ul',
104+
uls = utils.find('li.' + CLASSNAME.submenu + '>ul',
106105
this.Base.container, true);
107106

108107
if (space_left_w >= menu_size.w) {
@@ -121,7 +120,7 @@ export class Internal {
121120
this.Base.container.style.bottom = 0;
122121
}
123122

124-
utils.removeClass(this.Base.container, vars.namespace + vars.hidden_class);
123+
utils.removeClass(this.Base.container, CLASSNAME.hidden);
125124

126125
if (uls.length) {
127126
if (space_left_w < (menu_size.w * 2)) {
@@ -141,16 +140,16 @@ export class Internal {
141140
this.positionContainer(pixel);
142141

143142
this.Base.dispatchEvent({
144-
type: constants.eventType.OPEN,
143+
type: EVENT_TYPE.OPEN,
145144
pixel: pixel,
146145
coordinate: coordinate
147146
});
148147
}
149148

150149
closeMenu() {
151-
utils.addClass(this.Base.container, vars.namespace + vars.hidden_class);
150+
utils.addClass(this.Base.container, CLASSNAME.hidden);
152151
this.Base.dispatchEvent({
153-
type: constants.eventType.CLOSE
152+
type: EVENT_TYPE.CLOSE
154153
});
155154
}
156155

@@ -163,7 +162,8 @@ export class Internal {
163162
}
164163

165164
removeListeners() {
166-
this.map_element.removeEventListener('contextmenu', this.event_handler, false);
165+
this.map_element.removeEventListener(
166+
'contextmenu', this.event_handler, false);
167167
}
168168

169169
handleEvent(evt) {
@@ -173,7 +173,7 @@ export class Internal {
173173
this_.pixel_clicked = this.map.getEventPixel(evt);
174174

175175
this_.Base.dispatchEvent({
176-
type: constants.eventType.BEFOREOPEN,
176+
type: EVENT_TYPE.BEFOREOPEN,
177177
pixel: this_.pixel_clicked,
178178
coordinate: this_.coordinate_clicked
179179
});

‎src/js/utils.js

+9-5
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ export default {
2323
return;
2424
}
2525

26-
const array = (Array.isArray(classname)) ? classname : classname.split(/\s+/);
26+
const array =
27+
(Array.isArray(classname)) ? classname : classname.split(/\s+/);
2728
let i = array.length;
2829

2930
while (i--) {
@@ -60,7 +61,8 @@ export default {
6061
return;
6162
}
6263

63-
const array = (Array.isArray(classname)) ? classname : classname.split(/\s+/);
64+
const array =
65+
(Array.isArray(classname)) ? classname : classname.split(/\s+/);
6466
let i = array.length;
6567

6668
while (i--) {
@@ -88,8 +90,9 @@ export default {
8890
*/
8991
hasClass(element, c) {
9092
// use native if available
91-
return (element.classList) ?
92-
element.classList.contains(c) : this.classRegex(c).test(element.className);
93+
return (element.classList)
94+
? element.classList.contains(c)
95+
: this.classRegex(c).test(element.className);
9396
},
9497
/**
9598
* @param {Element|Array<Element>} element DOM node or array of nodes.
@@ -124,7 +127,8 @@ export default {
124127
return (!!obj && obj instanceof HTMLElement);
125128
}
126129
// Older browsers
127-
return (!!obj && typeof obj === 'object' && obj.nodeType === 1 && !!obj.nodeName);
130+
return (!!obj && typeof obj === 'object' && obj.nodeType === 1 &&
131+
!!obj.nodeName);
128132
},
129133
/**
130134
* Abstraction to querySelectorAll for increased

‎test/config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ exports.url = 'http://127.0.0.1:' + port + '/test/contextmenu.html';
1010

1111
exports.elements = {
1212
container: 'ul.' + vars.namespace + vars.container_class
13-
};
13+
};

‎test/include.js

+7-7
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ var fs = require('fs');
66
var server = require('webserver').create();
77

88
// server
9-
server.listen('127.0.0.1:' + config.port, function(req, res) {
9+
server.listen('127.0.0.1:' + config.port, function (req, res) {
1010
var file_path = fs.workingDirectory + req.url,
1111
ext = req.url.substring(req.url.indexOf('.') + 1),
1212
file = '',
@@ -34,15 +34,15 @@ server.listen('127.0.0.1:' + config.port, function(req, res) {
3434
res.close();
3535
});
3636

37-
casper.on('resource.received', function(resource) {
38-
// this.echo(resource.url + " is OK", "INFO");
37+
casper.on('resource.received', function (resource) {
38+
// this.echo(resource.url + ' is OK', 'INFO');
3939
});
4040

41-
casper.on('remote.message', function(msg) {
42-
this.echo(msg + " is remote.message", "INFO");
41+
casper.on('remote.message', function (msg) {
42+
this.echo(msg + ' is remote.message', 'INFO');
4343
});
4444

4545
// test suites completion listener
46-
casper.test.on('tests.complete', function() {
46+
casper.test.on('tests.complete', function () {
4747
server.close();
48-
});
48+
});

0 commit comments

Comments
 (0)