Skip to content

Commit

Permalink
Apply eslint
Browse files Browse the repository at this point in the history
  • Loading branch information
pdrillin committed Jan 22, 2021
1 parent 6babafc commit d50c4d1
Show file tree
Hide file tree
Showing 7 changed files with 175 additions and 175 deletions.
2 changes: 1 addition & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@
}
]
}
}
}
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
eslint:
npx eslint adresse/
npx eslint adresse/
44 changes: 22 additions & 22 deletions mapBuilder/www/js/dist/vendors~jspdf.bundle.js

Large diffs are not rendered by default.

134 changes: 67 additions & 67 deletions mapBuilder/www/js/mainadmin.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,74 +15,74 @@ var mapBuilderAdmin = {};

$(function() {

var raster = new TileLayer({
source: new OSM()
});

var source = new VectorSource({wrapX: false});

var vector = new VectorLayer({
source: source
});

var map = new Map({
layers: [raster, vector],
target: 'map',
view: new View({
extent: transformExtent([-180,-85.06,180,85.06], 'EPSG:4326', 'EPSG:3857'),
center: [95022, 5922170],
zoom: 5
})
});

// Set extent input as readonly
$('#jforms_mapBuilderAdmin_config_extent').prop('readonly', true);

// Display original extent on map if set
var extentString = $('#jforms_mapBuilderAdmin_config_extent').val();
var raster = new TileLayer({
source: new OSM()
});

var source = new VectorSource({wrapX: false});

var vector = new VectorLayer({
source: source
});

var map = new Map({
layers: [raster, vector],
target: 'map',
view: new View({
extent: transformExtent([-180,-85.06,180,85.06], 'EPSG:4326', 'EPSG:3857'),
center: [95022, 5922170],
zoom: 5
})
});

// Set extent input as readonly
$('#jforms_mapBuilderAdmin_config_extent').prop('readonly', true);

// Display original extent on map if set
var extentString = $('#jforms_mapBuilderAdmin_config_extent').val();

if(extentString !== ""){
var extent = transformExtent(extentString.split(',').map(parseFloat), 'EPSG:4326', map.getView().getProjection())
source.addFeature(
new Feature({
geometry: fromExtent(extent)
})
);
map.getView().fit(extent);
}
if(extentString !== ""){
var extent = transformExtent(extentString.split(',').map(parseFloat), 'EPSG:4326', map.getView().getProjection())
source.addFeature(
new Feature({
geometry: fromExtent(extent)
})
);
map.getView().fit(extent);
}

var draw = new Draw({
source: source,
type: 'Circle',
geometryFunction: createBox()
});

draw.on('drawstart', function (e) {
source.clear();
});

draw.on('drawend', function (e) {
$('#jforms_mapBuilderAdmin_config_extent').val(transformExtent(e.feature.getGeometry().getExtent(), 'EPSG:3857', 'EPSG:4326'));
});

map.addInteraction(draw);

// Filter default baselayer choices based on selected baselayers
// Init
$('#jforms_mapBuilderAdmin_config_baseLayerDefault option').hide();

$('.jforms-ctl-baseLayer input:checked').each(function() {
$('#jforms_mapBuilderAdmin_config_baseLayerDefault option[value='+$(this).val()+']').show();
});

// Toggle on change
$('.jforms-ctl-baseLayer input').change(function() {
$('#jforms_mapBuilderAdmin_config_baseLayerDefault option[value='+$(this).val()+']').toggle($(this).is(':checked'));
});

// Make OL map object accessible to help debugging
if (!PRODUCTION) {
$("#map").data('map', map);
}
var draw = new Draw({
source: source,
type: 'Circle',
geometryFunction: createBox()
});

draw.on('drawstart', function (e) {
source.clear();
});

draw.on('drawend', function (e) {
$('#jforms_mapBuilderAdmin_config_extent').val(transformExtent(e.feature.getGeometry().getExtent(), 'EPSG:3857', 'EPSG:4326'));
});

map.addInteraction(draw);

// Filter default baselayer choices based on selected baselayers
// Init
$('#jforms_mapBuilderAdmin_config_baseLayerDefault option').hide();

$('.jforms-ctl-baseLayer input:checked').each(function() {
$('#jforms_mapBuilderAdmin_config_baseLayerDefault option[value='+$(this).val()+']').show();
});

// Toggle on change
$('.jforms-ctl-baseLayer input').change(function() {
$('#jforms_mapBuilderAdmin_config_baseLayerDefault option[value='+$(this).val()+']').toggle($(this).is(':checked'));
});

// Make OL map object accessible to help debugging
if (!PRODUCTION) {
$("#map").data('map', map);
}

});
62 changes: 31 additions & 31 deletions mapBuilder/www/js/modules/bottom-dock.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,45 +9,45 @@ export default $(function() {
// lizBottomDockTimeHoverIn = lizMap.config.options.bottomDockTimeHoverIn;

$('#bottom-dock').hover(
// hover in
function() {
if(lizBottomDockTimer) {
clearTimeout(lizBottomDockTimer);
lizBottomDockTimer = null;
// hover in
function() {
if(lizBottomDockTimer) {
clearTimeout(lizBottomDockTimer);
lizBottomDockTimer = null;
}
$(this).removeClass('half-transparent');
lizBottomDockTimer = setTimeout(function() {
showBottomDockContent();
return false;
}, lizBottomDockTimeHoverIn);
},
// mouse out
function(){
if(lizBottomDockTimer) {
clearTimeout(lizBottomDockTimer);
lizBottomDockTimer = null;
}
$(this).addClass('half-transparent');
lizBottomDockTimer = setTimeout(function() {
// if ( !bottomDockGlued &&!lizMap.checkMobile()){
hideBottomDockContent();
// }
return false;
}, lizBottomDockTimeHoverOut);
}
$(this).removeClass('half-transparent');
lizBottomDockTimer = setTimeout(function() {
showBottomDockContent();
return false;
}, lizBottomDockTimeHoverIn);
},
// mouse out
function(){
if(lizBottomDockTimer) {
clearTimeout(lizBottomDockTimer);
lizBottomDockTimer = null;
}
$(this).addClass('half-transparent');
lizBottomDockTimer = setTimeout(function() {
// if ( !bottomDockGlued &&!lizMap.checkMobile()){
hideBottomDockContent();
// }
return false;
}, lizBottomDockTimeHoverOut);
}
);

function showBottomDockContent(){
$('#bottom-dock').addClass('visible');
return false;
$('#bottom-dock').addClass('visible');
return false;
}
function hideBottomDockContent(){
$('#bottom-dock').removeClass('visible').focus();
return false;
$('#bottom-dock').removeClass('visible').focus();
return false;
}

$('#hideBottomDock').on("click", function(){
$('#bottom-dock').hide();
$('.bottom-dock').removeClass('active');
$('#bottom-dock').hide();
$('.bottom-dock').removeClass('active');
});
});
54 changes: 27 additions & 27 deletions mapBuilder/www/js/webpack.dev.js
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
const webpack = require('webpack');

module.exports = {
mode: 'development',
devtool: 'inline-source-map',
entry: {
mapbuilder: './main.js',
mapbuilderadmin: './mainadmin.js'
},
output: {
path: __dirname+'/dist/',
chunkFilename: '[name].bundle.js',
filename: '[name].js'
},
module: {
rules: [
{
test: /\.css$/i,
use: ['style-loader', 'css-loader'],
},
],
},
externals: {
jquery: 'jQuery'
},
plugins: [
new webpack.DefinePlugin({
PRODUCTION: JSON.stringify(false)
})
]
mode: 'development',
devtool: 'inline-source-map',
entry: {
mapbuilder: './main.js',
mapbuilderadmin: './mainadmin.js'
},
output: {
path: __dirname+'/dist/',
chunkFilename: '[name].bundle.js',
filename: '[name].js'
},
module: {
rules: [
{
test: /\.css$/i,
use: ['style-loader', 'css-loader'],
},
],
},
externals: {
jquery: 'jQuery'
},
plugins: [
new webpack.DefinePlugin({
PRODUCTION: JSON.stringify(false)
})
]
};
52 changes: 26 additions & 26 deletions mapBuilder/www/js/webpack.prod.js
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
const webpack = require('webpack');

module.exports = {
mode: 'production',
devtool: 'source-map',
entry: {
mapbuilder: './main.js',
mapbuilderadmin: './mainadmin.js'
},
output: {
path: __dirname+'/dist/',
chunkFilename: '[name].bundle.js',
filename: '[name].js'
},
module: {
rules: [
{
test: /\.css$/i,
use: ['style-loader', 'css-loader'],
},
],
},
externals: {
jquery: 'jQuery'
mode: 'production',
devtool: 'source-map',
entry: {
mapbuilder: './main.js',
mapbuilderadmin: './mainadmin.js'
},
plugins: [
new webpack.DefinePlugin({
PRODUCTION: JSON.stringify(true)
})
]
output: {
path: __dirname+'/dist/',
chunkFilename: '[name].bundle.js',
filename: '[name].js'
},
module: {
rules: [
{
test: /\.css$/i,
use: ['style-loader', 'css-loader'],
},
],
},
externals: {
jquery: 'jQuery'
},
plugins: [
new webpack.DefinePlugin({
PRODUCTION: JSON.stringify(true)
})
]
};

0 comments on commit d50c4d1

Please sign in to comment.