Commit d7ec46e9 authored by User expired's avatar User expired
Browse files

Fixed issues with icons (after webpack3 update)

parent 8c4b5685
Upcoming version:
-----------------
- Fixed issues with icons (after webpack3 update) (Nikolaus Krismer)
- Verion updates for various JavaScript libraries (webpack, turfjs, ...) (Nikolaus Krismer)
- Version upgrades for npm and selenium test drivers (Nikolaus Krismer)
- Fixed some minor js issues (Nikolaus Krismer)
......
......@@ -343,7 +343,7 @@ define(['jquery', 'leaflet', 'util/loggingUtils', '@turf/inside', 'spin.js', 'is
var i = 0,
name = null,
resultO = {},
types = CUSTOM_ICONS;
types = CUSTOM_ICONS.slice(0); // cloning array CUSTOM_ICONS
if (!types) {
types = [];
......
......@@ -59,9 +59,9 @@ define(['jquery', 'leaflet', 'util/loggingUtils', 'isochrone/initHelper', 'util/
function loadCss() {
// leaflet: only layers and layers-2x images are referenced in the css file, so we add the remaining images here
require('-!url-loader!file-loader?name=../images/leaflet/[name].[ext]&context=node_modules!leaflet/dist/images/marker-icon.png');
require('-!url-loader!file-loader?name=../images/leaflet/[name].[ext]&context=node_modules!leaflet/dist/images/marker-icon-2x.png');
require('-!url-loader!file-loader?name=../images/leaflet/[name].[ext]&context=node_modules!leaflet/dist/images/marker-shadow.png');
require('!file-loader?name=../images/leaflet/[name].[ext]&context=node_modules!leaflet/dist/images/marker-icon.png');
require('!file-loader?name=../images/leaflet/[name].[ext]&context=node_modules!leaflet/dist/images/marker-icon-2x.png');
require('!file-loader?name=../images/leaflet/[name].[ext]&context=node_modules!leaflet/dist/images/marker-shadow.png');
require('leaflet/dist/leaflet.css');
require('leaflet.locatecontrol/dist/L.Control.Locate.css');
require('leaflet.markercluster/dist/MarkerCluster.css');
......
......@@ -107,7 +107,7 @@ module.exports = {
},
module: {
rules: loaderRules.concat({
test: /\.(jp?g|gif|png|svg)$/,
test: /\.(jpe?g|gif|png|svg)$/,
use: 'url-loader?limit=10000&name=../images/[path][name].[ext]&context=' + __dirname,
include: /(node_modules)/
}, {
......@@ -119,7 +119,7 @@ module.exports = {
use: 'url-loader?limit=10000&name=../fonts/[path][name].[ext]&context=' + __dirname,
include: /(node_modules)/
}, {
test: /\.(jp?g|gif|png|svg)$/,
test: /\.(jpe?g|gif|png|svg)$/,
use: 'url-loader?limit=10000&name=../[path][name].[ext]',
exclude: /(node_modules)/
}, {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment