Skip to content

Commit 4148717

Browse files
mbartombarto
authored
Fixes #1435: wrong encoding on saved maps layer titles (#1923)
1 parent ba2b14a commit 4148717

22 files changed

Lines changed: 24 additions & 22 deletions

File tree

‎docs/developer-guide/application-tutorial.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Writing a new MapStore2 based application can be done following these steps:
1919
<html>
2020
<head>
2121
<meta charset="UTF-8">
22-
<meta http-equiv="Content-Type" content="text/html;charset=ISO-8859-1">
22+
<meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
2323
<meta name="viewport" content="width=device-width, initial-scale=1">
2424
<title>MyApp</title>
2525
<link rel="stylesheet" href="http://cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.3/leaflet.css" />

‎package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@
9797
"html2canvas": "0.5.0-beta4",
9898
"intl": "1.2.2",
9999
"ismobilejs": "0.4.0",
100+
"jsesc": "1.3.0",
100101
"json-loader": "0.5.4",
101102
"jsonix": "2.4.1",
102103
"keymirror": "0.1.1",

‎project/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<html>
33
<head>
44
<meta charset="UTF-8">
5-
<meta http-equiv="Content-Type" content="text/html;charset=ISO-8859-1">
5+
<meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
66
<meta name="viewport" content="width=device-width, initial-scale=1">
77
<title>__PROJECTDESCRIPTION__</title>
88
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.7/leaflet.css" />

‎web/client/api.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<html>
33
<head>
44
<meta charset="UTF-8">
5-
<meta http-equiv="Content-Type" content="text/html;charset=ISO-8859-1">
5+
<meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
66
<meta name="viewport" content="width=device-width, initial-scale=1">
77
<title>Page with MapStore 2 API</title>
88
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Raleway" type='text/css'>

‎web/client/api/GeoStoreDAO.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ const assign = require('object-assign');
1111
const uuidv1 = require('uuid/v1');
1212
const ConfigUtils = require('../utils/ConfigUtils');
1313
const {findIndex} = require('lodash');
14+
const jsesc = require('jsesc');
1415

1516
let parseOptions = (opts) => opts;
1617

@@ -99,10 +100,10 @@ var Api = {
99100
putResource: function(resourceId, content, options) {
100101
return axios.put(
101102
"data/" + resourceId,
102-
content,
103+
jsesc(content, {json: true, wrap: false, quotes: 'backtick'}),
103104
this.addBaseUrl(_.merge({
104105
headers: {
105-
'Content-Type': "application/json"
106+
'Content-Type': "text/plain;charset=utf-8"
106107
}
107108
}, options)));
108109
},

‎web/client/components/share/api-template.raw‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<html>
33
<head>
44
<meta charset="UTF-8">
5-
<meta http-equiv="Content-Type" content="text/html;charset=ISO-8859-1">
5+
<meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
66
<meta name="viewport" content="width=device-width, initial-scale=1">
77
<title>Page with MapStore 2 API</title>
88
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Raleway" type='text/css'>

‎web/client/embedded.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<html>
33
<head>
44
<meta charset="UTF-8">
5-
<meta http-equiv="Content-Type" content="text/html;charset=ISO-8859-1">
5+
<meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
66
<meta name="viewport" content="width=device-width, initial-scale=1">
77
<title>MapStore 2 HomePage</title>
88
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Raleway" type='text/css'>

‎web/client/examples/3dviewer/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<html>
33
<head>
44
<meta charset="UTF-8">
5-
<meta http-equiv="Content-Type" content="text/html;charset=ISO-8859-1">
5+
<meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
66
<meta name="viewport" content="width=device-width, initial-scale=1">
77
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css">
88
<script src="https://cdnjs.cloudflare.com/ajax/libs/proj4js/2.3.10/proj4.js"></script>

‎web/client/examples/api/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<html>
33
<head>
44
<meta charset="UTF-8">
5-
<meta http-equiv="Content-Type" content="text/html;charset=ISO-8859-1">
5+
<meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
66
<meta name="viewport" content="width=device-width, initial-scale=1">
77
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Raleway" type='text/css'>
88
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.3/leaflet.css" />

‎web/client/examples/featuregrid/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<html>
33
<head>
44
<meta charset="UTF-8">
5-
<meta http-equiv="Content-Type" content="text/html;charset=ISO-8859-1">
5+
<meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
66
<meta name="viewport" content="width=device-width, initial-scale=1">
77
<title>FeatureGrid</title>
88
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/ol3/4.0.1/ol.css"/>

0 commit comments

Comments
 (0)