Просмотр исходного кода

BugFix: decode html for preview

Yuki Takei 8 лет назад
Родитель
Сommit
979791793e
3 измененных файлов с 8 добавлено и 1 удалено
  1. 1 0
      package.json
  2. 3 1
      resource/js/app.js
  3. 4 0
      yarn.lock

+ 1 - 0
package.json

@@ -76,6 +76,7 @@
     "diff2html": "^2.3.0",
     "elasticsearch": "^14.0.0",
     "emojione": "^3.1.2",
+    "entities": "^1.1.1",
     "env-cmd": "^7.0.0",
     "escape-string-regexp": "^1.0.5",
     "express": "^4.16.1",

+ 3 - 1
resource/js/app.js

@@ -20,6 +20,8 @@ import BookmarkButton   from './components/BookmarkButton';
 import CustomCssEditor  from './components/Admin/CustomCssEditor';
 import CustomScriptEditor from './components/Admin/CustomScriptEditor';
 
+import * as entities from 'entities';
+
 
 if (!window) {
   window = {};
@@ -69,7 +71,7 @@ if (isEnabledPlugins) {
 const componentMappings = {
   'search-top': <HeaderSearchBox crowi={crowi} />,
   'search-page': <SearchPage crowi={crowi} />,
-  'page-editor': <PageEditor crowi={crowi} markdown={pageContent} />,
+  'page-editor': <PageEditor crowi={crowi} markdown={entities.decodeHTML(pageContent)} />,
   'page-list-search': <PageListSearch crowi={crowi} />,
   'page-comments-list': <PageComments pageId={pageId} revisionId={pageRevisionId} revisionCreatedAt= {pageRevisionCreatedAt} crowi={crowi} />,
   'page-attachment': <PageAttachment pageId={pageId} pageContent={pageContent} crowi={crowi} />,

+ 4 - 0
yarn.lock

@@ -2073,6 +2073,10 @@ enhanced-resolve@^3.4.0:
     object-assign "^4.0.1"
     tapable "^0.2.7"
 
+entities@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"
+
 env-cmd@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/env-cmd/-/env-cmd-7.0.0.tgz#d1fcfea6e0cbe6bf50b7130221d568907b6349bd"