escape bugfixed

juijs · Mar 5, 2020 · 232c0c1 · 232c0c1
1 parent 122ef6a
commit 232c0c1
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 18 deletions.
diff --git a/dist/jui-core.cjs.js b/dist/jui-core.cjs.js
@@ -2545,7 +2545,7 @@ var TemplateUtil = {
                 var source = "__p+='" + text.replace(escaper, function (match) {
                     return '\\' + escapes[match];
                 }).replace(settings.escape || noMatch, function (match, code) {
-                    return "'+\n_.escape(" + unescape(code) + ")+\n'";
+                    return "'+\nescape(" + unescape(code) + ")+\n'";
                 }).replace(settings.interpolate || noMatch, function (match, code) {
                     return "'+\n(" + unescape(code) + ")+\n'";
                 }).replace(settings.evaluate || noMatch, function (match, code) {

diff --git a/dist/jui-core.esm.js b/dist/jui-core.esm.js
@@ -2541,7 +2541,7 @@ var TemplateUtil = {
                 var source = "__p+='" + text.replace(escaper, function (match) {
                     return '\\' + escapes[match];
                 }).replace(settings.escape || noMatch, function (match, code) {
-                    return "'+\n_.escape(" + unescape(code) + ")+\n'";
+                    return "'+\nescape(" + unescape(code) + ")+\n'";
                 }).replace(settings.interpolate || noMatch, function (match, code) {
                     return "'+\n(" + unescape(code) + ")+\n'";
                 }).replace(settings.evaluate || noMatch, function (match, code) {

diff --git a/dist/jui-core.js b/dist/jui-core.js
@@ -2544,7 +2544,7 @@ var jui = (function ($) {
                   var source = "__p+='" + text.replace(escaper, function (match) {
                       return '\\' + escapes[match];
                   }).replace(settings.escape || noMatch, function (match, code) {
-                      return "'+\n_.escape(" + unescape(code) + ")+\n'";
+                      return "'+\nescape(" + unescape(code) + ")+\n'";
                   }).replace(settings.interpolate || noMatch, function (match, code) {
                       return "'+\n(" + unescape(code) + ")+\n'";
                   }).replace(settings.evaluate || noMatch, function (match, code) {

diff --git a/dist/jui-core.min.js b/dist/jui-core.min.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "juijs",
-  "version": "2.2.2-es6",
+  "version": "2.3.0",
   "sideEffects": false,
   "description": "The core framework provided by the JUI for implementing such a grid and chart.",
   "scripts": {

diff --git a/src/util/template.js b/src/util/template.js
@@ -73,7 +73,7 @@ export default {
                 var source = "__p+='" + text.replace(escaper, function (match) {
                     return '\\' + escapes[match];
                 }).replace(settings.escape || noMatch, function (match, code) {
-                    return "'+\n_.escape(" + unescape(code) + ")+\n'";
+                    return "'+\nescape(" + unescape(code) + ")+\n'";
                 }).replace(settings.interpolate || noMatch, function (match, code) {
                     return "'+\n(" + unescape(code) + ")+\n'";
                 }).replace(settings.evaluate || noMatch, function (match, code) {